Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a NPE when shutting down instrumentation" into mnc-dev

Browse Source
This commit is contained in:
Svetoslav Ganov
2015-08-31 17:16:23 +00:00
committed by Android (Google) Code Review
parent 3c227bf241 a95f468d1f
commit 4cb113ed72
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -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;