diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2017-02-16 21:53:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-16 21:53:23 +0000 |
| commit | 6bd164bcd340e2e10ce87d88678f83e6fbd6a7b2 (patch) | |
| tree | 464837d23f96e49ebc71a30f158f9dfe72a562da /core/java/android | |
| parent | 0a804ff49c76bfbca7bd7589ada59d238367fd1c (diff) | |
| parent | a494d7287f6dd3ce600a1e2bb8346b0dc7bf7cfc (diff) | |
Merge "camera case fail for testSceneModes" am: b59cd66e93 am: a22c40839e
am: a494d7287f
Change-Id: I8e7c31b71e1ccfb77d5cb46949e438c2f1e1ef4c
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java b/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java index bb0a04279904..5423ca97eb28 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; } |