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

Merge "Youtube application when moving to PIP animation was very bad" am: b3c0709168 am: 692dca6088 am: a5476186bf am: 2daf036431

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

Change-Id: I7f66bcfc40965f726d3dbdfbb50df056b2517a7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hongwei Wang
2023-03-09 04:40:06 +00:00
committed by Automerger Merge Worker
parent a04c6d52e1 2daf036431
commit 22fafab20a
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1734,7 +1734,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
: null; : null;
} }
private void clearLastParentBeforePip() { void clearLastParentBeforePip() {
if (mLastParentBeforePip != null) { if (mLastParentBeforePip != null) {
mLastParentBeforePip.mChildPipActivity = null; mLastParentBeforePip.mChildPipActivity = null;
mLastParentBeforePip = null; mLastParentBeforePip = null;

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

@@ -2584,6 +2584,9 @@ class Task extends TaskFragment {
EventLogTags.writeWmTaskRemoved(mTaskId, getRootTaskId(), getDisplayId(), reason); EventLogTags.writeWmTaskRemoved(mTaskId, getRootTaskId(), getDisplayId(), reason);
clearPinnedTaskIfNeed(); clearPinnedTaskIfNeed();
if (mChildPipActivity != null) {
mChildPipActivity.clearLastParentBeforePip();
}
// If applicable let the TaskOrganizer know the Task is vanishing. // If applicable let the TaskOrganizer know the Task is vanishing.
setTaskOrganizer(null); setTaskOrganizer(null);