Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Camera: fix getKeys impl for vendor keys am: 1b1f14ebff" into qt-qpr1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2019-08-06 09:18:41 +00:00
committed by Android (Google) Code Review
parent c63f5346ee 8251b2deea
commit d1e6177672
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/hardware/camera2/CameraMetadata.java
View File

@@ -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);
}
}
}