Camera2: Remove manual changes from CameraCharacteristics
The INFO_DEVICE_ID entry in CameraCharacteristics was modified by
hand.This means that anytime metadata-generate is executed, it
will create an unnecessary diff reverting the manual change.
To prevent polluting other changes, this CL reverts the manual diff
by running metadata-generate.
Test: Builds successfully.
Test: Only documentation change. No functional changes.
Change-Id: I6b0c56163f599c7fcce152b2fe298639b7ee6313
diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java
index ea7f8c4c..c6a8762 100644
--- a/core/java/android/hardware/camera2/CameraCharacteristics.java
+++ b/core/java/android/hardware/camera2/CameraCharacteristics.java
@@ -19,8 +19,6 @@
import android.annotation.FlaggedApi;
import android.annotation.NonNull;
import android.annotation.Nullable;
-import android.companion.virtual.VirtualDeviceManager;
-import android.companion.virtual.camera.VirtualCameraConfig;
import android.compat.annotation.UnsupportedAppUsage;
import android.hardware.camera2.impl.CameraMetadataNative;
import android.hardware.camera2.impl.ExtensionKey;
@@ -5349,10 +5347,9 @@
* <p>Id of the device that owns this camera.</p>
* <p>In case of a virtual camera, this would be the id of the virtual device
* owning the camera. For any other camera, this key would not be present.
- * 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>
* <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p>
- * @see VirtualDeviceManager.VirtualDevice#createVirtualCamera(VirtualCameraConfig)
* @hide
*/
public static final Key<Integer> INFO_DEVICE_ID =