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

Commit fc92ae31 authored by Jing Ji's avatar Jing Ji Committed by Android (Google) Code Review
Browse files

Merge "Hide the FILE_MANAGEMENT foreground service type"

parents 7be84b8a 40fa578a

core/api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ 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";
@@ -12727,7 +12726,6 @@ 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_ADVERTISE, android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_SCAN, 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, android.Manifest.permission.UWB_RANGING}, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE = 16; // 0x10

    field @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}) 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

core/java/android/content/pm/ServiceInfo.java

+2 −0
Original line number Diff line number Diff line
@@ -426,6 +426,8 @@ public class ServiceInfo extends ComponentInfo 
     * 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.

     *

     * @hide

     */

    @RequiresPermission(

            value = Manifest.permission.FOREGROUND_SERVICE_FILE_MANAGEMENT

core/res/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -6487,6 +6487,7 @@ 
    <!-- Allows a regular application to use {@link android.app.Service#startForeground

         Service.startForeground} with the type "fileManagement".

         <p>Protection level: normal|instant

         @hide

    -->

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

        android:description="@string/permdesc_foregroundServiceFileManagement"

core/res/res/values/attrs_manifest.xml

+3 −1
Original line number Diff line number Diff line
@@ -1720,8 +1720,10 @@ 
            <p>Requires the app to hold the permission

            {@link android.Manifest.permission#FOREGROUND_SERVICE_FILE_MANAGEMENT} in order to use

            this type.

        -->



            TODO: b/258855262 mark this field as {@code hide} once this bug is fixed.

            <flag name="fileManagement" value="0x1000" />

        -->

        <!-- Use cases that can't be categorized into any other foreground service types, but also

            can't use @link android.app.job.JobInfo.Builder} APIs.

            See {@link android.content.pm.ServiceInfo#FOREGROUND_SERVICE_TYPE_SPECIAL_USE} for the