diff options
| author | Sol Boucher <solb@google.com> | 2014-08-04 23:41:38 -0700 |
|---|---|---|
| committer | Sol Boucher <solb@google.com> | 2014-08-15 16:49:39 -0700 |
| commit | 44ce4b26614f85518d548a6750c7a08908ae3596 (patch) | |
| tree | 885837d01ef7455af6b8800faa0d9b1547c3c673 /src/com/android/camera/settings/AppUpgrader.java | |
| parent | 2307b60abdf0af8639d71ba53cf10fdaf8dfe7e7 (diff) | |
| download | android_packages_apps_Camera2-44ce4b26614f85518d548a6750c7a08908ae3596.tar.gz android_packages_apps_Camera2-44ce4b26614f85518d548a6750c7a08908ae3596.tar.bz2 android_packages_apps_Camera2-44ce4b26614f85518d548a6750c7a08908ae3596.zip | |
Enable seamless switching to/from camera2-backed Photo module
This supports running individual modules against the camera2 API framework while
the rest of the modules use the legacy Camera class.
Bug: 16875535
Change-Id: Ic0ae313a3dd96ba22bacc36c7b1712b183b713ff
Diffstat (limited to 'src/com/android/camera/settings/AppUpgrader.java')
| -rw-r--r-- | src/com/android/camera/settings/AppUpgrader.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/settings/AppUpgrader.java b/src/com/android/camera/settings/AppUpgrader.java index ef2acd433..8d7e57912 100644 --- a/src/com/android/camera/settings/AppUpgrader.java +++ b/src/com/android/camera/settings/AppUpgrader.java @@ -111,7 +111,8 @@ public class AppUpgrader extends SettingsUpgrader { if (lastVersion < CAMERA_SIZE_SETTING_UPGRADE_VERSION) { CameraDeviceInfo infos = CameraAgentFactory - .getAndroidCameraAgent(context).getCameraDeviceInfo(); + .getAndroidCameraAgent(context, CameraAgentFactory.CameraApi.API_1) + .getCameraDeviceInfo(); upgradeCameraSizeSetting(settingsManager, context, infos, SettingsUtil.CAMERA_FACING_FRONT); upgradeCameraSizeSetting(settingsManager, context, infos, |