diff options
| author | Camera Software Integration <camswint@quicinc.com> | 2019-11-06 23:19:51 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-11-06 23:19:51 -0800 |
| commit | 0a60a20d24e8124d9a10d2d01d6fd9131123ec18 (patch) | |
| tree | d31ef12dd988a1220f2db7c7de709719acd1b065 | |
| parent | 97bcb1f9139d964ce67e2aabc512666036a39522 (diff) | |
| parent | 91c1d6a62f06fded27d4f4489f627d1ea3a0709f (diff) | |
| download | android_packages_apps_Snap-0a60a20d24e8124d9a10d2d01d6fd9131123ec18.tar.gz android_packages_apps_Snap-0a60a20d24e8124d9a10d2d01d6fd9131123ec18.tar.bz2 android_packages_apps_Snap-0a60a20d24e8124d9a10d2d01d6fd9131123ec18.zip | |
Merge "SnapdraongCamera:APP-ZSL size" into camera-SnapdragonCamera.lnx.2.0
| -rwxr-xr-x | src/com/android/camera/SettingsManager.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java index 9f42e7c6a..532eae8ec 100755 --- a/src/com/android/camera/SettingsManager.java +++ b/src/com/android/camera/SettingsManager.java @@ -1735,7 +1735,12 @@ public class SettingsManager implements ListMenu.SettingsListener { public Size[] getSupportedOutputSize(int cameraId, Class cl) { StreamConfigurationMap map = mCharacteristics.get(cameraId).get( CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP); - return map.getOutputSizes(cl); + Size[] normal = map.getOutputSizes(cl); + Size[] high = map.getHighResolutionOutputSizes(ImageFormat.PRIVATE); + Size[] ret = new Size[normal.length+high.length]; + System.arraycopy(normal,0,ret,0,normal.length); + System.arraycopy(high,0,ret,normal.length,high.length); + return ret; } private List<String> getSupportedVideoDuration() { |