diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2019-07-18 15:10:12 -0700 |
|---|---|---|
| committer | Yin-Chia Yeh <yinchiayeh@google.com> | 2019-08-02 22:14:40 +0000 |
| commit | 1b1f14ebffa38d889573c40283c99deb5e94082d (patch) | |
| tree | 5abe8be001de7d7a9d9d5f58785b84896c6563e4 /core/java | |
| parent | d0daec02892c54d88b4f2e93085588e121831893 (diff) | |
Camera: fix getKeys impl for vendor keys
Test: partner testing
Bug: 137856586
Change-Id: Ie36db4f76e8b3d500aeea88d15e4e3295cc3d481
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/hardware/camera2/CameraMetadata.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java index 5ac13d8a067d..a0170dab9f04 100644 --- a/core/java/android/hardware/camera2/CameraMetadata.java +++ b/core/java/android/hardware/camera2/CameraMetadata.java @@ -206,10 +206,16 @@ public abstract class CameraMetadata<TKey> { continue; } - if (filterTags == null || Arrays.binarySearch(filterTags, - CameraMetadataNative.getTag(keyName, vendorId)) >= 0) { + + if (filterTags != null && Arrays.binarySearch(filterTags, + CameraMetadataNative.getTag(keyName, vendorId)) < 0) { + // ignore vendor keys not in filterTags + continue; + } + if (instance == null || instance.getProtected(k) != null) { keyList.add(k); } + } } |