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

Commit 4601dd22 authored by An An Yu's avatar An An Yu Committed by Automerger Merge Worker
Browse files

Merge "Upon double registration just return instead of throwing exception"... 

Merge "Upon double registration just return instead of throwing exception" into tm-qpr-dev am: a3be6a17

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



Change-Id: I24566dd9ca1ed2ad66fa0966ad7aad548f0293ea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ac375b6f a3be6a17

libs/WindowManager/Jetpack/src/androidx/window/extensions/layout/WindowLayoutComponentImpl.java

+1 −3
Original line number Diff line number Diff line
@@ -117,9 +117,7 @@ public class WindowLayoutComponentImpl implements WindowLayoutComponent { 
        if (mWindowLayoutChangeListeners.containsKey(context)

                // In theory this method can be called on the same consumer with different context.

                || mWindowLayoutChangeListeners.containsValue(consumer)) {

            throw new IllegalArgumentException(

                    "Context or Consumer has already been registered for WindowLayoutInfo"

                            + " callback.");

            return;

        }

        if (!context.isUiContext()) {

            throw new IllegalArgumentException("Context must be a UI Context, which should be"