Projects >> platform_frameworks_base >>8da3ac92a6a6247ef06de4d4b684f8635d8fc003

Chunk
Conflicting content 
        }
    }

<<<<<<< HEAD
    private static class GLThreadManager {
=======
    static class GLThreadManager {
        public boolean shouldHaveEgl(GLThread thread) {
            synchronized(this) {
                return thread == mMostRecentGLThread || mMostRecentGLThread == null;
            }
        }
>>>>>>> 3f857b78fc68e5d700139bdc6078c5333b62a9bc
        public void start(GLThread thread) throws InterruptedException {
           if (! mGLESVersionCheckComplete) {
                mGLESVersion = SystemProperties.getInt(
Solution content 
        }
    }

    private static class GLThreadManager {
        public boolean shouldHaveEgl(GLThread thread) {
            if (mMultipleGLESContextsAllowed) {
                return true;
            } else {
                synchronized(this) {
                    return thread == mMostRecentGLThread || mMostRecentGLThread == null;
                }
            }
        }

        public void start(GLThread thread) throws InterruptedException {
           if (! mGLESVersionCheckComplete) {
                mGLESVersion = SystemProperties.getInt(
File
GLSurfaceView.java
Developer's decision
Manual
Kind of conflict
Class signature
Method declaration