commit c799916490f673784fd2e6f2077271b5ef05632d
author Linux Build Service Account <lnxbuild@localhost> Thu Dec 18 20:29:41 2014 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Dec 18 20:29:41 2014 -0800
tree ecd09d616e772c2c3cae3662ab049ba4523caac4
parent 3061c725158e1d2bced3bdbfb2ff7bbd83d93ded
parent dcb5f93ab9bb112b27fc128185e932a4c624a2af

Merge "Qcamera2: Sort camera info to avoid app open wrong camera"

QCamera2/HAL/QCameraParameters.cpp

diff --git a/QCamera2/HAL/QCameraParameters.cpp b/QCamera2/HAL/QCameraParameters.cpp
index 5d4250b..0e6b076 100644
--- a/QCamera2/HAL/QCameraParameters.cpp
+++ b/QCamera2/HAL/QCameraParameters.cpp
@@ -4439,7 +4439,13 @@
             m_pCapability->supported_effects_cnt,
             EFFECT_MODES_MAP,
             PARAM_MAP_SIZE(EFFECT_MODES_MAP));
-    set(KEY_SUPPORTED_EFFECTS, effectValues);
+
+    if (m_pCapability->supported_effects_cnt > 0) {
+        set(KEY_SUPPORTED_EFFECTS, effectValues);
+    } else {
+        ALOGE("Color effects are not available");
+        set(KEY_SUPPORTED_EFFECTS, EFFECT_NONE);
+    }
     setEffect(EFFECT_NONE);
 
     // Set WhiteBalance