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

* commit 'baaf3ce6385da0f9f5ff6e2195e26c339ee9949e':
  Handle stopping of services with still bound applications.

Author: Dianne Hackborn

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

@@ -9692,8 +9692,10 @@ public void unbindFinished(IBinder token, Intent intent, boolean doRebind) {
                 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 void unbindFinished(IBinder token, Intent intent, boolean doRebind) {
                     }
                 }
 
-                serviceDoneExecutingLocked(r, mStoppingServices.contains(r));
+                serviceDoneExecutingLocked(r, inStopping);
 
                 Binder.restoreCallingIdentity(origId);
             }