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-07 00:49:37 -0800 |
| commit | f6069b16aea54fa33976c1ee4bf8654fd4518fc6 (patch) | |
| tree | 78111b310c2838347a90b8b06e343774922cc6be /src/com/android/camera/VideoCamera.java | |
| parent | 8c120ca9580660d54a932d91448fb1852599492f (diff) | |
| download | packages_apps_LegacyCamera-f6069b16aea54fa33976c1ee4bf8654fd4518fc6.zip packages_apps_LegacyCamera-f6069b16aea54fa33976c1ee4bf8654fd4518fc6.tar.gz packages_apps_LegacyCamera-f6069b16aea54fa33976c1ee4bf8654fd4518fc6.tar.bz2 | |
Removed the flaky memory checking.
Added the image caputre and video recording stress test for the front facing camera.
Change-Id: Ie9b3eebde5665f768bb1e950b8bb593feabb55ff
Diffstat (limited to 'src/com/android/camera/VideoCamera.java')
| -rw-r--r-- | src/com/android/camera/VideoCamera.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index 053b074..15f81ce 100644 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -311,6 +311,13 @@ public class VideoCamera extends NoSearchActivity 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()); |