diff options
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 3 | ||||
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 2 |
2 files changed, 1 insertions, 4 deletions
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(); } |