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

Merge "Catch IAE from unbind onServiceDisconnected()" into pi-dev

Browse Source 
am: c83cf90166

Change-Id: I0fbb92d38a7e711e01dc9c0860e16ef4e102ce6e
This commit is contained in:
Bernardo Rufino
2018-04-05 04:38:46 -07:00
committed by android-build-merger
parent 85a2c917bd c83cf90166
commit 0f95a94940
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/backup/java/com/android/server/backup/transport/TransportClient.java
View File

@@ -439,8 +439,17 @@ public class TransportClient {
synchronized (mStateLock) {
log(Priority.ERROR, "Service disconnected: client UNUSABLE");
setStateLocked(State.UNUSABLE, null);
// After unbindService() no calls back to mConnection
mContext.unbindService(mConnection);
try {
// After unbindService() no calls back to mConnection
mContext.unbindService(mConnection);
} catch (IllegalArgumentException e) {
// TODO: Investigate why this is happening
// We're UNUSABLE, so any calls to mConnection will be no-op, so it's safe to
// swallow this one
log(
Priority.WARN,
"Exception trying to unbind onServiceDisconnected(): " + e.getMessage());
}
}
}