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

Merge "Avoid calling getTopMostTask() twice in Task#fillTaskInfo()"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-12-11 21:10:38 +00:00
committed by Android (Google) Code Review
parent 654d1ef544 41b8b1fab1
commit c0ef54bc66
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4125,7 +4125,7 @@ class Task extends WindowContainer<WindowContainer> {
info.positionInParent = getRelativePosition();
info.parentBounds = getParentBounds();
info.pictureInPictureParams = getPictureInPictureParams();
info.pictureInPictureParams = getPictureInPictureParams(top);
info.topActivityInfo = mReuseActivitiesReport.top != null
? mReuseActivitiesReport.top.info
: null;
@@ -4142,7 +4142,10 @@ class Task extends WindowContainer<WindowContainer> {
}
@Nullable PictureInPictureParams getPictureInPictureParams() {
final Task top = getTopMostTask();
return getPictureInPictureParams(getTopMostTask());
}
private @Nullable PictureInPictureParams getPictureInPictureParams(Task top) {
if (top == null) return null;
final ActivityRecord rootActivity = top.getRootActivity();
return (rootActivity == null || rootActivity.pictureInPictureArgs.empty())