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

Commit 3514f9c2 authored by Tiger Huang's avatar Tiger Huang Committed by Android (Google) Code Review
Browse files

Merge "Also check with mOverrideConfigTypes in providesDisplayDecorInsets" into main

parents c394bf3d 4b8a82ce

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

+6 −1
Original line number Diff line number Diff line
@@ -2011,9 +2011,14 @@ public class DisplayPolicy { 
            public String toString() {

                final StringBuilder tmpSb = new StringBuilder(32);

                return "{nonDecorInsets=" + mNonDecorInsets.toShortString(tmpSb)

                        + ", overrideNonDecorInsets=" + mOverrideNonDecorInsets.toShortString(tmpSb)

                        + ", configInsets=" + mConfigInsets.toShortString(tmpSb)

                        + ", overrideConfigInsets=" + mOverrideConfigInsets.toShortString(tmpSb)

                        + ", nonDecorFrame=" + mNonDecorFrame.toShortString(tmpSb)

                        + ", configFrame=" + mConfigFrame.toShortString(tmpSb) + '}';

                        + ", overrideNonDecorFrame=" + mOverrideNonDecorFrame.toShortString(tmpSb)

                        + ", configFrame=" + mConfigFrame.toShortString(tmpSb)

                        + ", overrideConfigFrame=" + mOverrideConfigFrame.toShortString(tmpSb)

                        + '}';

            }

        }

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

+3 −1
Original line number Diff line number Diff line
@@ -1814,9 +1814,11 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        if (mInsetsSourceProviders == null) {

            return false;

        }

        final @InsetsType int decorInsetsTypes =

                mWmService.mConfigTypes | mWmService.mOverrideConfigTypes;

        for (int i = mInsetsSourceProviders.size() - 1; i >= 0; i--) {

            final InsetsSource source = mInsetsSourceProviders.valueAt(i).getSource();

            if ((source.getType() & mWmService.mConfigTypes) != 0) {

            if ((source.getType() & decorInsetsTypes) != 0) {

                return true;

            }

        }