am bd9567e1: am e289082a: am dfa99f63: Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev
* commit 'bd9567e1569a6fc5222427f18cc653c29c0beb89':
Camera: Add new capability flags as system features as well
diff --git a/api/current.txt b/api/current.txt
index 6c21983..cb97585 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -8776,9 +8776,11 @@
field public static final java.lang.String FEATURE_CAMERA = "android.hardware.camera";
field public static final java.lang.String FEATURE_CAMERA_ANY = "android.hardware.camera.any";
field public static final java.lang.String FEATURE_CAMERA_AUTOFOCUS = "android.hardware.camera.autofocus";
+ field public static final java.lang.String FEATURE_CAMERA_CAPABILITY_BURST_CAPTURE = "android.hardware.camera.capability.burst_capture";
field public static final java.lang.String FEATURE_CAMERA_CAPABILITY_MANUAL_POST_PROCESSING = "android.hardware.camera.capability.manual_post_processing";
field public static final java.lang.String FEATURE_CAMERA_CAPABILITY_MANUAL_SENSOR = "android.hardware.camera.capability.manual_sensor";
field public static final java.lang.String FEATURE_CAMERA_CAPABILITY_RAW = "android.hardware.camera.capability.raw";
+ field public static final java.lang.String FEATURE_CAMERA_CAPABILITY_READ_SENSOR_SETTINGS = "android.hardware.camera.capability.read_sensor_settings";
field public static final java.lang.String FEATURE_CAMERA_EXTERNAL = "android.hardware.camera.external";
field public static final java.lang.String FEATURE_CAMERA_FLASH = "android.hardware.camera.flash";
field public static final java.lang.String FEATURE_CAMERA_FRONT = "android.hardware.camera.front";
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index e9f7c50..5c705e6 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -1078,6 +1078,26 @@
"android.hardware.camera.capability.raw";
/**
+ * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: At least one
+ * of the cameras on the device supports the
+ * {@link android.hardware.camera2.CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_BURST_CAPTURE BURST_CAPTURE}
+ * capability level.
+ */
+ @SdkConstant(SdkConstantType.FEATURE)
+ public static final String FEATURE_CAMERA_CAPABILITY_BURST_CAPTURE =
+ "android.hardware.camera.capability.burst_capture";
+
+ /**
+ * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: At least one
+ * of the cameras on the device supports the
+ * {@link android.hardware.camera2.CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_READ_SENSOR_SETTINGS READ_SENSOR_SETTINGS}
+ * capability level.
+ */
+ @SdkConstant(SdkConstantType.FEATURE)
+ public static final String FEATURE_CAMERA_CAPABILITY_READ_SENSOR_SETTINGS =
+ "android.hardware.camera.capability.read_sensor_settings";
+
+ /**
* Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device is capable of communicating with
* consumer IR devices.
diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd
index a716bf8..775c424 100644
--- a/docs/html/guide/topics/manifest/uses-feature-element.jd
+++ b/docs/html/guide/topics/manifest/uses-feature-element.jd
@@ -560,7 +560,7 @@
<td></td>
</tr>
<tr>
- <td rowspan="5">Camera</td>
+ <td rowspan="12">Camera</td>
<td><code>android.hardware.camera</code></td>
<td>The application uses the device's camera. If the device supports
multiple cameras, the application uses the camera that facing
@@ -593,6 +593,30 @@
<td><code>android.hardware.camera.external</code></td>
<td>The application uses an external camera device if one is connected.</td>
</tr>
+<tr>
+ <td><code>android.hardware.camera.level.full</code></td>
+ <td>The application uses a camera device with <code>FULL</code>-level support.</td>
+</tr>
+<tr>
+ <td><code>android.hardware.camera.capability.manual_sensor</code></td>
+ <td>The application uses a a camera device with the <code>MANUAL_SENSOR</code> capability.</td>
+</tr>
+<tr>
+ <td><code>android.hardware.camera.capability.manual_post_processing</code></td>
+ <td>The application uses a a camera device with the <code>MANUAL_POST_PROCESSING</code> capability.</td>
+</tr>
+<tr>
+ <td><code>android.hardware.camera.capability.raw</code></td>
+ <td>The application uses a a camera device with the <code>RAW</code> capability.</td>
+</tr>
+<tr>
+ <td><code>android.hardware.camera.capability.burst_capture</code></td>
+ <td>The application uses a a camera device with the <code>BURST_CAPTURE</code> capability.</td>
+</tr>
+<tr>
+ <td><code>android.hardware.camera.capability.read_sensor_settings</code></td>
+ <td>The application uses a a camera device with the <code>READ_SENSOR_SETTINGS</code> capability.</td>
+</tr>
<tr>
<td>Infrared</td>