summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Haeberling <haeberling@google.com>2013-09-17 15:44:22 -0700
committerSascha Haeberling <haeberling@google.com>2013-09-17 16:01:19 -0700
commit15125661ad968cf4d40989a9bc88d11189beb0b3 (patch)
tree01f6345f46ea62de7d2e0b193db56283716996d4
parent483d25a21058094303b94e44cc67cbd8fecd4bf8 (diff)
downloadandroid_packages_apps_Snap-15125661ad968cf4d40989a9bc88d11189beb0b3.tar.gz
android_packages_apps_Snap-15125661ad968cf4d40989a9bc88d11189beb0b3.tar.bz2
android_packages_apps_Snap-15125661ad968cf4d40989a9bc88d11189beb0b3.zip
Fall back to Photo module if stores index is illegal.
Bug: 10805249 Change-Id: Iace590af34cf646abf7af74b498520d686c04511
-rw-r--r--src/com/android/camera/CameraActivity.java15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 15f3966a4..013b10fe8 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1107,27 +1107,26 @@ public class CameraActivity extends Activity
private void setModuleFromIndex(int moduleIndex) {
mCurrentModuleIndex = moduleIndex;
switch (moduleIndex) {
- case ModuleSwitcher.VIDEO_MODULE_INDEX: {
+ case ModuleSwitcher.VIDEO_MODULE_INDEX:
mCurrentModule = new VideoModule();
break;
- }
- case ModuleSwitcher.PHOTO_MODULE_INDEX: {
+ case ModuleSwitcher.PHOTO_MODULE_INDEX:
mCurrentModule = new PhotoModule();
break;
- }
- case ModuleSwitcher.WIDE_ANGLE_PANO_MODULE_INDEX: {
+ case ModuleSwitcher.WIDE_ANGLE_PANO_MODULE_INDEX:
mCurrentModule = new WideAnglePanoramaModule();
break;
- }
- case ModuleSwitcher.LIGHTCYCLE_MODULE_INDEX: {
+ case ModuleSwitcher.LIGHTCYCLE_MODULE_INDEX:
mCurrentModule = PhotoSphereHelper.createPanoramaModule();
break;
- }
default:
+ // Fall back to photo mode.
+ mCurrentModule = new PhotoModule();
+ mCurrentModuleIndex = ModuleSwitcher.PHOTO_MODULE_INDEX;
break;
}
}