am 33baee5d: Merge "Add android.hardware.camera.any feature to camera permissions." into jb-mr1-dev

* commit '33baee5d88974a3b668f9d7f0716eed815966773':
  Add android.hardware.camera.any feature to camera permissions.
This commit is contained in:
Eino-Ville Talvala 2012-09-24 09:26:03 -07:00 committed by Android Git Automerger
commit 4214402aa2
4 changed files with 4 additions and 0 deletions

View File

@ -16,6 +16,7 @@
<!-- This is the standard set of features for an auto-focus camera. -->
<permissions>
<feature name="android.hardware.camera.any" />
<feature name="android.hardware.camera" />
<feature name="android.hardware.camera.autofocus" />
</permissions>

View File

@ -17,6 +17,7 @@
<!-- This is the standard set of features for a camera with a flash. Note
that this currently requires having auto-focus as well. -->
<permissions>
<feature name="android.hardware.camera.any" />
<feature name="android.hardware.camera" />
<feature name="android.hardware.camera.autofocus" />
<feature name="android.hardware.camera.flash" />

View File

@ -16,5 +16,6 @@
<!-- This is the standard set of features for a front facing camera. -->
<permissions>
<feature name="android.hardware.camera.any" />
<feature name="android.hardware.camera.front" />
</permissions>

View File

@ -16,5 +16,6 @@
<!-- This is the standard set of features for a non auto-focus camera. -->
<permissions>
<feature name="android.hardware.camera.any" />
<feature name="android.hardware.camera" />
</permissions>