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

Commit eceaea94 authored by Benjamin Franz's avatar Benjamin Franz Committed by Automerger Merge Worker
Browse files

Merge "Grant OVERRIDE_COMPAT_CHANGE_CONFIG_ON_RELEASE_BUILD to Shell" am:... 

Merge "Grant OVERRIDE_COMPAT_CHANGE_CONFIG_ON_RELEASE_BUILD to Shell" am: 9a24f337 am: 780e0079 am: f7d6fde3

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

Change-Id: Ice653f148e2d8930f58a73e36ddcaa5ffd96a4d7
parents 4808f20c f7d6fde3

data/etc/privapp-permissions-platform.xml

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

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

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

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

        <!-- Permissions required to test ambient display. -->

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

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

packages/Shell/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -265,10 +265,11 @@ 
    <!-- permissions required for CTS test - PhoneStateListenerTest -->

    <uses-permission android:name="android.permission.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH" />



    <!-- Permissions required for ganting and logging -->

    <!-- Permissions required for granting and logging -->

    <uses-permission android:name="android.permission.LOG_COMPAT_CHANGE"/>

    <uses-permission android:name="android.permission.READ_COMPAT_CHANGE_CONFIG"/>

    <uses-permission android:name="android.permission.OVERRIDE_COMPAT_CHANGE_CONFIG"/>

    <uses-permission android:name="android.permission.OVERRIDE_COMPAT_CHANGE_CONFIG_ON_RELEASE_BUILD"/>



    <!-- Permission required for CTS test - BatterySaverTest -->

    <uses-permission android:name="android.permission.MODIFY_DAY_NIGHT_MODE"/>