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

Commit c89178f7 authored by Zach Johnson's avatar Zach Johnson Committed by Gerrit Code Review
Browse files

Merge "Handle RemoteException when getstate exception"

parents 114bc264 d9e28093

framework/java/android/bluetooth/BluetoothAdapter.java

+1 −4
Original line number Original line Diff line number Diff line
@@ -1163,11 +1163,8 @@ public final class BluetoothAdapter { 
                mService.getState(recv);

                mService.getState(recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(state);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(state);

            }

            }

        } catch (TimeoutException e) {

        } catch (RemoteException | TimeoutException e) {

            Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

        } catch (RemoteException e) {

            Log.e(TAG, "", e);

            e.rethrowFromSystemServer();

        } finally {

        } finally {

            mServiceLock.readLock().unlock();

            mServiceLock.readLock().unlock();

        }

        }