diff options
| author | Yu Shan Emily Lau <yslau@google.com> | 2010-12-16 18:34:48 -0800 |
|---|---|---|
| committer | Yu Shan Emily Lau <yslau@google.com> | 2011-01-09 17:33:40 -0800 |
| commit | bbe9db4d12978f220aeb0379731b548420bbd6db (patch) | |
| tree | cd99b3ce58540a4a7f5480a06aa84085184cc516 /src/com/android/camera/Camera.java | |
| parent | 1a04bb18bcfafb903f192a4e5b65f2d0720f371e (diff) | |
| download | LegacyCamera-bbe9db4d12978f220aeb0379731b548420bbd6db.zip LegacyCamera-bbe9db4d12978f220aeb0379731b548420bbd6db.tar.gz LegacyCamera-bbe9db4d12978f220aeb0379731b548420bbd6db.tar.bz2 | |
Removed the flaky memory checking.
Added the image caputre and video recording stress test for the front facing camera.
Change-Id: Ice3abf35791e1953f70ef25375409fd5efe870b3
Diffstat (limited to 'src/com/android/camera/Camera.java')
| -rw-r--r-- | src/com/android/camera/Camera.java | 8 |
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()); |