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

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

am 3007cc30: am d1c6dca6: am bbd723ce: am 144c4ff0: am 4cb113ed: Merge "Fix a... 

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

* commit '3007cc30':
  Fix a NPE when shutting down instrumentation
parents 5a0b7e98 3007cc30

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

+4 −2
Original line number Diff line number Diff line
@@ -17411,8 +17411,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;