summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-12-19 13:41:11 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2018-12-19 13:41:11 -0800
commit2724ba5da0dfa3dee451bf51d9a1a8e5d37507a8 (patch)
treec5e4aa52d6c40d3e73e2274b71b1220404987814 /src
parent187eebb4e8b458be4397420ce4974bb1246d2a8d (diff)
parent57f872fed7cc58f59e8e63d8d9dd0b10b7bac34e (diff)
downloadandroid_packages_apps_Snap-2724ba5da0dfa3dee451bf51d9a1a8e5d37507a8.tar.gz
android_packages_apps_Snap-2724ba5da0dfa3dee451bf51d9a1a8e5d37507a8.tar.bz2
android_packages_apps_Snap-2724ba5da0dfa3dee451bf51d9a1a8e5d37507a8.zip
Merge "SnapdragonCamera: Fix NP when mCharacteristics size is 0" into camera-SnapdragonCamera.lnx.2.0
Diffstat (limited to 'src')
-rwxr-xr-xsrc/com/android/camera/SettingsManager.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java
index 0a8e00ecc..04d4a3b79 100755
--- a/src/com/android/camera/SettingsManager.java
+++ b/src/com/android/camera/SettingsManager.java
@@ -1345,8 +1345,10 @@ public class SettingsManager implements ListMenu.SettingsListener {
public boolean isBsgcAvailable(int id) {
boolean ret = false;
try {
- byte bsgc_available = mCharacteristics.get(id).get(CaptureModule.bsgcAvailable);
- ret = bsgc_available == 1;
+ if (mCharacteristics.size() > 0) {
+ byte bsgc_available = mCharacteristics.get(id).get(CaptureModule.bsgcAvailable);
+ ret = bsgc_available == 1;
+ }
} catch (IllegalArgumentException e) {
e.printStackTrace();
}