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

Added missing calls to onConnected() and onDisconnected().

Browse Source 
They got lost in a previous refactoring....

Bug: 35395043
Test: CtsAutoFillServiceTestCases pass
Test: manual verification
Change-Id: I4e70f84185d6708ea0ebfa831c160e859fcf9e5c
This commit is contained in:
Felipe Leme
2017-02-16 08:14:48 -08:00
parent c3c62b3072
commit d473ec1137
1 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
services/autofill/java/com/android/server/autofill/RemoteFillService.java
View File

@@ -235,8 +235,19 @@ final class RemoteFillService implements DeathRecipient {
}
mBinding = false;
if (isBound()) {
mAutoFillService.asBinder().unlinkToDeath(this, 0);
mAutoFillService = null;
// TODO(b/33197203, b/35395043): synchronize access instead
// Need to double check if it's null, since it could be set on onServiceDisconnected()
if (mAutoFillService != null) {
try {
mAutoFillService.onDisconnected();
} catch (Exception e) {
Slog.w(LOG_TAG, "Exception calling onDisconnected(): " + e);
}
}
if (mAutoFillService != null) {
mAutoFillService.asBinder().unlinkToDeath(this, 0);
mAutoFillService = null;
}
}
mContext.unbindService(mServiceConnection);
}
@@ -305,6 +316,18 @@ final class RemoteFillService implements DeathRecipient {
return;
}
try {
// TODO(b/33197203, b/35395043): synchronize access instead
// Need to double check if it's null, since it could be set on
// onServiceDisconnected()
if (mAutoFillService != null) {
mAutoFillService.onConnected();
}
} catch (RemoteException e) {
Slog.w(LOG_TAG, "Exception calling onConnected(): " + e);
}
if (mPendingRequest != null) {
handlePendingRequest(mPendingRequest);
}