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

Commit 93a67ae7 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in TextureView am: 3c2587f2 am: 8fe31ec0 am: 2f072bae"

parents d07aa253 9ffce330

core/java/android/view/TextureView.java

+13 −11
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ public class TextureView extends View { 
    }



    private void releaseSurfaceTexture() {

        if (mSurface != null) {

            boolean shouldRelease = true;



            if (mListener != null) {
@@ -258,6 +259,7 @@ public class TextureView extends View { 
            mSurface = null;

            mHadSurface = true;

        }

    }



    /**

     * The layer type of a TextureView is ignored since a TextureView is always