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 am: 3764cbaac4 am: 38972ce1f6

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

Change-Id: If2e1fe9ee2983bd5414ca65a8777ce278a1474ae
This commit is contained in:
TreeHugger Robot
2020-06-17 00:54:27 +00:00
committed by Automerger Merge Worker
parent 1d6701099e 38972ce1f6
commit a95675bfcf
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) {
SurfaceControl viewRoot = getViewRootImpl().getSurfaceControl();
t.setRelativeLayer(mBackgroundControl, viewRoot, Integer.MIN_VALUE);
t.setRelativeLayer(mSurfaceControl, viewRoot, mSubLayer);
final ViewRootImpl viewRoot = getViewRootImpl();
if (viewRoot == null) {
// We were just detached.
return;
}
final SurfaceControl viewRootControl = viewRoot.getSurfaceControl();
t.setRelativeLayer(mBackgroundControl, viewRootControl, Integer.MIN_VALUE);
t.setRelativeLayer(mSurfaceControl, viewRootControl, mSubLayer);
}
/**