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

Merge "Don't let PIP window control system bars"

Browse Source
This commit is contained in:
TreeHugger Robot
2023-02-09 14:18:35 +00:00
committed by Android (Google) Code Review
parent 8093ecc113 c4e6f31875
commit 1be545d8c3
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5115,6 +5115,11 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
return mDeferHidingClient;
}
boolean canAffectSystemUiFlags() {
return task != null && task.canAffectSystemUiFlags() && isVisible()
&& !inPinnedWindowingMode();
}
@Override
boolean isVisible() {
// If the activity isn't hidden then it is considered visible and there is no need to check

8
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -2067,12 +2067,10 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
final boolean exiting = mAnimatingExit || mDestroying;
return shown && !exiting;
} else {
final Task task = getTask();
final boolean canFromTask = task != null && task.canAffectSystemUiFlags();
return canFromTask && mActivityRecord.isVisible()
// Do not let snapshot window control the bar
return mActivityRecord.canAffectSystemUiFlags()
// Do not let snapshot window control the bar
&& (mAttrs.type != TYPE_APPLICATION_STARTING
|| !(mStartingData instanceof SnapshotStartingData));
|| !(mStartingData instanceof SnapshotStartingData));
}
}