Merge "Fix return value in View#getUnrestrictedPreferKeepClearRects" into tm-dev am: 32667b28c6

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

Change-Id: Ib1d4054606900044774b895b9947196ddec13a64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Galia Peycheva
2022-05-11 20:21:56 +00:00
committed by Automerger Merge Worker

View File

@@ -11941,7 +11941,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
@NonNull @NonNull
public final List<Rect> getUnrestrictedPreferKeepClearRects() { public final List<Rect> getUnrestrictedPreferKeepClearRects() {
final ListenerInfo info = mListenerInfo; final ListenerInfo info = mListenerInfo;
if (info != null && info.mKeepClearRects != null) { if (info != null && info.mUnrestrictedKeepClearRects != null) {
return new ArrayList(info.mUnrestrictedKeepClearRects); return new ArrayList(info.mUnrestrictedKeepClearRects);
} }