Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e518be30 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 51beb81a: am ee93fd5c: am 7a0d746b: am baaf3ce6: Merge "Handle stopping of... 

am 51beb81a: am ee93fd5c: am 7a0d746b: am baaf3ce6: Merge "Handle stopping of services with still bound applications."

* commit '51beb81a':
  Handle stopping of services with still bound applications.
parents c5f9a42c 51beb81a

services/java/com/android/server/am/ActivityManagerService.java

+4 −2
Original line number Diff line number Diff line
@@ -10732,8 +10732,10 @@ public final class ActivityManagerService extends ActivityManagerNative 
                if (DEBUG_SERVICE) Slog.v(TAG, "unbindFinished in " + r

                        + " at " + b + ": apps="

                        + (b != null ? b.apps.size() : 0));













                boolean inStopping = mStoppingServices.contains(r);















                if (b != null) {













                    if (b.apps.size() > 0) {













                    if (b.apps.size() > 0 && !inStopping) {















                        // Applications have already bound since the last















                        // unbind, so just rebind right here.















                        requestServiceBindingLocked(r, b, true);









@@ -10744,7 +10746,7 @@ public final class ActivityManagerService extends ActivityManagerNative













                    }















                }



























                serviceDoneExecutingLocked(r, mStoppingServices.contains(r));













                serviceDoneExecutingLocked(r, inStopping);





























                Binder.restoreCallingIdentity(origId);















            }