Prevent system server crash while start activity failed.

am: 380626cf54 Change-Id: Ia94e84cbfbf3737cd9bd5d78a8c4c131a82a20e6
2019-07-02 10:30:09 -07:00
parent a240c31268 380626cf54
commit a6be7c3d44
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/wm/ActivityStackSupervisor.java
@@ -415,7 +415,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks {

        void sendErrorResult(String message) {
            try {
-                if (callerApp.hasThread()) {
+                if (callerApp != null && callerApp.hasThread()) {
                    callerApp.getThread().scheduleCrash(message);
                }
            } catch (RemoteException e) {