diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2015-08-31 17:16:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-31 17:16:23 +0000 |
| commit | 4cb113ed72b771d3148c00a025eb8bc949ff6a41 (patch) | |
| tree | 4ea967accc1a0fc2657aa928ac7a5edadd24ca38 /services | |
| parent | 3c227bf2418c6d1b6831f0fa7ad0442b0fcbdc07 (diff) | |
| parent | a95f468d1f74d1a5aeb9bbc4b1a35ea3276b8f3f (diff) | |
| download | frameworks_base-4cb113ed72b771d3148c00a025eb8bc949ff6a41.zip frameworks_base-4cb113ed72b771d3148c00a025eb8bc949ff6a41.tar.gz frameworks_base-4cb113ed72b771d3148c00a025eb8bc949ff6a41.tar.bz2 | |
Merge "Fix a NPE when shutting down instrumentation" into mnc-dev
Diffstat (limited to 'services')
| -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; |