From cf40f5e3bca556648adbb21348a0bd6201e3b820 Mon Sep 17 00:00:00 2001 From: John Cormie Date: Thu, 7 Aug 2025 13:49:26 -0700 Subject: [PATCH 1/5] Better error messages --- .../java/io/grpc/binder/internal/ServiceBinding.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/binder/src/main/java/io/grpc/binder/internal/ServiceBinding.java b/binder/src/main/java/io/grpc/binder/internal/ServiceBinding.java index f0cbe9ec56b..4d13de37a8b 100644 --- a/binder/src/main/java/io/grpc/binder/internal/ServiceBinding.java +++ b/binder/src/main/java/io/grpc/binder/internal/ServiceBinding.java @@ -347,19 +347,22 @@ public void onServiceConnected(ComponentName className, IBinder binder) { @Override @MainThread public void onServiceDisconnected(ComponentName name) { - unbindInternal(Status.UNAVAILABLE.withDescription("onServiceDisconnected: " + name)); + unbindInternal(Status.UNAVAILABLE + .withDescription("Server process crashed, exited or was killed (onServiceDisconnected): " + name) + ); } @Override @MainThread public void onNullBinding(ComponentName name) { - unbindInternal(Status.UNIMPLEMENTED.withDescription("onNullBinding: " + name)); + unbindInternal(Status.UNIMPLEMENTED.withDescription("Service " + name + " had no IBinder server for " + bindIntent)); } @Override @MainThread public void onBindingDied(ComponentName name) { - unbindInternal(Status.UNAVAILABLE.withDescription("onBindingDied: " + name)); + unbindInternal(Status.UNAVAILABLE.withDescription( + "Server/Service was disabled, uninstalled or upgraded (onBindingDied): " + name)); } @VisibleForTesting From 71288167e4dff3b49c121ad0f2e9336b6f207fd4 Mon Sep 17 00:00:00 2001 From: John Cormie Date: Thu, 7 Aug 2025 14:48:40 -0700 Subject: [PATCH 2/5] java-format --- .../io/grpc/binder/internal/ServiceBinding.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/binder/src/main/java/io/grpc/binder/internal/ServiceBinding.java b/binder/src/main/java/io/grpc/binder/internal/ServiceBinding.java index 4d13de37a8b..9fbfddf3c1e 100644 --- a/binder/src/main/java/io/grpc/binder/internal/ServiceBinding.java +++ b/binder/src/main/java/io/grpc/binder/internal/ServiceBinding.java @@ -347,22 +347,26 @@ public void onServiceConnected(ComponentName className, IBinder binder) { @Override @MainThread public void onServiceDisconnected(ComponentName name) { - unbindInternal(Status.UNAVAILABLE - .withDescription("Server process crashed, exited or was killed (onServiceDisconnected): " + name) - ); + unbindInternal( + Status.UNAVAILABLE.withDescription( + "Server process crashed, exited or was killed (onServiceDisconnected): " + name)); } @Override @MainThread public void onNullBinding(ComponentName name) { - unbindInternal(Status.UNIMPLEMENTED.withDescription("Service " + name + " had no IBinder server for " + bindIntent)); + unbindInternal( + Status.UNIMPLEMENTED.withDescription( + "Server returned no IBinder for " + bindIntent + " (onNullBinding): " + name)); } @Override @MainThread public void onBindingDied(ComponentName name) { - unbindInternal(Status.UNAVAILABLE.withDescription( - "Server/Service was disabled, uninstalled or upgraded (onBindingDied): " + name)); + unbindInternal( + Status.UNAVAILABLE.withDescription( + "Server package or Component was disabled, uninstalled or upgraded (onBindingDied): " + + name)); } @VisibleForTesting From 5cb985e1b26df0709f5a18caa257da06e654aa8a Mon Sep 17 00:00:00 2001 From: John Cormie Date: Thu, 7 Aug 2025 15:29:02 -0700 Subject: [PATCH 3/5] tweak --- .../src/main/java/io/grpc/binder/internal/ServiceBinding.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/binder/src/main/java/io/grpc/binder/internal/ServiceBinding.java b/binder/src/main/java/io/grpc/binder/internal/ServiceBinding.java index 9fbfddf3c1e..acc8fe1225b 100644 --- a/binder/src/main/java/io/grpc/binder/internal/ServiceBinding.java +++ b/binder/src/main/java/io/grpc/binder/internal/ServiceBinding.java @@ -365,7 +365,8 @@ public void onNullBinding(ComponentName name) { public void onBindingDied(ComponentName name) { unbindInternal( Status.UNAVAILABLE.withDescription( - "Server package or Component was disabled, uninstalled or upgraded (onBindingDied): " + "Remote Service was disabled, or server package was disabled, uninstalled or replaced" + + " (onBindingDied): " + name)); } From 8ab90f8ec2c3c8b0d3146ea18db3f3e2984c43a3 Mon Sep 17 00:00:00 2001 From: John Cormie Date: Thu, 7 Aug 2025 16:34:08 -0700 Subject: [PATCH 4/5] add force-stopped to the reasons --- .../src/main/java/io/grpc/binder/internal/ServiceBinding.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/binder/src/main/java/io/grpc/binder/internal/ServiceBinding.java b/binder/src/main/java/io/grpc/binder/internal/ServiceBinding.java index acc8fe1225b..d3d7ad3fe84 100644 --- a/binder/src/main/java/io/grpc/binder/internal/ServiceBinding.java +++ b/binder/src/main/java/io/grpc/binder/internal/ServiceBinding.java @@ -365,8 +365,8 @@ public void onNullBinding(ComponentName name) { public void onBindingDied(ComponentName name) { unbindInternal( Status.UNAVAILABLE.withDescription( - "Remote Service was disabled, or server package was disabled, uninstalled or replaced" - + " (onBindingDied): " + "Remote Service was disabled, or the server app was disabled, force-stopped or" + + " uninstalled (onBindingDied): " + name)); } From 84aa60c2ccf05e78e81edfb839f3c3ef8a8ec607 Mon Sep 17 00:00:00 2001 From: John Cormie Date: Thu, 7 Aug 2025 17:45:14 -0700 Subject: [PATCH 5/5] extra space --- .../src/main/java/io/grpc/binder/internal/ServiceBinding.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/binder/src/main/java/io/grpc/binder/internal/ServiceBinding.java b/binder/src/main/java/io/grpc/binder/internal/ServiceBinding.java index d3d7ad3fe84..e02a49bfcb5 100644 --- a/binder/src/main/java/io/grpc/binder/internal/ServiceBinding.java +++ b/binder/src/main/java/io/grpc/binder/internal/ServiceBinding.java @@ -366,7 +366,7 @@ public void onBindingDied(ComponentName name) { unbindInternal( Status.UNAVAILABLE.withDescription( "Remote Service was disabled, or the server app was disabled, force-stopped or" - + " uninstalled (onBindingDied): " + + " uninstalled (onBindingDied): " + name)); }