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

Commit c6156aa0 authored by jonerlin's avatar jonerlin
Browse files

Handle RemoteException when getstate exception 

Tag: #feature
Bug: 218313435
Bug: 221094658
Test: Let Bluetooth enable fail to check system status
Ignore-AOSP-First: aosp already included this patch
Change-Id: I136944f5b5a6e05ec302abde3425e358c9822b00
parent c4c4f922

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

            }