summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/SettingsManager.java
diff options
context:
space:
mode:
authoryingrenw <yingrenw@codeaurora.org>2016-12-15 17:42:28 +0800
committeryingrenw <yingrenw@codeaurora.org>2016-12-15 17:49:45 +0800
commitd0eb4c5e2cbd4b5af416e7150957d64b52edb04c (patch)
tree01f72ffdfd0dfa8f80a5cab9cd792f2f4d79df95 /src/com/android/camera/SettingsManager.java
parent568dfe8fb8d7150e242ec778b039458d4e6e0b29 (diff)
downloadandroid_packages_apps_Snap-d0eb4c5e2cbd4b5af416e7150957d64b52edb04c.tar.gz
android_packages_apps_Snap-d0eb4c5e2cbd4b5af416e7150957d64b52edb04c.tar.bz2
android_packages_apps_Snap-d0eb4c5e2cbd4b5af416e7150957d64b52edb04c.zip
SnapdragonCamera: HFR Crash on 720 120FPS with Camera 2
Description: Solve the HFR Crash on 720 120FPS with Camera 2 when recording. Nullpointer crash. CaptureRequest native data copy don't have the tag data. Confirm the tag data can be copied. Change-Id: I745a09b789864db9cdbbe5cfcc8bcbc941e01bf3 CRs-Fixed: 1099749
Diffstat (limited to 'src/com/android/camera/SettingsManager.java')
-rw-r--r--src/com/android/camera/SettingsManager.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java
index c1c6442dd..7d0f202e1 100644
--- a/src/com/android/camera/SettingsManager.java
+++ b/src/com/android/camera/SettingsManager.java
@@ -1076,6 +1076,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);