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

Commit 1bba9291 authored by Tiger Huang's avatar Tiger Huang Committed by Automerger Merge Worker
Browse files

Merge "Make sure mParent is not null before using it" into sc-v2-dev am: 92b3fbcd 

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

Change-Id: I1c3ffbd9a96a23314be35ec773893d847dfe2856
parents 1ae91dda 92b3fbcd

core/java/android/view/View.java

+2 −2
Original line number Diff line number Diff line
@@ -20270,7 +20270,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     */

    @CallSuper

    protected void onAttachedToWindow() {

        if ((mPrivateFlags & PFLAG_REQUEST_TRANSPARENT_REGIONS) != 0) {

        if (mParent != null && (mPrivateFlags & PFLAG_REQUEST_TRANSPARENT_REGIONS) != 0) {

            mParent.requestTransparentRegion(this);

        }










@@ -25044,7 +25044,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,



























        View parent = this;



























        while (parent.mParent != null && parent.mParent instanceof View) {













        while (parent.mParent instanceof View) {















            parent = (View) parent.mParent;















        }