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

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

am 33baee5d: Merge "Add android.hardware.camera.any feature to camera permissions." into jb-mr1-dev 

* commit '33baee5d':
  Add android.hardware.camera.any feature to camera permissions.
parents 511572b4 33baee5d

data/etc/android.hardware.camera.autofocus.xml

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


<!-- This is the standard set of features for an auto-focus camera. -->

<permissions>

    <feature name="android.hardware.camera.any" />

    <feature name="android.hardware.camera" />

    <feature name="android.hardware.camera.autofocus" />

</permissions>

data/etc/android.hardware.camera.flash-autofocus.xml

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
<!-- This is the standard set of features for a camera with a flash.  Note

     that this currently requires having auto-focus as well. -->

<permissions>

    <feature name="android.hardware.camera.any" />

    <feature name="android.hardware.camera" />

    <feature name="android.hardware.camera.autofocus" />

    <feature name="android.hardware.camera.flash" />

data/etc/android.hardware.camera.front.xml

+1 −0
Original line number Diff line number Diff line
@@ -16,5 +16,6 @@ 


<!-- This is the standard set of features for a front facing camera. -->

<permissions>

    <feature name="android.hardware.camera.any" />

    <feature name="android.hardware.camera.front" />

</permissions>

data/etc/android.hardware.camera.xml

+1 −0
Original line number Diff line number Diff line
@@ -16,5 +16,6 @@ 


<!-- This is the standard set of features for a non auto-focus camera. -->

<permissions>

    <feature name="android.hardware.camera.any" />

    <feature name="android.hardware.camera" />

</permissions>