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

This commit is contained in:
TreeHugger Robot
2019-04-09 02:06:17 +00:00
committed by Android (Google) Code Review

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;
} }