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

Merge "Do not let snapshot window control the bar" into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-11-09 08:55:01 +00:00
committed by Android (Google) Code Review
parent 0c947aa41d 2e6e4355e6
commit 61569f50fb
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/wm/DisplayPolicy.java
View File

@@ -2665,10 +2665,15 @@ public class DisplayPolicy {
} }
void updateSystemBarAttributes() { void updateSystemBarAttributes() {
WindowState winCandidate = mFocusedWindow;
if (winCandidate == null && mTopFullscreenOpaqueWindowState != null
&& (mTopFullscreenOpaqueWindowState.mAttrs.flags
& WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) == 0) {
// Only focusable window can take system bar control.
winCandidate = mTopFullscreenOpaqueWindowState;
}
// If there is no window focused, there will be nobody to handle the events // If there is no window focused, there will be nobody to handle the events
// anyway, so just hang on in whatever state we're in until things settle down. // anyway, so just hang on in whatever state we're in until things settle down.
WindowState winCandidate = mFocusedWindow != null ? mFocusedWindow
: mTopFullscreenOpaqueWindowState;
if (winCandidate == null) { if (winCandidate == null) {
return; return;
} }