1 files changed, 4 insertions, 7 deletions
diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java
index 5767abb2b5..a1726307d9 100644
--- a/framework/java/android/bluetooth/BluetoothAdapter.java
+++ b/framework/java/android/bluetooth/BluetoothAdapter.java
@@ -1163,11 +1163,8 @@ public final class BluetoothAdapter {
                     mService.getState(recv);
                     return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(state);
                 }
-            } catch (TimeoutException e) {
+            } catch (RemoteException | TimeoutException e) {
                 Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
-            } catch (RemoteException e) {
-                Log.e(TAG, "", e);
-                e.rethrowFromSystemServer();
             } finally {
                 mServiceLock.readLock().unlock();
             }
@@ -1490,9 +1487,9 @@ public final class BluetoothAdapter {
     @RequiresBluetoothConnectPermission
     @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
     @SuppressLint(value = {"ArrayReturn", "NullableCollection"})
-    public @Nullable ParcelUuid[] getUuids() {
+    public @NonNull ParcelUuid[] getUuids() {
         if (getState() != STATE_ON) {
-            return null;
+            return new ParcelUuid[0];
         }
         try {
             mServiceLock.readLock().lock();
@@ -1509,7 +1506,7 @@ public final class BluetoothAdapter {
         } finally {
             mServiceLock.readLock().unlock();
         }
-        return null;
+        return new ParcelUuid[0];
     }
 
     /**