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

Commit 9f6cfc33 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix CTS"

parents efa4910e 9b30a74e

core/java/android/view/WindowInsets.java

+3 −2
Original line number Diff line number Diff line
@@ -387,7 +387,8 @@ public final class WindowInsets { 
     */

    @NonNull

    public WindowInsets consumeDisplayCutout() {

        return new WindowInsets(mTypeInsetsMap, mTypeMaxInsetsMap,

        return new WindowInsets(mSystemWindowInsetsConsumed ? null : mTypeInsetsMap,

                mStableInsetsConsumed ? null : mTypeMaxInsetsMap,

                mIsRound, mAlwaysConsumeNavBar,

                null /* displayCutout */);

    }
@@ -872,7 +873,7 @@ public final class WindowInsets { 
        @NonNull

        public Builder setStableInsets(@NonNull Insets stableInsets) {

            Preconditions.checkNotNull(stableInsets);

            assignCompatInsets(mTypeInsetsMap, stableInsets.toRect());

            assignCompatInsets(mTypeMaxInsetsMap, stableInsets.toRect());

            mStableInsetsConsumed = false;

            return this;

        }