summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2010-10-26 08:11:08 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-26 08:11:08 -0700
commita365e0209d5b7059f029a7433fc0ded6a73f0983 (patch)
tree581824206a9c4180ffe5df58c56fef9c9efe06d7 /src
parente141c69aa5a8d75e6f528cf1b5c69b98c6868b07 (diff)
parent89213eb3bc4b9fee513b4f57593339c7c6f53527 (diff)
downloadpackages_apps_LegacyCamera-a365e0209d5b7059f029a7433fc0ded6a73f0983.zip
packages_apps_LegacyCamera-a365e0209d5b7059f029a7433fc0ded6a73f0983.tar.gz
packages_apps_LegacyCamera-a365e0209d5b7059f029a7433fc0ded6a73f0983.tar.bz2
am 89213eb3: am 12a1f7a2: Fix the bug that wrong profile is selected after switching camera
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/VideoCamera.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index ad0b571..58d3fb1 100644
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -1243,7 +1243,9 @@ public class VideoCamera extends NoSearchActivity
// Reload the preferences.
mPreferences.setLocalId(this, mCameraId);
CameraSettings.upgradeLocalPreferences(mPreferences.getLocal());
-
+ // Read media profile again because camera id is changed.
+ readVideoPreferences();
+ resizeForPreviewAspectRatio();
restartPreview();
// Reload the UI.
@@ -1721,6 +1723,8 @@ public class VideoCamera extends NoSearchActivity
}
mCameraDevice.setParameters(mParameters);
+ // Keep preview size up to date.
+ mParameters = mCameraDevice.getParameters();
}
private boolean switchToCameraMode() {