summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2014-11-20 15:37:51 -0800
committerEino-Ville Talvala <etalvala@google.com>2014-11-21 20:52:56 -0800
commite86d1091766b012da1f6616c7ec270d332baef95 (patch)
treea7edee643635d0987bcf385975f4e5f4c8448bee /data
parenta63caa1983138e561b2b033c5d178636beeb1578 (diff)
downloadframeworks_native-e86d1091766b012da1f6616c7ec270d332baef95.zip
frameworks_native-e86d1091766b012da1f6616c7ec270d332baef95.tar.gz
frameworks_native-e86d1091766b012da1f6616c7ec270d332baef95.tar.bz2
Camera: Add XML entries and files for new system features
Add BURST_CAPTURE and READ_SENSOR_SETTINGS. Bug: 18281970 Change-Id: Ibf596c97fbca46f2ae044b6c87586d76605a5163
Diffstat (limited to 'data')
-rw-r--r--data/etc/android.hardware.camera.burst_capture.xml22
-rw-r--r--data/etc/android.hardware.camera.full.xml2
-rw-r--r--data/etc/android.hardware.camera.manual_sensor.xml1
-rw-r--r--data/etc/android.hardware.camera.read_sensor_settings.xml22
4 files changed, 47 insertions, 0 deletions
diff --git a/data/etc/android.hardware.camera.burst_capture.xml b/data/etc/android.hardware.camera.burst_capture.xml
new file mode 100644
index 0000000..812754f
--- /dev/null
+++ b/data/etc/android.hardware.camera.burst_capture.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- This is the set of features required for a camera2 device that supports the
+ burst capture capability-->
+<permissions>
+ <feature name="android.hardware.camera.any" />
+ <feature name="android.hardware.camera.capability.burst_capture" />
+</permissions>
diff --git a/data/etc/android.hardware.camera.full.xml b/data/etc/android.hardware.camera.full.xml
index a05dcbe..df0085e 100644
--- a/data/etc/android.hardware.camera.full.xml
+++ b/data/etc/android.hardware.camera.full.xml
@@ -20,4 +20,6 @@
<feature name="android.hardware.camera.level.full" />
<feature name="android.hardware.camera.capability.manual_sensor" />
<feature name="android.hardware.camera.capability.manual_post_processing" />
+ <feature name="android.hardware.camera.capability.burst_capture" />
+ <feature name="android.hardware.camera.capability.read_sensor_settings" />
</permissions>
diff --git a/data/etc/android.hardware.camera.manual_sensor.xml b/data/etc/android.hardware.camera.manual_sensor.xml
index 57db5ab..7795067 100644
--- a/data/etc/android.hardware.camera.manual_sensor.xml
+++ b/data/etc/android.hardware.camera.manual_sensor.xml
@@ -18,4 +18,5 @@
<permissions>
<feature name="android.hardware.camera.any" />
<feature name="android.hardware.camera.capability.manual_sensor" />
+ <feature name="android.hardware.camera.capability.read_sensor_settings" />
</permissions>
diff --git a/data/etc/android.hardware.camera.read_sensor_settings.xml b/data/etc/android.hardware.camera.read_sensor_settings.xml
new file mode 100644
index 0000000..d5018f3
--- /dev/null
+++ b/data/etc/android.hardware.camera.read_sensor_settings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- This is the set of features required for a camera2 device that supports the
+ read sensor settings capability-->
+<permissions>
+ <feature name="android.hardware.camera.any" />
+ <feature name="android.hardware.camera.capability.read_sensor_settings" />
+</permissions>