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

Commit 9077b646 authored by Yunfan Chen's avatar Yunfan Chen Committed by Automerger Merge Worker
Browse files

Merge "Clear cached override frame when window removed" into tm-qpr-dev am:... 

Merge "Clear cached override frame when window removed" into tm-qpr-dev am: f58e5c16 am: 55d205a7

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



Change-Id: I1661e17cea93889eff2a9e2212323efe662e1136
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 297cc8e0 55d205a7

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -173,6 +173,7 @@ abstract class InsetsSourceProvider { 
        mWindowContainer = windowContainer;

        mWindowContainer = windowContainer;

        // TODO: remove the frame provider for non-WindowState container.

        // TODO: remove the frame provider for non-WindowState container.

        mFrameProvider = frameProvider;

        mFrameProvider = frameProvider;

        mOverrideFrames.clear();

        mOverrideFrameProviders = overrideFrameProviders;

        mOverrideFrameProviders = overrideFrameProviders;

        if (windowContainer == null) {

        if (windowContainer == null) {

            setServerVisible(false);

            setServerVisible(false);
@@ -234,6 +235,8 @@ abstract class InsetsSourceProvider { 
        updateSourceFrameForServerVisibility();

        updateSourceFrameForServerVisibility();





        if (mOverrideFrameProviders != null) {

        if (mOverrideFrameProviders != null) {

            // Not necessary to clear the mOverrideFrames here. It will be cleared every time the

            // override frame provider updates.

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

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

                final int windowType = mOverrideFrameProviders.keyAt(i);

                final int windowType = mOverrideFrameProviders.keyAt(i);

                final Rect overrideFrame;

                final Rect overrideFrame;