Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e289082a: am dfa99f63: Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev

Browse Source 
* commit 'e289082a7066a86032190aa100425ce29cd2a4f2':
  Camera: Add new capability flags as system features as well
This commit is contained in:
Eino-Ville Talvala
2014-11-24 18:05:40 +00:00
committed by Android Git Automerger
parent e36131bee6 e289082a70
commit bd9567e156
3 changed files with 47 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -8775,9 +8775,11 @@ package android.content.pm {
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";

20
core/java/android/content/pm/PackageManager.java
View File

@@ -1077,6 +1077,26 @@ public abstract class PackageManager {
public static final String FEATURE_CAMERA_CAPABILITY_RAW =
"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

26
docs/html/guide/topics/manifest/uses-feature-element.jd
View File

@@ -560,7 +560,7 @@ is sensitive to delays or lag in sound input or output.</td>
<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 @@ external camera device if one is connected. Use this in preference to
<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>