Merge "camera case fail for testSceneModes"

am: b59cd66e93 Change-Id: I509c87e5b69e4bd26dc97e86063f7a24860e8b3b
2017-02-16 21:44:56 +00:00
parent b872486722 b59cd66e93
commit a22c40839e
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;
        }