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

Commit bbd723ce authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android Git Automerger
Browse files

am 144c4ff0: am 4cb113ed: Merge "Fix a NPE when shutting down instrumentation" into mnc-dev 

* commit '144c4ff0':
  Fix a NPE when shutting down instrumentation
parents ad9a0efc 144c4ff0

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;