Merge "Wait for the previous MosaicPreviewRenderer to end" into gb-ub-photos-bryce

diff --git a/src/com/android/camera/MosaicFrameProcessor.java b/src/com/android/camera/MosaicFrameProcessor.java
index c59e6b9..efd4ad2 100644 (file)
--- a/src/com/android/camera/MosaicFrameProcessor.java
+++ b/src/com/android/camera/MosaicFrameProcessor.java
@@ -92,7 +92,8 @@ public class MosaicFrameProcessor {
         mPreviewBufferSize = bufSize;
         setupMosaicer(mPreviewWidth, mPreviewHeight, mPreviewBufferSize);
         setStripType(Mosaic.STRIPTYPE_WIDE);
-        reset();
+        // no need to call reset() here. reset() should be called by the client
+        // after this initialization before calling other methods of this object.
     }
 
     public void clear() {

diff --git a/src/com/android/camera/MosaicPreviewRenderer.java b/src/com/android/camera/MosaicPreviewRenderer.java
index e12fe43..26ce733 100644 (file)
--- a/src/com/android/camera/MosaicPreviewRenderer.java
+++ b/src/com/android/camera/MosaicPreviewRenderer.java
@@ -90,6 +90,7 @@ public class MosaicPreviewRenderer {
                     break;
                 case MSG_RELEASE:
                     doRelease();
+                    mEglThreadBlockVar.open();
                     break;
             }
         }
@@ -203,7 +204,7 @@ public class MosaicPreviewRenderer {
     }
 
     public void release() {
-        mEglHandler.sendEmptyMessage(EGLHandler.MSG_RELEASE);
+        mEglHandler.sendMessageSync(EGLHandler.MSG_RELEASE);
     }
 
     public void showPreviewFrameSync() {