diff options
author | dkati <dkatikaridis@gmail.com> | 2018-06-27 23:58:31 +0300 |
---|---|---|
committer | Michael Bestas <mkbestas@lineageos.org> | 2019-11-09 22:47:26 +0200 |
commit | ab012beba808feaf2fec637c5aa8a2d7991eca9f (patch) | |
tree | 23521433c010fabeb02d59a9d50c4ca25e2b6bb1 /src | |
parent | 60a285627fcce6fe2d677efde4ce924946a2ec25 (diff) | |
download | android_packages_apps_Snap-ab012beba808feaf2fec637c5aa8a2d7991eca9f.tar.gz android_packages_apps_Snap-ab012beba808feaf2fec637c5aa8a2d7991eca9f.tar.bz2 android_packages_apps_Snap-ab012beba808feaf2fec637c5aa8a2d7991eca9f.zip |
CameraSettings: Do not crash if zoom ratios are not exposed
* On some devices, wrappers do not expose the zoom ratios, so the
list of zoomRatios is empty. So the .add() method cant run from a
null class. If zoom ratios are not exposed, simply return an empty
list and the camera will take the default HAL's zoom ratios
-This fixes front camera photo shoot on jfltexx
Change-Id: Ic64e41a8c5a2d51966ec95d4b020e5d3951eac0e
Diffstat (limited to 'src')
-rwxr-xr-x | src/com/android/camera/CameraSettings.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index f94c731f0..5b10d85a0 100755 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -829,10 +829,11 @@ public class CameraSettings { ArrayList<String> supported = new ArrayList<String>(); int zoomMaxIdx = params.getMaxZoom(); List <Integer> zoomRatios = params.getZoomRatios(); - int zoomMax = zoomRatios.get(zoomMaxIdx)/100; - - for (int zoomLevel = 0; zoomLevel <= zoomMax; zoomLevel++) { - supported.add(String.valueOf(zoomLevel)); + if (zoomRatios != null ) { + int zoomMax = zoomRatios.get(zoomMaxIdx)/100; + for (int zoomLevel = 0; zoomLevel <= zoomMax; zoomLevel++) { + supported.add(String.valueOf(zoomLevel)); + } } return supported; } |