Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixes crash due to assigning service before linking death recipient." into qt-dev

Browse Source 
am: e3aa7b9ac3

Change-Id: I2859efc3c0b4a64f182a219f17843878bb3496d2
This commit is contained in:
Adam He
2019-04-08 20:37:07 -07:00
committed by android-build-merger
parent 2061f81054 e3aa7b9ac3
commit c41c7b35d5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/infra/AbstractRemoteService.java
View File

@@ -449,13 +449,13 @@ public abstract class AbstractRemoteService<S extends AbstractRemoteService<S, I
return; return;
} }
mBinding = false; mBinding = false;
mService = getServiceInterface(service);
try { try {
service.linkToDeath(AbstractRemoteService.this, 0); service.linkToDeath(AbstractRemoteService.this, 0);
} catch (RemoteException re) { } catch (RemoteException re) {
handleBinderDied(); handleBinderDied();
return; return;
} }
mService = getServiceInterface(service);
handleOnConnectedStateChangedInternal(true); handleOnConnectedStateChangedInternal(true);
mServiceDied = false; mServiceDied = false;
} }