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

Merge "Merge "ViewRootImpl: More null checks for performTraversals." into oc-dev am: 6f87503ed8 am: c52b16c97d" into oc-dr1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2017-06-16 20:27:38 +00:00
committed by Android (Google) Code Review
parent fcee629aa6 37110b09af
commit ffb8035798
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/view/ViewRootImpl.java
View File

@@ -2476,6 +2476,9 @@ public final class ViewRootImpl implements ViewParent,
mInLayout = true;
final View host = mView;
if (host == null) {
return;
}
if (DEBUG_ORIENTATION || DEBUG_LAYOUT) {
Log.v(mTag, "Laying out " + host + " to (" +
host.getMeasuredWidth() + ", " + host.getMeasuredHeight() + ")");
@@ -2783,6 +2786,8 @@ public final class ViewRootImpl implements ViewParent,
private void performDraw() {
if (mAttachInfo.mDisplayState == Display.STATE_OFF && !mReportNextDraw) {
return;
} else if (mView == null) {
return;
}
final boolean fullRedrawNeeded = mFullRedrawNeeded;