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

Commit d303dd3d authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Prevent NPE in TextureView.getBitmap()" into jb-dev

parents 9ac32040 78245f77
Loading
Loading
Loading
Loading
+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;
    }