diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-09-23 10:20:53 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-23 10:20:54 -0700 |
| commit | 33baee5d88974a3b668f9d7f0716eed815966773 (patch) | |
| tree | 4e039fcbe34abcf7efea524c2636c09d83191a2f | |
| parent | 9e2463e71796964cfaa06bf09a880875ac3537bc (diff) | |
| parent | e95822715e187c5b876acba0f039cc5f9cd9ace9 (diff) | |
| download | frameworks_native-33baee5d88974a3b668f9d7f0716eed815966773.zip frameworks_native-33baee5d88974a3b668f9d7f0716eed815966773.tar.gz frameworks_native-33baee5d88974a3b668f9d7f0716eed815966773.tar.bz2 | |
Merge "Add android.hardware.camera.any feature to camera permissions." into jb-mr1-dev
| -rw-r--r-- | data/etc/android.hardware.camera.autofocus.xml | 1 | ||||
| -rw-r--r-- | data/etc/android.hardware.camera.flash-autofocus.xml | 1 | ||||
| -rw-r--r-- | data/etc/android.hardware.camera.front.xml | 1 | ||||
| -rw-r--r-- | data/etc/android.hardware.camera.xml | 1 |
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> |