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

Commit d2b16574 authored by Avichal Rakesh's avatar Avichal Rakesh Committed by Android (Google) Code Review
Browse files

Merge "Camera2: Remove manual changes from CameraCharacteristics" into main

parents 3e1862fb 6906a85d

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

+1 −4
Original line number Original line Diff line number Diff line
@@ -19,8 +19,6 @@ package android.hardware.camera2; 
import android.annotation.FlaggedApi;

import android.annotation.FlaggedApi;

import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.companion.virtual.VirtualDeviceManager;

import android.companion.virtual.camera.VirtualCameraConfig;

import android.compat.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.hardware.camera2.impl.CameraMetadataNative;

import android.hardware.camera2.impl.CameraMetadataNative;

import android.hardware.camera2.impl.ExtensionKey;

import android.hardware.camera2.impl.ExtensionKey;
@@ -5352,7 +5350,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * Callers should assume {@link android.content.Context#DEVICE_ID_DEFAULT }

     * Callers should assume {@link android.content.Context#DEVICE_ID_DEFAULT }

     * in case this key is not present.</p>

     * in case this key is not present.</p>

     * <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p>

     * <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p>

     *  @see VirtualDeviceManager.VirtualDevice#createVirtualCamera(VirtualCameraConfig)

     * @hide

     * @hide

     */

     */

    public static final Key<Integer> INFO_DEVICE_ID =

    public static final Key<Integer> INFO_DEVICE_ID =