Merge "Revert "SnapdragonCamera: Fix black screen on preview when switch photo/video"" into camera.lnx.3.0-dev

1 files changed, 9 insertions, 18 deletions

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index eb8a2f5e5..57ae68fe4 100755
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -757,15 +757,6 @@ public class PhotoModule
         openCameraCommon();
         resizeForPreviewAspectRatio();
         updateFocusManager(mUI);
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                Size size = mParameters.getPreviewSize();
-                SurfaceHolder sh = mUI.getSurfaceHolder();
-                if ( sh != null ){
-                    sh.setFixedSize(size.width-2, size.height-2);
-                }
-            }
-        });
     }
 
     private void switchCamera() {
@@ -821,15 +812,15 @@ public class PhotoModule
         // Start switch camera animation. Post a message because
         // onFrameAvailable from the old camera may already exist.
         mHandler.sendEmptyMessage(SWITCH_CAMERA_START_ANIMATION);
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                Size size = mParameters.getPreviewSize();
-                SurfaceHolder sh = mUI.getSurfaceHolder();
-                if ( sh != null ){
-                    sh.setFixedSize(size.width-2, size.height-2);
-                }
-            }
-        });
+         mActivity.runOnUiThread(new Runnable() {
+                 public void run() {
+                         Size size = mParameters.getPreviewSize();
+                         SurfaceHolder sh = mUI.getSurfaceHolder();
+                         if ( sh != null ){
+                                 sh.setFixedSize(size.width-2, size.height-2);
+                             }
+                     }
+             });
 
     }