drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Unhide and document feature android.hardware.camera.any." into jb-mr1-dev

Browse Source
This commit is contained in:
Eino-Ville Talvala
2012-09-23 10:14:21 -07:00
committed by Android (Google) Code Review
parent 7b770b0ec4 72b4db15b6
commit a91c9f9f7a
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@ -6619,6 +6619,7 @@ package android.content.pm {
field public static final java.lang.String FEATURE_AUDIO_LOW_LATENCY = "android.hardware.audio.low_latency"; field public static final java.lang.String FEATURE_AUDIO_LOW_LATENCY = "android.hardware.audio.low_latency";
field public static final java.lang.String FEATURE_BLUETOOTH = "android.hardware.bluetooth"; field public static final java.lang.String FEATURE_BLUETOOTH = "android.hardware.bluetooth";
field public static final java.lang.String FEATURE_CAMERA = "android.hardware.camera"; 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_AUTOFOCUS = "android.hardware.camera.autofocus";
field public static final java.lang.String FEATURE_CAMERA_FLASH = "android.hardware.camera.flash"; 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"; field public static final java.lang.String FEATURE_CAMERA_FRONT = "android.hardware.camera.front";

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

@ -837,7 +837,6 @@ public abstract class PackageManager {
* Feature for {@link #getSystemAvailableFeatures} and * Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device has at least one camera pointing in * {@link #hasSystemFeature}: The device has at least one camera pointing in
* some direction. * some direction.
* @hide
*/ */
@SdkConstant(SdkConstantType.FEATURE) @SdkConstant(SdkConstantType.FEATURE)
public static final String FEATURE_CAMERA_ANY = "android.hardware.camera.any"; public static final String FEATURE_CAMERA_ANY = "android.hardware.camera.any";

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

@ -561,7 +561,7 @@ is sensitive to delays or lag in sound input or output.</td>
</td> </td>
</tr> </tr>
<tr> <tr>
<td rowspan="4">Camera</td> <td rowspan="5">Camera</td>
<td><code>android.hardware.camera</code></td> <td><code>android.hardware.camera</code></td>
<td>The application uses the device's camera. If the device supports <td>The application uses the device's camera. If the device supports
multiple cameras, the application uses the camera that facing multiple cameras, the application uses the camera that facing
@ -583,6 +583,12 @@ is sensitive to delays or lag in sound input or output.</td>
<td><code>android.hardware.camera.front</code></td> <td><code>android.hardware.camera.front</code></td>
<td>Subfeature. The application uses a front-facing camera on the device.</td> <td>Subfeature. The application uses a front-facing camera on the device.</td>
</tr> </tr>
<tr>
<td><code>android.hardware.camera.any</code></td>
<td>The application uses at least one camera facing in any direction. Use this
in preference to <code>android.hardware.camera</code> if a back-facing camera is
not required.</td>
</tr>
<tr> <tr>
<td rowspan="3">Location</td> <td rowspan="3">Location</td>