Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I1c3ffbd9a96a23314be35ec773893d847dfe2856
This commit is contained in:
Tiger Huang
2021-11-05 14:56:26 +00:00
committed by Automerger Merge Worker
parent 1ae91dda5d 92b3fbcdb7
commit 1bba929193
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/View.java
View File

@@ -20270,7 +20270,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
*/ */
@CallSuper @CallSuper
protected void onAttachedToWindow() { protected void onAttachedToWindow() {
if ((mPrivateFlags & PFLAG_REQUEST_TRANSPARENT_REGIONS) != 0) { if (mParent != null && (mPrivateFlags & PFLAG_REQUEST_TRANSPARENT_REGIONS) != 0) {
mParent.requestTransparentRegion(this); mParent.requestTransparentRegion(this);
} }
@@ -25044,7 +25044,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
View parent = this; View parent = this;
while (parent.mParent != null && parent.mParent instanceof View) { while (parent.mParent instanceof View) {
parent = (View) parent.mParent; parent = (View) parent.mParent;
} }