Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84a5eedc authored by Zach Johnson's avatar Zach Johnson Committed by Automerger Merge Worker
Browse files

Merge "Handle RemoteException when getstate exception" am: c89178f7 am: d0ef283b 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1984750

Change-Id: Iad36a4d4cb404a45579930484f4e23f461b1e9ed
parents 429dd844 d0ef283b

framework/java/android/bluetooth/BluetoothAdapter.java

+1 −4
Original line number Diff line number Diff line
@@ -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();

        }