Merge "SnapdragonCamera: ANR when open photo just taken" into camera.lnx.1.0-dev.1.0

1 files changed, 25 insertions, 1 deletions

diff --git a/src/com/android/camera/AndroidCameraManagerImpl.java b/src/com/android/camera/AndroidCameraManagerImpl.java
index 486629895..438be2e90 100755..100644
--- a/src/com/android/camera/AndroidCameraManagerImpl.java
+++ b/src/com/android/camera/AndroidCameraManagerImpl.java
@@ -200,6 +200,30 @@ class AndroidCameraManagerImpl implements CameraManager {
             return true;
         }
 
+        public boolean waitDone(long timeout) {
+            final Object waitDoneLock = new Object();
+            final Runnable unlockRunnable = new Runnable() {
+                @Override
+                public void run() {
+                    synchronized (waitDoneLock) {
+                        waitDoneLock.notifyAll();
+                    }
+                }
+            };
+
+            synchronized (waitDoneLock) {
+                mCameraHandler.post(unlockRunnable);
+                try {
+                    waitDoneLock.wait(timeout);
+                    mCameraHandler.removeCallbacks(unlockRunnable);
+                } catch (InterruptedException ex) {
+                    Log.v(TAG, "waitDone interrupted");
+                    return false;
+                }
+            }
+            return true;
+        }
+
         /**
          * This method does not deal with the API level check.  Everyone should
          * check first for supported operations before sending message to this handler.
@@ -499,7 +523,7 @@ class AndroidCameraManagerImpl implements CameraManager {
         @Override
         public void stopPreview() {
             mCameraHandler.sendEmptyMessage(STOP_PREVIEW);
-            mCameraHandler.waitDone();
+            mCameraHandler.waitDone(200);
         }
 
         @Override