diff options
| author | Zach Johnson <zachoverflow@google.com> | 2022-02-16 01:09:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-16 01:09:17 +0000 |
| commit | 84a5eedc00707da0ea1f8bb60508f693bb62fa61 (patch) | |
| tree | 932689815b73066075bbe9b56f6ae3d70146e077 /framework/java/android/bluetooth/BluetoothAdapter.java | |
| parent | 429dd844705acf0517b2ce29e65c4014481811ab (diff) | |
| parent | d0ef283bfa73c5c3e743bd8ed2f6ba8e35b55dad (diff) | |
Merge "Handle RemoteException when getstate exception" am: c89178f725 am: d0ef283bfa
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1984750
Change-Id: Iad36a4d4cb404a45579930484f4e23f461b1e9ed
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothAdapter.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothAdapter.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java index 8f1d0c642d..1ff2d8ca67 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(); } |