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

Commit 8fe31ec0 authored by John Reck's avatar John Reck Committed by android-build-merger
Browse files

Fix NPE in TextureView 

am: 3c2587f2

Change-Id: I79f35e5029cb3abb5fa74a60e448cd09835e2112
parents 31cde3cd 3c2587f2

core/java/android/view/TextureView.java

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

    }





    private void releaseSurfaceTexture() {

    private void releaseSurfaceTexture() {

        if (mSurface != null) {

            boolean shouldRelease = true;

            boolean shouldRelease = true;





            if (mListener != null) {

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

            mSurface = null;

            mHadSurface = true;

            mHadSurface = true;

        }

        }

    }





    /**

    /**

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

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