From f8ee40b8c8ff1175c3549f5b8bad323ecbf43ad1 Mon Sep 17 00:00:00 2001 From: Kannan J Date: Tue, 16 Sep 2025 05:19:13 +0000 Subject: [PATCH 1/3] Suppress GuardedBy("this") warning for accessing guarded field from test. --- .../src/main/java/io/grpc/binder/internal/BinderTransport.java | 1 + 1 file changed, 1 insertion(+) diff --git a/binder/src/main/java/io/grpc/binder/internal/BinderTransport.java b/binder/src/main/java/io/grpc/binder/internal/BinderTransport.java index 6c89c56ffd4..a7ca5b25b24 100644 --- a/binder/src/main/java/io/grpc/binder/internal/BinderTransport.java +++ b/binder/src/main/java/io/grpc/binder/internal/BinderTransport.java @@ -574,6 +574,7 @@ Map> getOngoingCalls() { } @VisibleForTesting + @SuppressWarnings("GuardedBy") LeakSafeOneWayBinder getIncomingBinderForTesting() { return this.incomingBinder; } From 97d700356ca1c5391751dbe980d8ac9812a94361 Mon Sep 17 00:00:00 2001 From: MV Shiva Date: Tue, 16 Sep 2025 12:01:45 +0530 Subject: [PATCH 2/3] Update BinderTransport.java --- .../src/main/java/io/grpc/binder/internal/BinderTransport.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/binder/src/main/java/io/grpc/binder/internal/BinderTransport.java b/binder/src/main/java/io/grpc/binder/internal/BinderTransport.java index a7ca5b25b24..a847fb4d1d3 100644 --- a/binder/src/main/java/io/grpc/binder/internal/BinderTransport.java +++ b/binder/src/main/java/io/grpc/binder/internal/BinderTransport.java @@ -574,7 +574,7 @@ Map> getOngoingCalls() { } @VisibleForTesting - @SuppressWarnings("GuardedBy") + @SuppressWarnings("GuardedBy") // used only in single-threaded test environments LeakSafeOneWayBinder getIncomingBinderForTesting() { return this.incomingBinder; } From d4436db9de93a3ec5afc4f5675d18d76dd37e0ab Mon Sep 17 00:00:00 2001 From: Kannan J Date: Tue, 16 Sep 2025 12:08:53 +0530 Subject: [PATCH 3/3] Update BinderTransport.java Revert comment since we don't have usage currently of this accessor and it seems the test code will be a reader and doesn't have to lock. --- .../src/main/java/io/grpc/binder/internal/BinderTransport.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/binder/src/main/java/io/grpc/binder/internal/BinderTransport.java b/binder/src/main/java/io/grpc/binder/internal/BinderTransport.java index a847fb4d1d3..a7ca5b25b24 100644 --- a/binder/src/main/java/io/grpc/binder/internal/BinderTransport.java +++ b/binder/src/main/java/io/grpc/binder/internal/BinderTransport.java @@ -574,7 +574,7 @@ Map> getOngoingCalls() { } @VisibleForTesting - @SuppressWarnings("GuardedBy") // used only in single-threaded test environments + @SuppressWarnings("GuardedBy") LeakSafeOneWayBinder getIncomingBinderForTesting() { return this.incomingBinder; }