Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent system server crash while start activity failed.

Browse Source 
NPE at PendingActivityLaunch#sendErrorResult, callerApp can be null.

Bug: 135648362
Test: atest ActivityStarterTests
Change-Id: I7949dc1effcc171834f6bc3ff0333f9090b58480
Merged-In: I7949dc1effcc171834f6bc3ff0333f9090b58480
(cherry picked from commit 0c0fb22eab)
This commit is contained in:
wilsonshih
2019-06-21 16:15:08 +08:00
committed by Wei Sheng Shih
parent bce828f157
commit 380626cf54
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/ActivityStackSupervisor.java
View File

@@ -415,7 +415,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks {
void sendErrorResult(String message) { void sendErrorResult(String message) {
try { try {
if (callerApp.hasThread()) { if (callerApp != null && callerApp.hasThread()) {
callerApp.getThread().scheduleCrash(message); callerApp.getThread().scheduleCrash(message);
} }
} catch (RemoteException e) { } catch (RemoteException e) {