Revert "'Fix' ANR in holiday build happening frequently from lockscreen."

This doesn't work well and introduces an issue with HDR+.

This reverts commit 7b81135c88f01cb2ac7a958dcb66c0d2d2bde7c4.

Change-Id: Ib7e412221c216d0cf6116817599d28a4d4afa3ef

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index f4e1f53..f6a166e 100644 (file)
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -554,11 +554,6 @@ public class CaptureModule extends CameraModule
 
     @Override
     public void resume() {
-        // Prevent a dead-lock where startPreview doesn't call the provided
-        // CaptureReadyCallback.
-        // TODO: Refactor to get rid of this lock.
-        mCameraOpenCloseLock.release();
-
         mPaused = false;
         mAppController.getCameraAppUI().onChangeCamera();
         mAppController.addPreviewAreaSizeChangedListener(this);