diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-12-03 18:54:28 +0000 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2014-12-03 11:13:06 -0800 |
| commit | c538043889b773eeeae0bf0ac54b06cd68360734 (patch) | |
| tree | c9835bb93769e21b3d47c3592eeb22bb06bfedf5 | |
| parent | 5878444fb8da043021f30d3de739531f15390df5 (diff) | |
| download | frameworks_native-c538043889b773eeeae0bf0ac54b06cd68360734.zip frameworks_native-c538043889b773eeeae0bf0ac54b06cd68360734.tar.gz frameworks_native-c538043889b773eeeae0bf0ac54b06cd68360734.tar.bz2 | |
Revert "Camera: Add XML entries and files for new system features"
This reverts commit e86d1091766b012da1f6616c7ec270d332baef95.
Bug: 18281970
Bug: 18573576
Change-Id: If1cf236ef7eabd15ffb2a5dd33d25a8acabdd14c
4 files changed, 0 insertions, 47 deletions
diff --git a/data/etc/android.hardware.camera.burst_capture.xml b/data/etc/android.hardware.camera.burst_capture.xml deleted file mode 100644 index 812754f..0000000 --- a/data/etc/android.hardware.camera.burst_capture.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?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 df0085e..a05dcbe 100644 --- a/data/etc/android.hardware.camera.full.xml +++ b/data/etc/android.hardware.camera.full.xml @@ -20,6 +20,4 @@ <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 7795067..57db5ab 100644 --- a/data/etc/android.hardware.camera.manual_sensor.xml +++ b/data/etc/android.hardware.camera.manual_sensor.xml @@ -18,5 +18,4 @@ <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 deleted file mode 100644 index d5018f3..0000000 --- a/data/etc/android.hardware.camera.read_sensor_settings.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?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> |