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

Commit 582b743b authored by Gavin Corkery's avatar Gavin Corkery Committed by Automerger Merge Worker
Browse files

Merge "Add SIGNAL_REBOOT_READINESS permission" into sc-dev am: 946dfb5e 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b3b6bc248af4ef2fd8465618cc2ea0d5482fb01
parents b677d581 946dfb5e

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ package android { 
    field public static final String SET_WALLPAPER_COMPONENT = "android.permission.SET_WALLPAPER_COMPONENT";

    field public static final String SHOW_KEYGUARD_MESSAGE = "android.permission.SHOW_KEYGUARD_MESSAGE";

    field public static final String SHUTDOWN = "android.permission.SHUTDOWN";

    field public static final String SIGNAL_REBOOT_READINESS = "android.permission.SIGNAL_REBOOT_READINESS";

    field public static final String SOUND_TRIGGER_RUN_IN_BATTERY_SAVER = "android.permission.SOUND_TRIGGER_RUN_IN_BATTERY_SAVER";

    field public static final String START_ACTIVITIES_FROM_BACKGROUND = "android.permission.START_ACTIVITIES_FROM_BACKGROUND";

    field public static final String START_FOREGROUND_SERVICES_FROM_BACKGROUND = "android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND";

core/res/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -5476,6 +5476,13 @@ 
    <permission android:name="android.permission.MANAGE_GAME_MODE"

                android:protectionLevel="signature" />



    <!-- @SystemApi Allows the holder to register callbacks to inform the RebootReadinessManager

         when they are performing reboot-blocking work.

         @hide -->

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

                android:protectionLevel="signature|privileged" />





    <!-- Attribution for Geofencing service. -->

    <attribution android:tag="GeofencingService" android:label="@string/geofencing_service"/>

    <!-- Attribution for Country Detector. -->

data/etc/privapp-permissions-platform.xml

+2 −0
Original line number Diff line number Diff line
@@ -474,6 +474,8 @@ applications that come with the platform 
        <!-- Permission required for GTS test - GtsAssistIntentTestCases -->

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

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

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

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

    </privapp-permissions>



    <privapp-permissions package="com.android.statementservice">

packages/Shell/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -402,6 +402,9 @@ 
    <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />

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



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

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



    <application android:label="@string/app_label"

                android:theme="@android:style/Theme.DeviceDefault.DayNight"

                android:defaultToDeviceProtectedStorage="true"