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

Commit 81b0ba26 authored by Zhijun He's avatar Zhijun He Committed by Android (Google) Code Review
Browse files

Merge "Camera2: Fix availableCapabilities incorrect type" into lmp-preview-dev

parents 069707ed 421ddbe6

core/java/android/hardware/camera2/CameraCharacteristics.java

+2 −2
Original line number Diff line number Diff line
@@ -822,8 +822,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * @see #REQUEST_AVAILABLE_CAPABILITIES_ZSL

     * @see #REQUEST_AVAILABLE_CAPABILITIES_DNG

     */

    public static final Key<Integer> REQUEST_AVAILABLE_CAPABILITIES =

            new Key<Integer>("android.request.availableCapabilities", int.class);

    public static final Key<int[]> REQUEST_AVAILABLE_CAPABILITIES =

            new Key<int[]>("android.request.availableCapabilities", int[].class);



    /**

     * <p>A list of all keys that the camera device has available