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

Commit 66a4a6e4 authored by Jack Palevich's avatar Jack Palevich
Browse files

Fix merge conflict markers that accidentally got checked in. 

(They were in a comment, so it wasn't detected by the compiler.)
parent 21799450

opengl/java/android/opengl/GLSurfaceView.java

+1 −5
Original line number Diff line number Diff line
@@ -1405,14 +1405,10 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback 
        }



        /*

<<<<<<< HEAD

         * Tries to acquire the right to use an EGL

         * surface. Does not block.

=======

         * Tries once to acquire the right to use an EGL

         * surface. Does not block. Requires that we are already

         * in the sGLThreadManager monitor when this is called.

>>>>>>> dc49acb0

         *

         * @return true if the right to use an EGL surface was acquired.

         */

        public boolean tryAcquireEglSurfaceLocked(GLThread thread) {