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

Merge "SurfaceView: Check ViewRootImpl non-null" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-17 00:16:36 +00:00
committed by Android (Google) Code Review
parent 892d269b65 c34aea875a
commit 3764cbaac4
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/view/SurfaceView.java
View File

@@ -1620,9 +1620,14 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
} }
private void updateRelativeZ(Transaction t) { private void updateRelativeZ(Transaction t) {
SurfaceControl viewRoot = getViewRootImpl().getSurfaceControl(); final ViewRootImpl viewRoot = getViewRootImpl();
t.setRelativeLayer(mBackgroundControl, viewRoot, Integer.MIN_VALUE); if (viewRoot == null) {
t.setRelativeLayer(mSurfaceControl, viewRoot, mSubLayer); // We were just detached.
return;
}
final SurfaceControl viewRootControl = viewRoot.getSurfaceControl();
t.setRelativeLayer(mBackgroundControl, viewRootControl, Integer.MIN_VALUE);
t.setRelativeLayer(mSurfaceControl, viewRootControl, mSubLayer);
} }
/** /**