mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-07-06 11:22:30 +00:00
46 lines
2.4 KiB
Diff
46 lines
2.4 KiB
Diff
|
From b55563bb9d534210c3f4c5e21ba07a63360c2094 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Achim Thesmann <achim@google.com>
|
||
|
|
Date: Tue, 23 May 2023 00:26:33 +0000
|
||
|
|
Subject: [PATCH] Ignore virtual presentation windows - RESTRICT AUTOMERGE
|
||
|
|
|
||
|
|
Windows of TYPE_PRESENTATION on virtual displays should not be counted
|
||
|
|
as visible windows to determine if BAL is allowed.
|
||
|
|
|
||
|
|
Test: manual test, atest BackgroundActivityLaunchTest
|
||
|
|
Bug: 264029851, 205130886
|
||
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4c40b187cd5277c27d20758c675865bf89180c7a)
|
||
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5bf9607bec3f1224158cfcff7dd91ac558b46c0f)
|
||
|
|
Merged-In: I08b16ba1c155e951286ddc22019180cbd6334dfa
|
||
|
|
Change-Id: I08b16ba1c155e951286ddc22019180cbd6334dfa
|
||
|
|
---
|
||
|
|
.../core/java/com/android/server/wm/WindowState.java | 12 ++++++++++--
|
||
|
|
1 file changed, 10 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
|
||
|
|
index 95fea0ee22f5..66213cc6403d 100644
|
||
|
|
--- a/services/core/java/com/android/server/wm/WindowState.java
|
||
|
|
+++ b/services/core/java/com/android/server/wm/WindowState.java
|
||
|
|
@@ -3596,12 +3596,20 @@ void onSurfaceShownChanged(boolean shown) {
|
||
|
|
// apps won't always be considered as foreground state.
|
||
|
|
// 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.
|
||
|
|
- if (mAttrs.type >= FIRST_SYSTEM_WINDOW && mAttrs.type != TYPE_TOAST
|
||
|
|
- && mAttrs.type != TYPE_PRIVATE_PRESENTATION) {
|
||
|
|
+ // Exclude presentations on virtual displays as they are not actually visible.
|
||
|
|
+ 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);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
+ private boolean isOnVirtualDisplay() {
|
||
|
|
+ return getDisplayContent().mDisplay.getType() == Display.TYPE_VIRTUAL;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
private void logExclusionRestrictions(int side) {
|
||
|
|
if (!logsGestureExclusionRestrictions(this)
|
||
|
|
|| SystemClock.uptimeMillis() < mLastExclusionLogUptimeMillis[side]
|