diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-11-24 18:05:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-24 18:05:35 +0000 |
| commit | 6086365e41e0e1656e8bfffdf4b70f897f080994 (patch) | |
| tree | cfbd30e9a90a77ce555e2b50576031a6060c07c2 | |
| parent | 769c779ce6dbc0ae780b33956be78bb6944e0705 (diff) | |
| parent | 9c08f6c8364ce82c3855ad8c6ee98cb2c6595141 (diff) | |
| download | frameworks_native-6086365e41e0e1656e8bfffdf4b70f897f080994.zip frameworks_native-6086365e41e0e1656e8bfffdf4b70f897f080994.tar.gz frameworks_native-6086365e41e0e1656e8bfffdf4b70f897f080994.tar.bz2 | |
am 9c08f6c8: Merge "Camera: Add XML entries and files for new system features" into lmp-mr1-dev
* commit '9c08f6c8364ce82c3855ad8c6ee98cb2c6595141':
Camera: Add XML entries and files for new system features
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> |