Revert "Camera: Fix camcorder crash during pause and resume"

 * Fixes OPPO-131. I am not able to reproduce the original issue
   that this was fixing, let's just revert it to fix the freeze
   when in the filmstrip view.

This reverts commit 593f1735c0d380b7be237fe468ad8f343d767935.

Change-Id: Icf18d7aaafaa1de85621b088d62c2e853675945e

2 files changed, 14 insertions, 55 deletions

diff --git a/src/com/android/camera/CameraScreenNail.java b/src/com/android/camera/CameraScreenNail.java
index 6244c25ab..ec6d6f6e2 100644
--- a/src/com/android/camera/CameraScreenNail.java
+++ b/src/com/android/camera/CameraScreenNail.java
@@ -237,15 +237,6 @@ public class CameraScreenNail extends SurfaceTextureScreenNail {
         mListener.requestRender();
     }
 
-    public void cancelAcquire() {
-         synchronized (mLock) {
-            if (mAcquireTexture) {
-                mAcquireTexture = false;
-                mLock.notifyAll();
-            }
-         }
-    }
-
     @Override
     public void releaseSurfaceTexture() {
         synchronized (mLock) {
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index f64ed864e..de6001879 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -94,7 +94,6 @@ public class VideoModule implements CameraModule,
     private static final int SWITCH_CAMERA_START_ANIMATION = 9;
     private static final int HIDE_SURFACE_VIEW = 10;
     private static final int CAPTURE_ANIMATION_DONE = 11;
-    private static final int START_PREVIEW_DONE = 12;
 
     private static final int SCREEN_DELAY = 2 * 60 * 1000;
 
@@ -207,8 +206,6 @@ public class VideoModule implements CameraModule,
 
     private boolean mEnableHFR = false;
 
-    private StartPreviewThread mStartPreviewThread;
-
     private boolean mIsFullScreen = true;
 
     private final MediaSaveService.OnMediaSavedListener mOnVideoSavedListener =
@@ -243,16 +240,6 @@ public class VideoModule implements CameraModule,
         }
     }
 
-    private class StartPreviewThread extends Thread {
-        @Override
-        public void run() {
-            try {
-                startPreview();
-            }catch (Exception e) {
-            }
-        }
-    }
-
     private void openCamera() {
         try {
             synchronized(mCameraOpened) {
@@ -343,11 +330,6 @@ public class VideoModule implements CameraModule,
                     break;
                 }
 
-                case START_PREVIEW_DONE: {
-                    mStartPreviewThread = null;
-                    break;
-                }
-
                 default:
                     Log.v(TAG, "Unhandled message: " + msg.what);
                     break;
@@ -457,16 +439,15 @@ public class VideoModule implements CameraModule,
             // ignore
         }
 
-        CameraScreenNail screenNail = (CameraScreenNail) mActivity.mCameraScreenNail;
-        if (screenNail.getSurfaceTexture() == null) {
-            screenNail.acquireSurfaceTexture();
-        }
 
         readVideoPreferences();
         mUI.setPrefChangedListener(this);
-
-        mStartPreviewThread = new StartPreviewThread();
-        mStartPreviewThread.start();
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                startPreview();
+            }
+        }).start();
 
         mQuickCapture = mActivity.getIntent().getBooleanExtra(EXTRA_QUICK_CAPTURE, false);
         mLocationManager = new LocationManager(mActivity, null);
@@ -922,7 +903,7 @@ public class VideoModule implements CameraModule,
         showVideoSnapshotUI(false);
         mUI.enableShutter(false);
 
-        if (!mPreviewing && mStartPreviewThread == null) {
+        if (!mPreviewing) {
             resetEffect();
             resetExposureCompensation();
             openCamera();
@@ -936,14 +917,12 @@ public class VideoModule implements CameraModule,
             }
             readVideoPreferences();
             resizeForPreviewAspectRatio();
-
-            CameraScreenNail screenNail = (CameraScreenNail) mActivity.mCameraScreenNail;
-            screenNail.cancelAcquire();
-            if (screenNail.getSurfaceTexture() == null) {
-                screenNail.acquireSurfaceTexture();
-            }
-            mStartPreviewThread = new StartPreviewThread();
-            mStartPreviewThread.start();
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    startPreview();
+                }
+            }).start();
         } else {
             // preview already started
             mHandler.sendEmptyMessage(ENABLE_SHUTTER_BUTTON);
@@ -1060,7 +1039,6 @@ public class VideoModule implements CameraModule,
 
     private void onPreviewStarted() {
         mHandler.sendEmptyMessage(ENABLE_SHUTTER_BUTTON);
-        mHandler.sendEmptyMessage(START_PREVIEW_DONE);
     }
 
     @Override
@@ -1086,16 +1064,6 @@ public class VideoModule implements CameraModule,
 
     // By default, we want to close the effects as well with the camera.
     private void closeCamera() {
-        CameraScreenNail screenNail = (CameraScreenNail) mActivity.mCameraScreenNail;
-        screenNail.cancelAcquire();
-        try {
-            if (mStartPreviewThread != null) {
-                mStartPreviewThread.interrupt();
-                mStartPreviewThread.join();
-                mStartPreviewThread = null;
-            }
-        } catch (InterruptedException e) {
-        }
         closeCamera(true);
     }
 
@@ -2227,7 +2195,7 @@ public class VideoModule implements CameraModule,
             mActivity.notifyScreenNailChanged();
         }
 
-        if (mStartPreviewThread == null && screenNail.getSurfaceTexture() == null) {
+        if (screenNail.getSurfaceTexture() == null) {
             screenNail.acquireSurfaceTexture();
         }