diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-05-09 15:47:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-09 15:47:58 +0000 |
| commit | 8bfb3513ee8f0bd6ccd98f347a4cbdf99de703a1 (patch) | |
| tree | 2d365cdba8bd2e533d91a693bc1096e9b4e4fccb /docs/html | |
| parent | 2dc97d48b924e0ea196404d5adbe5084b344d25e (diff) | |
| parent | 1caeb10a7a288d937195d925c52f441f454cbc9a (diff) | |
| download | frameworks_base-8bfb3513ee8f0bd6ccd98f347a4cbdf99de703a1.zip frameworks_base-8bfb3513ee8f0bd6ccd98f347a4cbdf99de703a1.tar.gz frameworks_base-8bfb3513ee8f0bd6ccd98f347a4cbdf99de703a1.tar.bz2 | |
am 1caeb10a: DO NOT MERGE: Add android.hardware.camera.external feature.
* commit '1caeb10a7a288d937195d925c52f441f454cbc9a':
DO NOT MERGE: Add android.hardware.camera.external feature.
Diffstat (limited to 'docs/html')
| -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> |