summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjunjiez <junjiez@codeaurora.org>2018-06-15 14:45:30 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2018-07-19 19:24:23 -0700
commiteb87a877a4298e6c67556cf9a9ce562e6278427d (patch)
tree6fc3f9032daa6ece7b6cb71ffa5e780c1f2c9d9d
parent5650976a6f45535781ce30f0a2ee9f8e177bc1cd (diff)
downloadandroid_packages_apps_Snap-eb87a877a4298e6c67556cf9a9ce562e6278427d.tar.gz
android_packages_apps_Snap-eb87a877a4298e6c67556cf9a9ce562e6278427d.tar.bz2
android_packages_apps_Snap-eb87a877a4298e6c67556cf9a9ce562e6278427d.zip
SnapdragonCamera:Avoid index out of bounds
Check if the camera index is out of bounds when try to find Characteristics in the array Change-Id: I746a4ca4f227366da0e0b238e51f55425261189d CRs-Fixed: 2258762
-rwxr-xr-xsrc/com/android/camera/SettingsManager.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java
index 451aa8c3c..f8def573b 100755
--- a/src/com/android/camera/SettingsManager.java
+++ b/src/com/android/camera/SettingsManager.java
@@ -348,7 +348,9 @@ public class SettingsManager implements ListMenu.SettingsListener {
mDependendsOnMap = new HashMap<>();
mFilteredKeys = new HashSet<>();
try {
- mExtendedHFRSize = mCharacteristics.get(cameraId).get(CaptureModule.hfrFpsTable);
+ if (cameraId < mCharacteristics.size() -1) {
+ mExtendedHFRSize = mCharacteristics.get(cameraId).get(CaptureModule.hfrFpsTable);
+ }
}catch(IllegalArgumentException exception) {
exception.printStackTrace();
}