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

Commit 78245f77 authored by Romain Guy's avatar Romain Guy
Browse files

Prevent NPE in TextureView.getBitmap() 

This crash could occur when invoking setSurfaceTexture() then getBitmap()
before the View has a chance to be drawn.

Change-Id: I25c55df15750e59b9c916e8f750de2c89718d39e
parent c9c275fe

core/java/android/view/TextureView.java

+11 −1
Original line number Diff line number Diff line
@@ -561,8 +561,18 @@ public class TextureView extends View { 
            applyUpdate();

            applyTransformMatrix();



            // This case can happen if the app invokes setSurfaceTexture() before

            // we are able to create the hardware layer. We can safely initialize

            // the layer here thanks to the validate() call at the beginning of

            // this method

            if (mLayer == null && mUpdateSurface) {

                getHardwareLayer();

            }



            if (mLayer != null) {

                mLayer.copyInto(bitmap);

            }

        }

        return bitmap;

    }