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

Browse Source
This commit is contained in:
Tiger Huang
2021-11-05 14:41:54 +00:00
committed by Android (Google) Code Review
parent 0759523698 751839bd2a
commit 92b3fbcdb7
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
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;
}