From 8ef80d302e40861167ea851d9fb847d4c5731550 Mon Sep 17 00:00:00 2001 From: Jing Ji Date: Wed, 30 Nov 2022 23:11:53 -0800 Subject: [PATCH] Add foreground service type "fileManagement" Bug: 254662338 Bug: 246792057 Test: atest CtsAppFgsTestCases Change-Id: Iea7310fce15783e287435cf8d29ab7439cce43d8 --- core/api/current.txt | 8 +++--- .../app/ForegroundServiceTypePolicy.java | 19 ++++++++++++++ core/java/android/content/pm/ServiceInfo.java | 25 +++++++++++++------ core/res/AndroidManifest.xml | 9 +++++++ core/res/res/values/attrs_manifest.xml | 7 ++++++ core/res/res/values/strings.xml | 5 ++++ packages/Shell/AndroidManifest.xml | 3 +++ 7 files changed, 66 insertions(+), 10 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index f550952fc4cf8..60fe3e60aa6bb 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -94,6 +94,7 @@ package android { field public static final String FOREGROUND_SERVICE_CAMERA = "android.permission.FOREGROUND_SERVICE_CAMERA"; field public static final String FOREGROUND_SERVICE_CONNECTED_DEVICE = "android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE"; field public static final String FOREGROUND_SERVICE_DATA_SYNC = "android.permission.FOREGROUND_SERVICE_DATA_SYNC"; + field public static final String FOREGROUND_SERVICE_FILE_MANAGEMENT = "android.permission.FOREGROUND_SERVICE_FILE_MANAGEMENT"; field public static final String FOREGROUND_SERVICE_HEALTH = "android.permission.FOREGROUND_SERVICE_HEALTH"; field public static final String FOREGROUND_SERVICE_LOCATION = "android.permission.FOREGROUND_SERVICE_LOCATION"; field public static final String FOREGROUND_SERVICE_MEDIA_PLAYBACK = "android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"; @@ -12467,6 +12468,7 @@ package android.content.pm { field @RequiresPermission(allOf={android.Manifest.permission.FOREGROUND_SERVICE_CAMERA}, anyOf={android.Manifest.permission.CAMERA}, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_CAMERA = 64; // 0x40 field @RequiresPermission(allOf={android.Manifest.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE}, anyOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.CHANGE_NETWORK_STATE, android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.CHANGE_WIFI_MULTICAST_STATE, android.Manifest.permission.NFC, android.Manifest.permission.TRANSMIT_IR}, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE = 16; // 0x10 field @Deprecated @RequiresPermission(value=android.Manifest.permission.FOREGROUND_SERVICE_DATA_SYNC, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_DATA_SYNC = 1; // 0x1 + field @RequiresPermission(android.Manifest.permission.FOREGROUND_SERVICE_FILE_MANAGEMENT) public static final int FOREGROUND_SERVICE_TYPE_FILE_MANAGEMENT = 4096; // 0x1000 field @RequiresPermission(allOf={android.Manifest.permission.FOREGROUND_SERVICE_HEALTH}, anyOf={android.Manifest.permission.ACTIVITY_RECOGNITION, android.Manifest.permission.BODY_SENSORS, android.Manifest.permission.HIGH_SAMPLING_RATE_SENSORS}, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_HEALTH = 256; // 0x100 field @RequiresPermission(allOf={android.Manifest.permission.FOREGROUND_SERVICE_LOCATION}, anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_LOCATION = 8; // 0x8 field public static final int FOREGROUND_SERVICE_TYPE_MANIFEST = -1; // 0xffffffff @@ -12475,10 +12477,10 @@ package android.content.pm { field @RequiresPermission(allOf={android.Manifest.permission.FOREGROUND_SERVICE_MICROPHONE}, anyOf={android.Manifest.permission.CAPTURE_AUDIO_OUTPUT, android.Manifest.permission.RECORD_AUDIO}, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_MICROPHONE = 128; // 0x80 field @Deprecated public static final int FOREGROUND_SERVICE_TYPE_NONE = 0; // 0x0 field @RequiresPermission(allOf={android.Manifest.permission.FOREGROUND_SERVICE_PHONE_CALL}, anyOf={android.Manifest.permission.MANAGE_OWN_CALLS}, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_PHONE_CALL = 4; // 0x4 - field @RequiresPermission(value=android.Manifest.permission.FOREGROUND_SERVICE_REMOTE_MESSAGING, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_REMOTE_MESSAGING = 512; // 0x200 + field @RequiresPermission(android.Manifest.permission.FOREGROUND_SERVICE_REMOTE_MESSAGING) public static final int FOREGROUND_SERVICE_TYPE_REMOTE_MESSAGING = 512; // 0x200 field public static final int FOREGROUND_SERVICE_TYPE_SHORT_SERVICE = 2048; // 0x800 - field @RequiresPermission(value=android.Manifest.permission.FOREGROUND_SERVICE_SPECIAL_USE, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_SPECIAL_USE = 1073741824; // 0x40000000 - field @RequiresPermission(value=android.Manifest.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_SYSTEM_EXEMPTED = 1024; // 0x400 + field @RequiresPermission(android.Manifest.permission.FOREGROUND_SERVICE_SPECIAL_USE) public static final int FOREGROUND_SERVICE_TYPE_SPECIAL_USE = 1073741824; // 0x40000000 + field @RequiresPermission(android.Manifest.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED) public static final int FOREGROUND_SERVICE_TYPE_SYSTEM_EXEMPTED = 1024; // 0x400 field public int flags; field public String permission; } diff --git a/core/java/android/app/ForegroundServiceTypePolicy.java b/core/java/android/app/ForegroundServiceTypePolicy.java index 63fdc2e1b6862..4819b5120ea98 100644 --- a/core/java/android/app/ForegroundServiceTypePolicy.java +++ b/core/java/android/app/ForegroundServiceTypePolicy.java @@ -23,6 +23,7 @@ import static android.content.pm.PackageManager.PERMISSION_GRANTED; import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_CAMERA; import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE; import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC; +import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_FILE_MANAGEMENT; import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_HEALTH; import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION; import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MANIFEST; @@ -410,6 +411,22 @@ public abstract class ForegroundServiceTypePolicy { null /* no type specific permissions */, null /* no type specific permissions */ ); + /** + * The policy for the {@link ServiceInfo#FOREGROUND_SERVICE_TYPE_FILE_MANAGEMENT}. + * + * @hide + */ + public static final @NonNull ForegroundServiceTypePolicyInfo FGS_TYPE_POLICY_FILE_MANAGEMENT = + new ForegroundServiceTypePolicyInfo( + FOREGROUND_SERVICE_TYPE_FILE_MANAGEMENT, + ForegroundServiceTypePolicyInfo.INVALID_CHANGE_ID, + ForegroundServiceTypePolicyInfo.INVALID_CHANGE_ID, + new ForegroundServiceTypePermissions(new ForegroundServiceTypePermission[] { + new RegularPermission(Manifest.permission.FOREGROUND_SERVICE_FILE_MANAGEMENT) + }, true), + null + ); + /** * The policy for the {@link ServiceInfo#FOREGROUND_SERVICE_TYPE_SPECIAL_USE}. * @@ -1055,6 +1072,8 @@ public abstract class ForegroundServiceTypePolicy { FGS_TYPE_POLICY_SYSTEM_EXEMPTED); mForegroundServiceTypePolicies.put(FOREGROUND_SERVICE_TYPE_SHORT_SERVICE, FGS_TYPE_POLICY_SHORT_SERVICE); + mForegroundServiceTypePolicies.put(FOREGROUND_SERVICE_TYPE_FILE_MANAGEMENT, + FGS_TYPE_POLICY_FILE_MANAGEMENT); mForegroundServiceTypePolicies.put(FOREGROUND_SERVICE_TYPE_SPECIAL_USE, FGS_TYPE_POLICY_SPECIAL_USE); } diff --git a/core/java/android/content/pm/ServiceInfo.java b/core/java/android/content/pm/ServiceInfo.java index 7ea6733fa2ff6..fc2c532ee756f 100644 --- a/core/java/android/content/pm/ServiceInfo.java +++ b/core/java/android/content/pm/ServiceInfo.java @@ -331,8 +331,7 @@ public class ServiceInfo extends ComponentInfo * Messaging use cases which host local server to relay messages across devices. */ @RequiresPermission( - value = Manifest.permission.FOREGROUND_SERVICE_REMOTE_MESSAGING, - conditional = true + value = Manifest.permission.FOREGROUND_SERVICE_REMOTE_MESSAGING ) public static final int FOREGROUND_SERVICE_TYPE_REMOTE_MESSAGING = 1 << 9; @@ -360,8 +359,7 @@ public class ServiceInfo extends ComponentInfo *

*/ @RequiresPermission( - value = Manifest.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED, - conditional = true + value = Manifest.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED ) public static final int FOREGROUND_SERVICE_TYPE_SYSTEM_EXEMPTED = 1 << 10; @@ -411,6 +409,17 @@ public class ServiceInfo extends ComponentInfo */ public static final int FOREGROUND_SERVICE_TYPE_SHORT_SERVICE = 1 << 11; + /** + * Constant corresponding to {@code fileManagement} in + * the {@link android.R.attr#foregroundServiceType} attribute. + * The file management use case which manages files/directories, often involving file I/O + * across the file system. + */ + @RequiresPermission( + value = Manifest.permission.FOREGROUND_SERVICE_FILE_MANAGEMENT + ) + public static final int FOREGROUND_SERVICE_TYPE_FILE_MANAGEMENT = 1 << 12; + /** * Constant corresponding to {@code specialUse} in * the {@link android.R.attr#foregroundServiceType} attribute. @@ -457,8 +466,7 @@ public class ServiceInfo extends ComponentInfo * */ @RequiresPermission( - value = Manifest.permission.FOREGROUND_SERVICE_SPECIAL_USE, - conditional = true + value = Manifest.permission.FOREGROUND_SERVICE_SPECIAL_USE ) public static final int FOREGROUND_SERVICE_TYPE_SPECIAL_USE = 1 << 30; @@ -495,7 +503,8 @@ public class ServiceInfo extends ComponentInfo FOREGROUND_SERVICE_TYPE_REMOTE_MESSAGING, FOREGROUND_SERVICE_TYPE_SYSTEM_EXEMPTED, FOREGROUND_SERVICE_TYPE_SHORT_SERVICE, - FOREGROUND_SERVICE_TYPE_SPECIAL_USE + FOREGROUND_SERVICE_TYPE_FILE_MANAGEMENT, + FOREGROUND_SERVICE_TYPE_SPECIAL_USE, }) @Retention(RetentionPolicy.SOURCE) public @interface ForegroundServiceType {} @@ -579,6 +588,8 @@ public class ServiceInfo extends ComponentInfo return "systemExempted"; case FOREGROUND_SERVICE_TYPE_SHORT_SERVICE: return "shortService"; + case FOREGROUND_SERVICE_TYPE_FILE_MANAGEMENT: + return "fileManagement"; case FOREGROUND_SERVICE_TYPE_SPECIAL_USE: return "specialUse"; default: diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index ad8f7fb2d425c..8da91ee4228f2 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -6285,6 +6285,15 @@ android:label="@string/permlab_foregroundServiceSystemExempted" android:protectionLevel="normal|instant" /> + + + + + Allows the app to make use of foreground services with the type \"systemExempted\" + + run foreground service with the type \"fileManagement\" + + Allows the app to make use of foreground services with the type \"fileManagement\" + run foreground service with the type \"specialUse\" diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 680a0a17dca82..d3ba5e6d08034 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -753,6 +753,9 @@ + + +