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

Commit 0a213215 authored by Hui Yu's avatar Hui Yu Committed by Automerger Merge Worker
Browse files

Merge "Allow BG-FGS-Launch for role EMERGENCY, SYSTEM_GALLERY and SMS." into sc-dev am: 86cde2c6 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If27a895c3d9907db1b7fe6cb5eaf1ab9ce09f371
parents 594fd88d 86cde2c6

core/api/current.txt

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

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

    field @Deprecated public static final String SMS_FINANCIAL_TRANSACTIONS = "android.permission.SMS_FINANCIAL_TRANSACTIONS";

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

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

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

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

core/api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -260,7 +260,6 @@ package android { 
    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";

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

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

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

core/res/AndroidManifest.xml

+3 −2
Original line number Diff line number Diff line
@@ -2706,9 +2706,10 @@ 
    <permission android:name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"

        android:protectionLevel="signature|privileged|vendorPrivileged|oem|verifier" />



    <!-- @SystemApi @hide Allows an application to start foreground services from background -->

    <!-- Allows an application to start foreground services from background, can only be granted to

         privileged apps or app that is SMS/EMERGENCY/SYSTEM GALLERY roles. -->

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

                android:protectionLevel="signature|privileged|vendorPrivileged|oem|verifier" />

                android:protectionLevel="signature|privileged|vendorPrivileged|oem|verifier|role"/>



    <!-- @SystemApi Must be required by activities that handle the intent action

         {@link Intent#ACTION_SEND_SHOW_SUSPENDED_APP_DETAILS}. This is for use by apps that