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

am 1caeb10a: DO NOT MERGE: Add android.hardware.camera.external feature.

Browse Source 
* commit '1caeb10a7a288d937195d925c52f441f454cbc9a':
  DO NOT MERGE: Add android.hardware.camera.external feature.
This commit is contained in:
Eino-Ville Talvala
2014-05-09 15:47:58 +00:00
committed by Android Git Automerger
parent 2dc97d48b9 1caeb10a7a
commit 8bfb3513ee
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -7300,6 +7300,7 @@ 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_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";
field public static final java.lang.String FEATURE_CONSUMER_IR = "android.hardware.consumerir";

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

@@ -913,11 +913,19 @@ public abstract class PackageManager {
/**
* Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device has at least one camera pointing in
* some direction.
* some direction, or can support an external camera being connected to it.
*/
@SdkConstant(SdkConstantType.FEATURE)
public static final String FEATURE_CAMERA_ANY = "android.hardware.camera.any";
/**
* Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device can support having an external camera connected to it.
* The external camera may not always be connected or available to applications to use.
*/
@SdkConstant(SdkConstantType.FEATURE)
public static final String FEATURE_CAMERA_EXTERNAL = "android.hardware.camera.external";
/**
* Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device's camera supports flash.

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

@@ -584,9 +584,14 @@ is sensitive to delays or lag in sound input or output.</td>
</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>
<td>The application uses at least one camera facing in any direction, or an
external camera device if one is connected. Use this in preference to
<code>android.hardware.camera</code> if a back-facing camera is not required.
</td>
</tr>
<tr>
<td><code>android.hardware.camera.external</code></td>
<td>The application uses an external camera device if one is connected.</td>
</tr>
<tr>
@@ -1099,4 +1104,4 @@ filtering based on the <code>CAMERA</code> permission, you would add this
<td><code>android.hardware.wifi</code></td>
<!-- <td></td> -->
</tr>
</table>
</table>