| commit | 48de4f00e087116a4cd08db9e5512e75a69ed40a | [log] [tgz] |
|---|---|---|
| author | Tiger Huang <tigerhuang@google.com> | Fri Nov 05 15:09:58 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 05 15:09:58 2021 +0000 |
| tree | 3b4911cb94a4319eed6728c53c2ff5bf0df70f26 | |
| parent | 5dae3ca918908b1d76352665802e52ef2c55623e [diff] | |
| parent | 1bba9291930c2dff379216d1cc3d5c52aacd30b0 [diff] |
Merge "Make sure mParent is not null before using it" into sc-v2-dev am: 92b3fbcdb7 am: 1bba929193 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16182631 Change-Id: I7e7d2cef60236ba1e4cd37214e4aec0a38040529
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index dabe1e9..f529172 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java
@@ -20288,7 +20288,7 @@ */ @CallSuper protected void onAttachedToWindow() { - if ((mPrivateFlags & PFLAG_REQUEST_TRANSPARENT_REGIONS) != 0) { + if (mParent != null && (mPrivateFlags & PFLAG_REQUEST_TRANSPARENT_REGIONS) != 0) { mParent.requestTransparentRegion(this); } @@ -25070,7 +25070,7 @@ View parent = this; - while (parent.mParent != null && parent.mParent instanceof View) { + while (parent.mParent instanceof View) { parent = (View) parent.mParent; }