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

Commit 7fd99ac1 authored by Sharon Su's avatar Sharon Su Committed by Android (Google) Code Review
Browse files

Merge changes from topic... 

Merge changes from topic "cherrypick-wallpapereffectsgeneration_permission-1nt86dz3l4" into tm-mainline-prod

* changes:
  [automerge] Change android.permission.MANAGE_WALLPAPER_EFFECTS_GENERATION to signature| privileged 2p: c5d3f167
  Change android.permission.MANAGE_WALLPAPER_EFFECTS_GENERATION to signature| privileged Test: cts test Bug: 213238425 Change-Id: Iacaec0904a1d1c14ba8b0ec8f3871376ff33f01c
parents 259d0320 0bb440a1

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -6060,7 +6060,7 @@ 
     generation service.

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

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

        android:protectionLevel="signature|role" />

        android:protectionLevel="signature|privileged" />



    <!-- Allows an app to set the theme overlay in /vendor/overlay

         being used.

data/etc/privapp-permissions-platform.xml

+2 −0
Original line number Diff line number Diff line
@@ -296,6 +296,8 @@ applications that come with the platform 
        <permission name="android.permission.MANAGE_LOW_POWER_STANDBY" />

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

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

        <!-- Needed for tests only -->

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

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

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

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