Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5f2f84f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not let snapshot window control the bar" into sc-v2-dev am: 61569f50 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16130260

Change-Id: Ieaac2ed5dfb68715401970c18e7a9627e7828ec8
parents 83de1f9d 61569f50

services/core/java/com/android/server/wm/DisplayPolicy.java

+7 −2
Original line number Diff line number Diff line
@@ -2665,10 +2665,15 @@ public class DisplayPolicy { 
    }



    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

        // anyway, so just hang on in whatever state we're in until things settle down.

        WindowState winCandidate = mFocusedWindow != null ? mFocusedWindow

                : mTopFullscreenOpaqueWindowState;

        if (winCandidate == null) {

            return;

        }