From 5f391188dc67c80f89cbab737c552ba7373586e4 Mon Sep 17 00:00:00 2001 From: wei zheng dong Date: Mon, 6 Feb 2017 10:07:16 +0800 Subject: [PATCH] camera case fail for testSceneModes add equals judgement for cts case: android.hardware.camera2.cts.CaptureRequestTest -m testSceneModes scene-mode (auto) is not single string in some platform, the source is from getCameraCharacteristics which contains multiple characters. so previous code == is not correct. Test: make Test: run android.hardware.camera2.cts.CaptureRequestTest -m testSceneModes Change-Id: Ie5ffeeebd0d0c237c80768a4a8217bc04e52a173 --- .../android/hardware/camera2/legacy/LegacyMetadataMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java b/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java index bb0a042799043..5423ca97eb283 100644 --- 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; }