diff options
| author | 2021-03-09 23:16:15 +0000 | |
|---|---|---|
| committer | 2021-03-09 23:16:15 +0000 | |
| commit | 86cde2c6a039ebfae3e2e75ee0878f9c287451f3 (patch) | |
| tree | ea491175f8f13de50c98e68412c1d87e31532c08 | |
| parent | d65ce8e59f79c604cb3de8b233c6885839262254 (diff) | |
| parent | bc6714659d3e4bd11e5b6aad63bdd8ba30ccd537 (diff) | |
Merge "Allow BG-FGS-Launch for role EMERGENCY, SYSTEM_GALLERY and SMS." into sc-dev
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 5 |
3 files changed, 4 insertions, 3 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 04ac82756e82..52e9b265246b 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -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"; diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 07260fd8384f..5ca4d35d4c22 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -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"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 8e1da0819515..f7eb3648dfc0 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -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 |