diff options
| author | 2015-01-12 15:16:56 -0800 | |
|---|---|---|
| committer | 2015-03-23 19:40:45 -0700 | |
| commit | 712e5b8ec071f7226cc3683d67c4410a7b5654be (patch) | |
| tree | a3dd64dca7fc5db27d2a88c3213dc8545631d17c | |
| parent | de2e4d0130205de39a41b8fa161da5181161c78d (diff) | |
Camera2: add lens facing EXTERNAL enum
This is for usb camera support
Change-Id: Id8329e31ad0622bdc06c60e87e97c742a9719b3b
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/CameraCharacteristics.java | 2 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/CameraMetadata.java | 7 |
3 files changed, 10 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 9cd94e9bfd0d..95e5144518ed 100644 --- a/api/current.txt +++ b/api/current.txt @@ -12826,6 +12826,7 @@ package android.hardware.camera2 { field public static final int INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY = 2; // 0x2 field public static final int INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED = 0; // 0x0 field public static final int LENS_FACING_BACK = 1; // 0x1 + field public static final int LENS_FACING_EXTERNAL = 2; // 0x2 field public static final int LENS_FACING_FRONT = 0; // 0x0 field public static final int LENS_INFO_FOCUS_DISTANCE_CALIBRATION_APPROXIMATE = 1; // 0x1 field public static final int LENS_INFO_FOCUS_DISTANCE_CALIBRATION_CALIBRATED = 2; // 0x2 diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index 5fad035f244f..87ec06a5b237 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -927,10 +927,12 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * <ul> * <li>{@link #LENS_FACING_FRONT FRONT}</li> * <li>{@link #LENS_FACING_BACK BACK}</li> + * <li>{@link #LENS_FACING_EXTERNAL EXTERNAL}</li> * </ul></p> * <p>This key is available on all devices.</p> * @see #LENS_FACING_FRONT * @see #LENS_FACING_BACK + * @see #LENS_FACING_EXTERNAL */ @PublicKey public static final Key<Integer> LENS_FACING = diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java index 26e1fd0e1503..7f901c83dac0 100644 --- a/core/java/android/hardware/camera2/CameraMetadata.java +++ b/core/java/android/hardware/camera2/CameraMetadata.java @@ -288,6 +288,13 @@ public abstract class CameraMetadata<TKey> { */ public static final int LENS_FACING_BACK = 1; + /** + * <p>The camera device is an external camera, and has no fixed facing relative to the + * device's screen.</p> + * @see CameraCharacteristics#LENS_FACING + */ + public static final int LENS_FACING_EXTERNAL = 2; + // // Enumeration values for CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES // |