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

Merge "Catch double unbind of dead service"

Browse Source 
am: 03cdc95f1c

Change-Id: I9ff4cb306e807d769a1dd5acca06a2703b666040
This commit is contained in:
Tobias Lindskog
2018-04-20 11:35:18 -07:00
committed by android-build-merger
parent b0e8ab677b 03cdc95f1c
commit e0d33bc32e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/notification/ManagedServices.java
View File

@@ -844,7 +844,11 @@ abstract public class ManagedServices {
Slog.v(TAG, " disconnecting old " + getCaption() + ": " + info.service); Slog.v(TAG, " disconnecting old " + getCaption() + ": " + info.service);
removeServiceLocked(i); removeServiceLocked(i);
if (info.connection != null) { if (info.connection != null) {
mContext.unbindService(info.connection); try {
mContext.unbindService(info.connection);
} catch (IllegalArgumentException e) {
Slog.e(TAG, "failed to unbind " + name, e);
}
} }
} }
} }