diff options
| author | Camera Software Integration <camswint@localhost> | 2016-12-22 22:55:23 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-22 22:55:23 -0800 |
| commit | 1507d7f588ce455aa6b4f72ff90609c4fde33e0a (patch) | |
| tree | 87b5622086ff0b341fcd141bae22b0af161d652a /src/com/android/camera/SettingsManager.java | |
| parent | aedc2351ec569c670dd167220cb2f2ca5dc7d71e (diff) | |
| parent | d0eb4c5e2cbd4b5af416e7150957d64b52edb04c (diff) | |
| download | android_packages_apps_Snap-1507d7f588ce455aa6b4f72ff90609c4fde33e0a.tar.gz android_packages_apps_Snap-1507d7f588ce455aa6b4f72ff90609c4fde33e0a.tar.bz2 android_packages_apps_Snap-1507d7f588ce455aa6b4f72ff90609c4fde33e0a.zip | |
Merge "SnapdragonCamera: HFR Crash on 720 120FPS with Camera 2" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/SettingsManager.java')
| -rw-r--r-- | src/com/android/camera/SettingsManager.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java index 3e2c7873d..6adbcfb64 100644 --- a/src/com/android/camera/SettingsManager.java +++ b/src/com/android/camera/SettingsManager.java @@ -1101,6 +1101,11 @@ public class SettingsManager implements ListMenu.SettingsListener { return mCharacteristics.get(cameraId).get(CameraCharacteristics.FLASH_INFO_AVAILABLE); } + public StreamConfigurationMap getStreamConfigurationMap(int cameraId){ + return mCharacteristics.get(cameraId) + .get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP); + } + public List<String> getSupportedColorEffects(int cameraId) { int[] flashModes = mCharacteristics.get(cameraId).get(CameraCharacteristics .CONTROL_AVAILABLE_EFFECTS); |