diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-01-20 00:17:25 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-01-20 00:17:25 -0800 |
| commit | e671621edaba4b7c5fbabf764c4d582e9266ded5 (patch) | |
| tree | 2d925980127cc8c4e395368809b85ecad7a51c64 /src/com/android/camera/CameraActivity.java | |
| parent | d917dde9ecd18dd6dd8f78bd6d4c89d417a90878 (diff) | |
| parent | 6893a76b8c03079f3c1f6c964345da6eca94b538 (diff) | |
| download | android_packages_apps_Snap-e671621edaba4b7c5fbabf764c4d582e9266ded5.tar.gz android_packages_apps_Snap-e671621edaba4b7c5fbabf764c4d582e9266ded5.tar.bz2 android_packages_apps_Snap-e671621edaba4b7c5fbabf764c4d582e9266ded5.zip | |
Merge "SnapdragonCamera: Open camera in init for improve start preview KPIs"
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 849dc33e3..9ba48bde8 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; @@ -1596,7 +1595,6 @@ public class CameraActivity extends Activity return; } - mIsModuleSwitchInProgress = true; CameraHolder.instance().keep(); closeModule(mCurrentModule); setModuleFromIndex(moduleIndex); @@ -1611,7 +1609,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; } /** |