commit 4beb6be3538f8da2a8206917cf17d9d5dd4d34ac
author Ruben Brunk <rubenbrunk@google.com> Tue Mar 22 19:12:25 2016 -0700
committer Ruben Brunk <rubenbrunk@google.com> Tue Mar 22 19:12:25 2016 -0700
tree bed2cc118e8cafe5a9631b422d0fb28bc0615ba9
parent 482c7da6ab5a95a28ee64cb4a0365b85e8681afb

Fix crash in ManagedApplicationService.

- Prevent unbindService call in case where we
  are calling disconnect on a service that has crashed.

Bug: 27706497
Change-Id: Ibb24087685f5152b6d8e339bd1e9dfa29be2730b

services/core/java/com/android/server/utils/ManagedApplicationService.java

diff --git a/services/core/java/com/android/server/utils/ManagedApplicationService.java b/services/core/java/com/android/server/utils/ManagedApplicationService.java
index ad8acef0..0f251fd 100644
--- a/services/core/java/com/android/server/utils/ManagedApplicationService.java
+++ b/services/core/java/com/android/server/utils/ManagedApplicationService.java
@@ -62,8 +62,6 @@
     private IInterface mBoundInterface;
     private PendingEvent mPendingEvent;
 
-
-
     private ManagedApplicationService(final Context context, final ComponentName component,
             final int userId, int clientLabel, String settingsAction,
             BinderChecker binderChecker) {
@@ -211,6 +209,7 @@
                         } else {
                             // Service connection wasn't pending, must have been disconnected
                             mContext.unbindService(this);
+                            return;
                         }
 
                         try {
@@ -242,6 +241,8 @@
                 @Override
                 public void onServiceDisconnected(ComponentName componentName) {
                     Slog.w(TAG, "Service disconnected: " + intent);
+                    mConnection = null;
+                    mBoundInterface = null;
                 }
             };