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

Merge "Ignore virtual presentation windows - RESTRICT AUTOMERGE" into sc-dev

Browse Source
This commit is contained in:
Achim Thesmann
2023-06-23 18:44:04 +00:00
committed by Android (Google) Code Review
parent 1e48b4313f bf60a0c6f1
commit 9857a30885
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3539,8 +3539,12 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
// apps won't always be considered as foreground state. // apps won't always be considered as foreground state.
// Exclude private presentations as they can only be shown on private virtual displays and // Exclude private presentations as they can only be shown on private virtual displays and
// shouldn't be the cause of an app be considered foreground. // shouldn't be the cause of an app be considered foreground.
if (mAttrs.type >= FIRST_SYSTEM_WINDOW && mAttrs.type != TYPE_TOAST // Exclude presentations on virtual displays as they are not actually visible.
&& mAttrs.type != TYPE_PRIVATE_PRESENTATION) { if (mAttrs.type >= FIRST_SYSTEM_WINDOW
&& mAttrs.type != TYPE_TOAST
&& mAttrs.type != TYPE_PRIVATE_PRESENTATION
&& !(mAttrs.type == TYPE_PRESENTATION && isOnVirtualDisplay())
) {
mWmService.mAtmService.mActiveUids.onNonAppSurfaceVisibilityChanged(mOwnerUid, shown); mWmService.mAtmService.mActiveUids.onNonAppSurfaceVisibilityChanged(mOwnerUid, shown);
} }
if (mIsImWindow && mWmService.mAccessibilityController != null) { if (mIsImWindow && mWmService.mAccessibilityController != null) {
@@ -3548,6 +3552,10 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
} }
} }
private boolean isOnVirtualDisplay() {
return getDisplayContent().mDisplay.getType() == Display.TYPE_VIRTUAL;
}
private void logExclusionRestrictions(int side) { private void logExclusionRestrictions(int side) {
if (!logsGestureExclusionRestrictions(this) if (!logsGestureExclusionRestrictions(this)
|| SystemClock.uptimeMillis() < mLastExclusionLogUptimeMillis[side] || SystemClock.uptimeMillis() < mLastExclusionLogUptimeMillis[side]