diff --git a/framework/java/android/bluetooth/BluetoothGatt.java b/framework/java/android/bluetooth/BluetoothGatt.java
index 90922a802b9913dfb3b1455d16adedf1454189a8..d602f7d281e4327a8fe056c1389fbbfa8ee8266d 100644
--- a/framework/java/android/bluetooth/BluetoothGatt.java
+++ b/framework/java/android/bluetooth/BluetoothGatt.java
@@ -1498,7 +1498,7 @@ public final class BluetoothGatt implements BluetoothProfile {
             synchronized (mDeviceBusyLock) {
                 mDeviceBusy = false;
             }
-            throw e.rethrowFromSystemServer();
+            throw e.rethrowAsRuntimeException();
         }
 
         return requestStatus;
@@ -1641,7 +1641,7 @@ public final class BluetoothGatt implements BluetoothProfile {
             synchronized (mDeviceBusyLock) {
                 mDeviceBusy = false;
             }
-            e.rethrowFromSystemServer();
+            throw e.rethrowAsRuntimeException();
         }
         return BluetoothStatusCodes.ERROR_UNKNOWN;
     }