From 6893a76b8c03079f3c1f6c964345da6eca94b538 Mon Sep 17 00:00:00 2001
From: kaiyiz <kaiyiz@codeaurora.org>
Date: Fri, 16 Jan 2015 15:40:12 +0800
Subject: SnapdragonCamera: Open camera in init for improve start preview KPIs

When switch from VideoModule to PhotoModule, opencamera will run in
onResume rather than init() and start preview must be executed after
open camera.This lead to start preview slowly.

Open camera when module init for run start preview as early as possible.
so the flag mIsModuleSwitchInProgress isn't needed.
Reference similar action in VideoModule's init().

CRs-Fixed: 741089

Change-Id: I5a8fd18ef944fbc28f1b61470a4f389d3096c8ef
---
 src/com/android/camera/CameraActivity.java | 3 ---
 src/com/android/camera/PhotoModule.java    | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/com/android')

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index d460867a6..a4a87708d 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -190,7 +190,6 @@ public class CameraActivity extends Activity
     private ViewGroup mUndoDeletionBar;
     private boolean mIsUndoingDeletion = false;
     private boolean mIsEditActivityInProgress = false;
-    protected boolean mIsModuleSwitchInProgress = false;
     private View mPreviewCover;
     private FrameLayout mPreviewContentLayout;
 
@@ -1587,7 +1586,6 @@ public class CameraActivity extends Activity
             return;
         }
 
-        mIsModuleSwitchInProgress = true;
         CameraHolder.instance().keep();
         closeModule(mCurrentModule);
         setModuleFromIndex(moduleIndex);
@@ -1602,7 +1600,6 @@ public class CameraActivity extends Activity
         // starts up.
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         prefs.edit().putInt(CameraSettings.KEY_STARTUP_MODULE_INDEX, moduleIndex).apply();
-        mIsModuleSwitchInProgress = false;
     }
 
     /**
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 0e285738d..a837a8868 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -525,7 +525,7 @@ public class PhotoModule
         mPreferences.setLocalId(mActivity, mCameraId);
         CameraSettings.upgradeLocalPreferences(mPreferences.getLocal());
 
-        if (mOpenCameraThread == null && !mActivity.mIsModuleSwitchInProgress) {
+        if (mOpenCameraThread == null) {
             mOpenCameraThread = new OpenCameraThread();
             mOpenCameraThread.start();
         }
-- 
cgit v1.2.3