Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a95675bf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "SurfaceView: Check ViewRootImpl non-null" into rvc-dev am: 3764cbaa am: 38972ce1 

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

Change-Id: If2e1fe9ee2983bd5414ca65a8777ce278a1474ae
parents 1d670109 38972ce1

core/java/android/view/SurfaceView.java

+8 −3
Original line number Diff line number Diff line
@@ -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);

    }



    /**