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

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

am baaf3ce6: Merge "Handle stopping of services with still bound applications." 

* commit 'baaf3ce6':
  Handle stopping of services with still bound applications.
parents b654e6e5 baaf3ce6

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

+4 −2
Original line number Diff line number Diff line
@@ -9692,8 +9692,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);
@@ -9704,7 +9706,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
                    }

                }



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

                serviceDoneExecutingLocked(r, inStopping);



                Binder.restoreCallingIdentity(origId);

            }