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

Merge "Prevent NPE while finishing activity" into rvc-dev am: 1dbee3e34b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788494

Change-Id: Ifab02f6f178bc587717434c704ce5edcab5014b2
This commit is contained in:
Louis Chang
2020-06-10 15:09:30 +00:00
committed by Automerger Merge Worker
parent 3a55ef5cc2 1dbee3e34b
commit 3884ae8712
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/ActivityTaskManagerService.java
View File

@@ -1685,6 +1685,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
final NeededUriGrants resultGrants = collectGrants(resultData, r.resultTo); final NeededUriGrants resultGrants = collectGrants(resultData, r.resultTo);
synchronized (mGlobalLock) { synchronized (mGlobalLock) {
// Sanity check in case activity was removed before entering global lock.
if (!r.isInHistory()) {
return true;
}
// Keep track of the root activity of the task before we finish it // Keep track of the root activity of the task before we finish it
final Task tr = r.getTask(); final Task tr = r.getTask();
final ActivityRecord rootR = tr.getRootActivity(); final ActivityRecord rootR = tr.getRootActivity();