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

Commit 0d78c381 authored by Galia Peycheva's avatar Galia Peycheva Committed by Automerger Merge Worker
Browse files

Merge "Fix return value in View#getUnrestrictedPreferKeepClearRects" into... 

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

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



Change-Id: Ia1cd39c69a80e431a871a4bcc44bcdcba589fef8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c372e264 43ad9184

core/java/android/view/View.java

+1 −1
Original line number Diff line number Diff line
@@ -11941,7 +11941,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
    @NonNull

    public final List<Rect> getUnrestrictedPreferKeepClearRects() {

        final ListenerInfo info = mListenerInfo;

        if (info != null && info.mKeepClearRects != null) {

        if (info != null && info.mUnrestrictedKeepClearRects != null) {

            return new ArrayList(info.mUnrestrictedKeepClearRects);

        }