summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-09-23 09:42:12 -0700
committerEino-Ville Talvala <etalvala@google.com>2012-09-23 09:53:51 -0700
commite95822715e187c5b876acba0f039cc5f9cd9ace9 (patch)
tree08c28842ec40919a6856e7bdfaa311a6bae4b75e /data
parentff28e201ec0c6d620eaaa29814ab52958487dc31 (diff)
downloadframeworks_native-e95822715e187c5b876acba0f039cc5f9cd9ace9.zip
frameworks_native-e95822715e187c5b876acba0f039cc5f9cd9ace9.tar.gz
frameworks_native-e95822715e187c5b876acba0f039cc5f9cd9ace9.tar.bz2
Add android.hardware.camera.any feature to camera permissions.
Bug: 6847310 Change-Id: I9283932a7c211cd08b3b9fe6a93d8f219e6c9767
Diffstat (limited to 'data')
-rw-r--r--data/etc/android.hardware.camera.autofocus.xml1
-rw-r--r--data/etc/android.hardware.camera.flash-autofocus.xml1
-rw-r--r--data/etc/android.hardware.camera.front.xml1
-rw-r--r--data/etc/android.hardware.camera.xml1
4 files changed, 4 insertions, 0 deletions
diff --git a/data/etc/android.hardware.camera.autofocus.xml b/data/etc/android.hardware.camera.autofocus.xml
index d6e2b90..bddfd93 100644
--- a/data/etc/android.hardware.camera.autofocus.xml
+++ b/data/etc/android.hardware.camera.autofocus.xml
@@ -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>
diff --git a/data/etc/android.hardware.camera.flash-autofocus.xml b/data/etc/android.hardware.camera.flash-autofocus.xml
index 55f1900..ab81cd9 100644
--- a/data/etc/android.hardware.camera.flash-autofocus.xml
+++ b/data/etc/android.hardware.camera.flash-autofocus.xml
@@ -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" />
diff --git a/data/etc/android.hardware.camera.front.xml b/data/etc/android.hardware.camera.front.xml
index a5a6998..3dd1855 100644
--- a/data/etc/android.hardware.camera.front.xml
+++ b/data/etc/android.hardware.camera.front.xml
@@ -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>
diff --git a/data/etc/android.hardware.camera.xml b/data/etc/android.hardware.camera.xml
index 00a1ed7..dbe0a3d 100644
--- a/data/etc/android.hardware.camera.xml
+++ b/data/etc/android.hardware.camera.xml
@@ -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>