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

Merge "Handle stopping of services with still bound applications."

Browse Source
This commit is contained in:
Dianne Hackborn
2011-08-16 19:29:25 -07:00
committed by Android Code Review
parent d144748d47 78f9fffca4
commit baaf3ce638
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -9692,8 +9692,10 @@ public final class ActivityManagerService extends ActivityManagerNative
if (DEBUG_SERVICE) Slog.v(TAG, "unbindFinished in " + r if (DEBUG_SERVICE) Slog.v(TAG, "unbindFinished in " + r
+ " at " + b + ": apps=" + " at " + b + ": apps="
+ (b != null ? b.apps.size() : 0)); + (b != null ? b.apps.size() : 0));
boolean inStopping = mStoppingServices.contains(r);
if (b != null) { if (b != null) {
if (b.apps.size() > 0) { if (b.apps.size() > 0 && !inStopping) {
// Applications have already bound since the last // Applications have already bound since the last
// unbind, so just rebind right here. // unbind, so just rebind right here.
requestServiceBindingLocked(r, b, true); requestServiceBindingLocked(r, b, true);
@@ -9704,7 +9706,7 @@ public final class ActivityManagerService extends ActivityManagerNative
} }
} }
serviceDoneExecutingLocked(r, mStoppingServices.contains(r)); serviceDoneExecutingLocked(r, inStopping);
Binder.restoreCallingIdentity(origId); Binder.restoreCallingIdentity(origId);
} }