Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbafadb3 authored by Svet Ganov's avatar Svet Ganov Committed by The Android Automerger
Browse files

Fix a NPE when shutting down instrumentation 

bug:23657953

Change-Id: I7187c3d911de24abe20a2c462a10352dd741efed
parent 30396784

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

+4 −2
Original line number Diff line number Diff line
@@ -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.













        if (app.instrumentationUiAutomationConnection != null) {















            mHandler.obtainMessage(SHUTDOWN_UI_AUTOMATION_CONNECTION_MSG,















                    app.instrumentationUiAutomationConnection).sendToTarget();













        }





























        app.instrumentationWatcher = null;















        app.instrumentationUiAutomationConnection = null;