diff options
| author | wilsonshih <wilsonshih@google.com> | 2019-06-21 16:15:08 +0800 |
|---|---|---|
| committer | wilsonshih <wilsonshih@google.com> | 2019-06-21 16:15:08 +0800 |
| commit | 0c0fb22eabf8bb654dfd93ff1b0ef86afbb76e14 (patch) | |
| tree | 6d6fcd737d4ea2f453aec922ebf65ca0e1e7df20 | |
| parent | a023ed5ff98734664face0c5055d0ae590555ae9 (diff) | |
Prevent system server crash while start activity failed.
NPE at PendingActivityLaunch#sendErrorResult, callerApp can be null.
Bug: 135648362
Test: atest ActivityStarterTests
Change-Id: I7949dc1effcc171834f6bc3ff0333f9090b58480
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityStackSupervisor.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityStackSupervisor.java b/services/core/java/com/android/server/wm/ActivityStackSupervisor.java index c992a69c2ecb..19916bc617f4 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) { |