Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f042ad88 authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by android-build-merger
Browse files

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

am: d1e61776

Change-Id: If317e03171bdb9ee87556fca89d7e3f363f8cddf
parents 9577165f d1e61776

core/java/android/hardware/camera2/CameraMetadata.java

+8 −2
Original line number Diff line number Diff line
@@ -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);

                }



            }

        }