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

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

Merge "Don't add insets when a container is detached" into tm-qpr-dev am: 82a9156b 

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



Change-Id: I1e731664e6cfbb5fcedaf3ad141f9cb9334d751b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f9f98af9 82a9156b

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

+10 −0
Original line number Diff line number Diff line
@@ -429,6 +429,13 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
        if (insetsTypes == null || insetsTypes.length == 0) {

            throw new IllegalArgumentException("Insets type not specified.");

        }

        if (mDisplayContent == null) {

            // This is possible this container is detached when WM shell is responding to a previous

            // request. WM shell will be updated when this container is attached again and the

            // insets need to be updated.

            Slog.w(TAG, "Can't add local rect insets source provider when detached. " + this);

            return;

        }

        if (mLocalInsetsSourceProviders == null) {

            mLocalInsetsSourceProviders = new SparseArray<>();

        }
@@ -1011,6 +1018,9 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
        if (dc != null && dc != this) {

            dc.getPendingTransaction().merge(mPendingTransaction);

        }

        if (dc != this && mLocalInsetsSourceProviders != null) {

            mLocalInsetsSourceProviders.clear();

        }

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

            final WindowContainer child = mChildren.get(i);

            child.onDisplayChanged(dc);