diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2014-11-14 18:56:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-14 18:56:01 +0000 |
| commit | 3a1c6dacecb328a38ae26c513246eab7a84219f2 (patch) | |
| tree | c6a76b756c0bc8e49a5f53ce62072b3c27b7035a /data | |
| parent | 26653bad7cdaa09470828781c5a2bab7c4d2445f (diff) | |
| parent | 431784accf1ef284eb995d046c2ae25c53cd8f52 (diff) | |
| download | frameworks_native-3a1c6dacecb328a38ae26c513246eab7a84219f2.zip frameworks_native-3a1c6dacecb328a38ae26c513246eab7a84219f2.tar.gz frameworks_native-3a1c6dacecb328a38ae26c513246eab7a84219f2.tar.bz2 | |
Merge "Add XML files for new camera2 hardware features" into lmp-mr1-dev
Diffstat (limited to 'data')
| -rw-r--r-- | data/etc/android.hardware.camera.manual_postprocessing.xml | 21 | ||||
| -rw-r--r-- | data/etc/android.hardware.camera.manual_sensor.xml | 21 |
2 files changed, 42 insertions, 0 deletions
diff --git a/data/etc/android.hardware.camera.manual_postprocessing.xml b/data/etc/android.hardware.camera.manual_postprocessing.xml new file mode 100644 index 0000000..01796be --- /dev/null +++ b/data/etc/android.hardware.camera.manual_postprocessing.xml @@ -0,0 +1,21 @@ +<?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 manual postprocessing capability --> +<permissions> + <feature name="android.hardware.camera.any" /> + <feature name="android.hardware.camera.capability.manual_post_processing" /> +</permissions> diff --git a/data/etc/android.hardware.camera.manual_sensor.xml b/data/etc/android.hardware.camera.manual_sensor.xml new file mode 100644 index 0000000..57db5ab --- /dev/null +++ b/data/etc/android.hardware.camera.manual_sensor.xml @@ -0,0 +1,21 @@ +<?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 manual sensor capability--> +<permissions> + <feature name="android.hardware.camera.any" /> + <feature name="android.hardware.camera.capability.manual_sensor" /> +</permissions> |