commit a95f468d1f74d1a5aeb9bbc4b1a35ea3276b8f3f
author Svet Ganov <svetoslavganov@google.com> Sun Aug 30 10:44:39 2015 -0700
committer Svet Ganov <svetoslavganov@google.com> Sun Aug 30 11:00:31 2015 -0700
tree 3e85176ab21b2f107a6c59e59c21c56679359041
parent 2bf7b98a2ade8b3fe25143fa9ef94f2266a908dd

Fix a NPE when shutting down instrumentation

bug:23657953

Change-Id: I7187c3d911de24abe20a2c462a10352dd741efed

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

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 1b0e6a2..191bf99 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -17152,8 +17152,10 @@
         }
 
         // Can't call out of the system process with a lock held, so post a message.
-        mHandler.obtainMessage(SHUTDOWN_UI_AUTOMATION_CONNECTION_MSG,
-                app.instrumentationUiAutomationConnection).sendToTarget();
+        if (app.instrumentationUiAutomationConnection != null) {
+            mHandler.obtainMessage(SHUTDOWN_UI_AUTOMATION_CONNECTION_MSG,
+                    app.instrumentationUiAutomationConnection).sendToTarget();
+        }
 
         app.instrumentationWatcher = null;
         app.instrumentationUiAutomationConnection = null;