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

Commit 2f2c0e75 authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in layer destruction"

parents 96f0369b 6b3c4113

core/java/android/view/GLRenderer.java

+6 −1
Original line number Diff line number Diff line
@@ -499,12 +499,17 @@ public class GLRenderer extends HardwareRenderer { 
        mAttachedLayers.add(hardwareLayer);

    }



    boolean hasContext() {

        return sEgl != null && mEglContext != null

                && mEglContext.equals(sEgl.eglGetCurrentContext());

    }



    @Override

    void onLayerDestroyed(HardwareLayer layer) {

        if (mGlCanvas != null) {

            mGlCanvas.cancelLayerUpdate(layer);

        }

        if (Looper.myLooper() == Looper.getMainLooper() && validate()) {

        if (hasContext()) {

            long backingLayer = layer.detachBackingLayer();

            nDestroyLayer(backingLayer);

        }