diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2015-08-31 17:33:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-31 17:33:09 +0000 |
| commit | bbd723ce63abdc63c77869fe00ca4aee5a756a9e (patch) | |
| tree | 025e5cd0e2129776098e92f626a379d6ed7cac9d | |
| parent | ad9a0efc070f8a948f943d52a43dccf54e49db61 (diff) | |
| parent | 144c4ff08a0be40e6b8af1bca269b33557923d71 (diff) | |
| download | frameworks_base-bbd723ce63abdc63c77869fe00ca4aee5a756a9e.zip frameworks_base-bbd723ce63abdc63c77869fe00ca4aee5a756a9e.tar.gz frameworks_base-bbd723ce63abdc63c77869fe00ca4aee5a756a9e.tar.bz2 | |
am 144c4ff0: am 4cb113ed: Merge "Fix a NPE when shutting down instrumentation" into mnc-dev
* commit '144c4ff08a0be40e6b8af1bca269b33557923d71':
Fix a NPE when shutting down instrumentation
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 6 |
1 files changed, 4 insertions, 2 deletions
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 @@ public final class ActivityManagerService extends ActivityManagerNative } // 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; |