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

Commit 7d580c4b authored by Igor Murashkin's avatar Igor Murashkin Committed by Android Git Automerger
Browse files

am f9dc65f9: am b4131ac5: camera2: Fix TotalCaptureResult#getKeys not to return empty list 

* commit 'f9dc65f99d599370d00b300b6cb0cf885448bddc':
  camera2: Fix TotalCaptureResult#getKeys not to return empty list
parents c1675522 93463850

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

+6 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ import java.util.List; 
public abstract class CameraMetadata<TKey> {



    private static final String TAG = "CameraMetadataAb";

    private static final boolean VERBOSE = false;

    private static final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE);



    /**

     * Set a camera metadata field to a value. The field definitions can be
@@ -131,6 +131,11 @@ public abstract class CameraMetadata<TKey> { 


        if (VERBOSE) Log.v(TAG, "getKeysStatic for " + type);



        // TotalCaptureResult does not have any of the keys on it, use CaptureResult instead

        if (type.equals(TotalCaptureResult.class)) {

            type = CaptureResult.class;

        }



        if (filterTags != null) {

            Arrays.sort(filterTags);

        }