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

Commit f81d2cdf authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Handle RemoteException when getstate exception" into tm-dev am: 37f74474 

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

Change-Id: Ia2ff0269e0e504054603d362fb70911a5c205127
parents 016295fe 37f74474

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();

            }