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

Commit 8da2bf66 authored by Hui Wu's avatar Hui Wu Committed by Automerger Merge Worker
Browse files

Merge "Adds more roles to the protectionlevel" into tm-dev am: b061e2e6 

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



Change-Id: I8872356c19172998627b4d48d3021c2b553ec751
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b503d8c3 b061e2e6

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -6007,7 +6007,7 @@ 
    <!-- @SystemApi Allows an application to manage the cloudsearch service.

          @hide  <p>Not for use by third-party applications.</p> -->

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

        android:protectionLevel="signature" />

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



    <!-- @SystemApi Allows an application to manage the music recognition service.

         @hide  <p>Not for use by third-party applications.</p> -->

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ applications that come with the platform 
        <permission name="android.permission.MANAGE_ROLLBACKS"/>

        <permission name="android.permission.MANAGE_USB"/>

        <!-- Needed for tests only -->

        <permission name="android.permission.MANAGE_CLOUDSEARCH" />

        <permission name="android.permission.MANAGE_WALLPAPER_EFFECTS_GENERATION" />

        <permission name="android.permission.MODIFY_APPWIDGET_BIND_PERMISSIONS"/>

        <permission name="android.permission.MODIFY_DAY_NIGHT_MODE"/>