Merge "camera case fail for testSceneModes" am: b59cd66e93 am: a22c40839e

am: a494d7287f Change-Id: I8e7c31b71e1ccfb77d5cb46949e438c2f1e1ef4c
2017-02-16 21:53:23 +00:00
parent 0a804ff49c a494d7287f
commit 6bd164bcd3
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java
+++ b/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java
@@ -646,7 +646,7 @@ public class LegacyMetadataMapper {

        // Special case where the only scene mode listed is AUTO => no scene mode
        if (sceneModes != null && sceneModes.size() == 1 &&
-                sceneModes.get(0) == Parameters.SCENE_MODE_AUTO) {
+                sceneModes.get(0).equals(Parameters.SCENE_MODE_AUTO)) {
            supportedSceneModes = null;
        }