commit 92b3fbcdb77723b8ccbc4ab6590f44a9dc0b9a93
author Tiger Huang <tigerhuang@google.com> Fri Nov 05 14:41:54 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 05 14:41:54 2021 +0000
tree fe12fd4d981df902e1ff7202957981166ca88c71
parent 0759523698149b65564f497194ed0c0e0a53ac0c
parent 751839bd2a8512efd83c3a60f775f495c272f08d

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

core/java/android/view/View.java

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 572a7cd..f438609 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -20270,7 +20270,7 @@
      */
     @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 @@
 
         View parent = this;
 
-        while (parent.mParent != null && parent.mParent instanceof View) {
+        while (parent.mParent instanceof View) {
             parent = (View) parent.mParent;
         }