Merge "Gatt: do not kill Bluetooth on app callback" into main am: ac7a130d6c am: 053803d578

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3529440

Change-Id: I1d5704906f035f6e0e4cc2d45bb5bc93ce6ee6df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 16 insertions, 0 deletions

diff --git a/framework/java/android/bluetooth/BluetoothUtils.java b/framework/java/android/bluetooth/BluetoothUtils.java
index 2665af1bac..c7aff6aa44 100644
--- a/framework/java/android/bluetooth/BluetoothUtils.java
+++ b/framework/java/android/bluetooth/BluetoothUtils.java
@@ -346,6 +346,22 @@ public final class BluetoothUtils {
         }
     }
 
+    /** A {@link Runnable} that automatically logs {@link RemoteException} @hide */
+    @FunctionalInterface
+    public interface RemoteExceptionIgnoringRunnable {
+        /** Called by {@code accept}. */
+        void runOrThrow() throws RemoteException;
+
+        @RequiresNoPermission
+        default void run() {
+            try {
+                runOrThrow();
+            } catch (RemoteException ex) {
+                logRemoteException(TAG, ex);
+            }
+        }
+    }
+
     /** A {@link Consumer} that automatically logs {@link RemoteException} @hide */
     @FunctionalInterface
     public interface RemoteExceptionIgnoringConsumer<T> {