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

Commit 19328a45 authored by Alex Salo's avatar Alex Salo Committed by Automerger Merge Worker
Browse files

Merge "Adds protection level 'role' to SYSTEM_CAMERA permission" into sc-dev am: 4e46adb8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14705677

Change-Id: Ia986a46ae0131d16c68f56c0fa2669fe57fb8cf0
parents f74b5d16 4e46adb8

core/res/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -1408,13 +1408,13 @@ 


    <!-- @SystemApi Required in addition to android.permission.CAMERA to be able to access

           system only camera devices.

           <p>Protection level: system|signature

           <p>Protection level: system|signature|role

           @hide -->

    <permission android:name="android.permission.SYSTEM_CAMERA"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:label="@string/permlab_systemCamera"

        android:description="@string/permdesc_systemCamera"

        android:protectionLevel="system|signature" />

        android:protectionLevel="system|signature|role" />



    <!-- @SystemApi Allows receiving the camera service notifications when a camera is opened

            (by a certain application package) or closed.