diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2017-02-16 21:57:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-16 21:57:34 +0000 |
| commit | 6f57065bd42ee0621ec6e683071ddb60f5a32d54 (patch) | |
| tree | 26196729a4e9754844dab21c84795b60b1746e62 /core/java | |
| parent | e6e61f2fd929e7af71bc570089bf6b650b1bdb86 (diff) | |
| parent | 6bd164bcd340e2e10ce87d88678f83e6fbd6a7b2 (diff) | |
Merge "camera case fail for testSceneModes" am: b59cd66e93 am: a22c40839e am: a494d7287f
am: 6bd164bcd3
Change-Id: I7c3afdccda0b6105f8ef740ea0dc95528fdae91d
Diffstat (limited to 'core/java')
| -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; } |