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

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

Change-Id: I39c1d87546d4f2222919690fecfea3cb7dfae393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
An An Yu
2022-10-13 00:59:43 +00:00
committed by Automerger Merge Worker

View File

@@ -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"