am 3fd6b2b9: am 3a1c6dac: Merge "Add XML files for new camera2 hardware features" into lmp-mr1-dev

* commit '3fd6b2b912037a7cca8d2591dfa8f9a83d0e46e7':
  Add XML files for new camera2 hardware features
This commit is contained in:
Yin-Chia Yeh 2014-11-15 16:00:58 +00:00 committed by Android Git Automerger
commit df6ca6a42a
2 changed files with 42 additions and 0 deletions

View File

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

View File

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