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

Commit ede9ed32 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: Annotate 'getKeysNeedingPermission'"

parents aebdb1f3 5389f1aa

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -16644,7 +16644,7 @@ package android.hardware.camera2 { 
    method public java.util.List<android.hardware.camera2.CaptureRequest.Key<?>> getAvailablePhysicalCameraRequestKeys();

    method public java.util.List<android.hardware.camera2.CaptureRequest.Key<?>> getAvailableSessionKeys();

    method @NonNull public java.util.List<android.hardware.camera2.CameraCharacteristics.Key<?>> getKeys();

    method public java.util.List<android.hardware.camera2.CameraCharacteristics.Key<?>> getKeysNeedingPermission();

    method @NonNull public java.util.List<android.hardware.camera2.CameraCharacteristics.Key<?>> getKeysNeedingPermission();

    method @NonNull public java.util.Set<java.lang.String> getPhysicalCameraIds();

    method @Nullable public android.hardware.camera2.params.RecommendedStreamConfigurationMap getRecommendedStreamConfigurationMap(int);

    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES;

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

+5 −3
Original line number Diff line number Diff line
@@ -297,10 +297,10 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * <p>Each key is only listed once in the list. The order of the keys is undefined.</p>

     *

     * @return List of camera characteristic keys that require the

     *         {@link android.Manifest.permission#CAMERA} permission. The list can be null in case

     *         {@link android.Manifest.permission#CAMERA} permission. The list can be empty in case

     *         there are no currently present keys that need additional permission.

     */

    public List<Key<?>> getKeysNeedingPermission() {

    public @NonNull List<Key<?>> getKeysNeedingPermission() {

        if (mKeysNeedingPermission == null) {

            Object crKey = CameraCharacteristics.Key.class;

            Class<CameraCharacteristics.Key<?>> crKeyTyped =
@@ -308,7 +308,9 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 


            int[] filterTags = get(REQUEST_CHARACTERISTIC_KEYS_NEEDING_PERMISSION);

            if (filterTags == null) {

                return null;

                mKeysNeedingPermission = Collections.unmodifiableList(

                        new ArrayList<CameraCharacteristics.Key<?>> ());

                return mKeysNeedingPermission;

            }

            mKeysNeedingPermission =

                getAvailableKeyList(CameraCharacteristics.class, crKeyTyped, filterTags,