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

Merge "Attempt to fix NPE when reparent to the original task." into sc-dev

Browse Source
This commit is contained in:
Jeff Chang
2021-05-21 03:06:38 +00:00
committed by Android (Google) Code Review
parent 8cd70e05b1 5fedc1b697
commit fe4efedb7c
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/wm/Task.java
View File

@@ -1837,12 +1837,16 @@ class Task extends WindowContainer<WindowContainer> {
return autoRemoveRecents || (!hasChild() && !getHasBeenVisible()); return autoRemoveRecents || (!hasChild() && !getHasBeenVisible());
} }
/** Completely remove all activities associated with an existing task. */ private void clearPinnedTaskIfNeed() {
void performClearTask(String reason) {
// The original task is to be removed, try remove also the pinned task. // The original task is to be removed, try remove also the pinned task.
if (mChildPipActivity != null && mChildPipActivity.getTask() != null) { if (mChildPipActivity != null && mChildPipActivity.getTask() != null) {
mTaskSupervisor.removeRootTask(mChildPipActivity.getTask()); mTaskSupervisor.removeRootTask(mChildPipActivity.getTask());
} }
}
/** Completely remove all activities associated with an existing task. */
void performClearTask(String reason) {
clearPinnedTaskIfNeed();
// Broken down into to cases to avoid object create due to capturing mStack. // Broken down into to cases to avoid object create due to capturing mStack.
if (getRootTask() == null) { if (getRootTask() == null) {
forAllActivities((r) -> { forAllActivities((r) -> {
@@ -3220,7 +3224,7 @@ class Task extends WindowContainer<WindowContainer> {
mRemoving = true; mRemoving = true;
EventLogTags.writeWmTaskRemoved(mTaskId, reason); EventLogTags.writeWmTaskRemoved(mTaskId, reason);
clearPinnedTaskIfNeed();
// If applicable let the TaskOrganizer know the Task is vanishing. // If applicable let the TaskOrganizer know the Task is vanishing.
setTaskOrganizer(null); setTaskOrganizer(null);
@@ -5439,10 +5443,12 @@ class Task extends WindowContainer<WindowContainer> {
// force hidden flag. // force hidden flag.
if (!isForceHidden()) { if (!isForceHidden()) {
final Task lastParentBeforePip = topActivity.getLastParentBeforePip(); final Task lastParentBeforePip = topActivity.getLastParentBeforePip();
topActivity.reparent(lastParentBeforePip, if (lastParentBeforePip.isAttached()) {
lastParentBeforePip.getChildCount() /* top */, topActivity.reparent(lastParentBeforePip,
"movePinnedActivityToOriginalTask"); lastParentBeforePip.getChildCount() /* top */,
lastParentBeforePip.moveToFront("movePinnedActivityToOriginalTask"); "movePinnedActivityToOriginalTask");
lastParentBeforePip.moveToFront("movePinnedActivityToOriginalTask");
}
} }
} }
} }