diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-10 02:08:55 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-10 02:08:55 +0000 |
| commit | 6c897e526322043f504c6a3ff9fd4524f3f59d4b (patch) | |
| tree | 607f486e863b394d5f21a3d663166b574fa50fc4 /framework/java/android/bluetooth/BluetoothAdapter.java | |
| parent | 22389fee67a014fed221aadadcfbc1dc9cd7335f (diff) | |
| parent | c57caf832c63ec30ae148306bb2cb6a74c8d6c38 (diff) | |
Snap for 8283941 from c57caf832c63ec30ae148306bb2cb6a74c8d6c38 to tm-release
Change-Id: Ie94c30dbf9631f5da2c918ef051c8ecdb9825395
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothAdapter.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothAdapter.java | 11 |
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]; } /** |