Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5be9e3c authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android Git Automerger
Browse files

am 6086365e: am 9c08f6c8: Merge "Camera: Add XML entries and files for new...

am 6086365e: am 9c08f6c8: Merge "Camera: Add XML entries and files for new system features" into lmp-mr1-dev

* commit '6086365e':
  Camera: Add XML entries and files for new system features
parents 84436ec0 6086365e
Loading
Loading
Loading
Loading
+22 −0
Original line number Diff line number Diff line
<?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>
+2 −0
Original line number Diff line number Diff line
@@ -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>
+1 −0
Original line number Diff line number Diff line
@@ -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>
+22 −0
Original line number Diff line number Diff line
<?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>