Merge "Bunch of fixes."

1 files changed, 9 insertions, 1 deletions

diff --git a/core/java/android/view/HardwareRenderer.java b/core/java/android/view/HardwareRenderer.java
index cd6b820..44bd6d4 100644
--- a/core/java/android/view/HardwareRenderer.java
+++ b/core/java/android/view/HardwareRenderer.java
@@ -300,7 +300,6 @@ public abstract class HardwareRenderer {
              */
             if (!mEgl.eglMakeCurrent(mEglDisplay, mEglSurface, mEglSurface, mEglContext)) {
                 throw new RuntimeException("eglMakeCurrent failed");
-                
             }
 
             return mEglContext.getGL();
@@ -374,6 +373,15 @@ public abstract class HardwareRenderer {
                 attachInfo.mIgnoreDirtyState = true;
                 view.mPrivateFlags |= View.DRAWN;
 
+                // TODO: Don't check the current context when we have one per UI thread
+                // TODO: Use a threadlocal flag to know whether the surface has changed
+                if (mEgl.eglGetCurrentContext() != mEglContext ||
+                        mEgl.eglGetCurrentSurface(EGL10.EGL_DRAW) != mEglSurface) {
+                    if (!mEgl.eglMakeCurrent(mEglDisplay, mEglSurface, mEglSurface, mEglContext)) {
+                        throw new RuntimeException("eglMakeCurrent failed");
+                    }
+                }
+
                 onPreDraw();
 
                 Canvas canvas = mCanvas;