diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-05-08 11:39:53 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2014-05-08 21:47:36 +0000 |
| commit | 1caeb10a7a288d937195d925c52f441f454cbc9a (patch) | |
| tree | ffbea57abe3aa02531b6e17e44f395c0f55456e4 /docs | |
| parent | 825bfb4f7e9b87bf49a76d9fb43623da1df0df19 (diff) | |
| download | frameworks_base-1caeb10a7a288d937195d925c52f441f454cbc9a.zip frameworks_base-1caeb10a7a288d937195d925c52f441f454cbc9a.tar.gz frameworks_base-1caeb10a7a288d937195d925c52f441f454cbc9a.tar.bz2 | |
DO NOT MERGE: Add android.hardware.camera.external feature.
This feature will be listed by Android devices that allow for an
external camera to be connected to it. Such camera devices may
not always be available or connected.
Also clarify that android.hardware.camera.any also encompasses
devices that list android.hardware.camera.external.
Change-Id: I57497758877e4286c1f0116961731d483b56808f
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/guide/topics/manifest/uses-feature-element.jd | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd index d421591..1721233 100644 --- a/docs/html/guide/topics/manifest/uses-feature-element.jd +++ b/docs/html/guide/topics/manifest/uses-feature-element.jd @@ -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>
\ No newline at end of file +</table> |