summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/Camera.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/camera/Camera.java')
-rw-r--r--src/com/android/camera/Camera.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index f37df10..78e0ad0 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -941,7 +941,15 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
mPreferences = new ComboPreferences(this);
CameraSettings.upgradeGlobalPreferences(mPreferences.getGlobal());
+
mCameraId = CameraSettings.readPreferredCameraId(mPreferences);
+
+ //Testing purpose. Launch a specific camera through the intent extras.
+ int intentCameraId = Util.getCameraFacingIntentExtras(this);
+ if (intentCameraId != -1) {
+ mCameraId = intentCameraId;
+ }
+
mPreferences.setLocalId(this, mCameraId);
CameraSettings.upgradeLocalPreferences(mPreferences.getLocal());