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

Commit 5d9b2f39 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: 63a3be6b 

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

Change-Id: Iaaafe3f9b70ed492e72ba85fff18fd05fcc74cc2
parents 9d9b74e0 63a3be6b

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);

    }



    /**