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
This commit is contained in:
Eino-Ville Talvala 2014-11-24 18:05:35 +00:00 committed by Android Git Automerger
commit 6086365e41
4 changed files with 47 additions and 0 deletions

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>