From 380626cf5482e0c27ffa5ad23a2a6aad483afe9a Mon Sep 17 00:00:00 2001
From: wilsonshih <wilsonshih@google.com>
Date: Fri, 21 Jun 2019 16:15:08 +0800
Subject: [PATCH] Prevent system server crash while start activity failed.

NPE at PendingActivityLaunch#sendErrorResult, callerApp can be null.

Bug: 135648362
Test: atest ActivityStarterTests
Change-Id: I7949dc1effcc171834f6bc3ff0333f9090b58480
Merged-In: I7949dc1effcc171834f6bc3ff0333f9090b58480
(cherry picked from commit 0c0fb22eabf8bb654dfd93ff1b0ef86afbb76e14)
---
 .../java/com/android/server/wm/ActivityStackSupervisor.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/ActivityStackSupervisor.java b/services/core/java/com/android/server/wm/ActivityStackSupervisor.java
index c992a69c2ecb5..19916bc617f44 100644
--- 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) {