From d49e915e5187a001e6cbd87ddf09b5ce97722592 Mon Sep 17 00:00:00 2001
From: William Escande <wescande@google.com>
Date: Wed, 6 Sep 2023 22:14:42 -0700
Subject: [PATCH] DistanceMeasurement: App exception aren't from SystemServer
Calling into IBluetoothGatt will call the GattService from Bluetooth
app that does not live in the systemServer.
Therefore, exception should be rethrown as runtimeException
Bug: 298264617
Test: atest CtsBluetoothTestCases | Cts does not handled failure in the
binder nor any of the Test framework we currently have
Change-Id: Ibc6e21b7f04d7c534516b3210f93e03ed3db2bb6
---
.../java/android/bluetooth/le/DistanceMeasurementManager.java | 2 +-
.../java/android/bluetooth/le/DistanceMeasurementSession.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/framework/java/android/bluetooth/le/DistanceMeasurementManager.java b/framework/java/android/bluetooth/le/DistanceMeasurementManager.java
index 5212360c324..9be1a881cc2 100644
--- a/framework/java/android/bluetooth/le/DistanceMeasurementManager.java
+++ b/framework/java/android/bluetooth/le/DistanceMeasurementManager.java
@@ -167,7 +167,7 @@ public final class DistanceMeasurementManager {
Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
return null;
} catch (RemoteException e) {
- throw e.rethrowFromSystemServer();
+ throw e.rethrowAsRuntimeException();
}
}
diff --git a/framework/java/android/bluetooth/le/DistanceMeasurementSession.java b/framework/java/android/bluetooth/le/DistanceMeasurementSession.java
index d88dba4c8ce..538a047b787 100644
--- a/framework/java/android/bluetooth/le/DistanceMeasurementSession.java
+++ b/framework/java/android/bluetooth/le/DistanceMeasurementSession.java
@@ -115,7 +115,7 @@ public final class DistanceMeasurementSession {
} catch (TimeoutException e) {
Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
} catch (RemoteException e) {
- throw e.rethrowFromSystemServer();
+ throw e.rethrowAsRuntimeException();
}
return defaultValue;
}
--
GitLab