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

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

Merge "Un-deprecate the DATA_SYNC foreground service type"

parents e3773909 6caa08c7

core/api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -12693,7 +12693,7 @@ package android.content.pm { 
    field public static final int FLAG_USE_APP_ZYGOTE = 8; // 0x8

    field public static final int FLAG_USE_APP_ZYGOTE = 8; // 0x8

    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_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 @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(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(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_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 @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

core/java/android/app/ForegroundServiceTypePolicy.java

+1 −10
Original line number Original line Diff line number Diff line
@@ -117,14 +117,10 @@ public abstract class ForegroundServiceTypePolicy { 
     * The FGS type enforcement:

     * The FGS type enforcement:

     * deprecating the {@link android.content.pm.ServiceInfo#FOREGROUND_SERVICE_TYPE_DATA_SYNC}.

     * deprecating the {@link android.content.pm.ServiceInfo#FOREGROUND_SERVICE_TYPE_DATA_SYNC}.

     *

     *

     * <p>Starting a FGS with this type from apps with targetSdkVersion

     * {@link android.os.Build.VERSION_CODES#UPSIDE_DOWN_CAKE} or later will

     * result in a warning in the log.</p>

     *

     * @hide

     * @hide

     */

     */

    @ChangeId

    @ChangeId

    @EnabledAfter(targetSdkVersion = android.os.Build.VERSION_CODES.TIRAMISU)

    @Disabled

    @Overridable

    @Overridable

    public static final long FGS_TYPE_DATA_SYNC_DEPRECATION_CHANGE_ID = 255039210L;

    public static final long FGS_TYPE_DATA_SYNC_DEPRECATION_CHANGE_ID = 255039210L;
@@ -132,13 +128,8 @@ public abstract class ForegroundServiceTypePolicy { 
     * The FGS type enforcement:

     * The FGS type enforcement:

     * disabling the {@link android.content.pm.ServiceInfo#FOREGROUND_SERVICE_TYPE_DATA_SYNC}.

     * disabling the {@link android.content.pm.ServiceInfo#FOREGROUND_SERVICE_TYPE_DATA_SYNC}.

     *

     *

     * <p>Starting a FGS with this type from apps with targetSdkVersion

     * {@link android.os.Build.VERSION_CODES#UPSIDE_DOWN_CAKE} or later will

     * result in an exception.</p>

     *

     * @hide

     * @hide

     */

     */

    // TODO (b/254661666): Change to @EnabledSince(U) in next OS release

    @ChangeId

    @ChangeId

    @Disabled

    @Disabled

    @Overridable

    @Overridable

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

+4 −9
Original line number Original line Diff line number Diff line
@@ -133,20 +133,15 @@ public class ServiceInfo extends ComponentInfo 
     * Data(photo, file, account) upload/download, backup/restore, import/export, fetch,

     * Data(photo, file, account) upload/download, backup/restore, import/export, fetch,

     * transfer over network between device and cloud.

     * transfer over network between device and cloud.

     *

     *

     * <p>Apps targeting API level {@link android.os.Build.VERSION_CODES#UPSIDE_DOWN_CAKE} and

     * <p class="note">

     * later should NOT use this type:

     * Use the {@link android.app.job.JobInfo.Builder#setDataTransfer} API for data transfers

     * calling {@link android.app.Service#startForeground(int, android.app.Notification, int)} with

     * that can be deferred until conditions are ideal for the app or device.

     * this type on devices running {@link android.os.Build.VERSION_CODES#UPSIDE_DOWN_CAKE} is still

     * </p>

     * allowed, but calling it with this type on devices running future platform releases may get a

     * {@link android.app.InvalidForegroundServiceTypeException}.</p>

     *

     * @deprecated Use {@link android.app.job.JobInfo.Builder} data transfer APIs instead.

     */

     */

    @RequiresPermission(

    @RequiresPermission(

            value = Manifest.permission.FOREGROUND_SERVICE_DATA_SYNC,

            value = Manifest.permission.FOREGROUND_SERVICE_DATA_SYNC,

            conditional = true

            conditional = true

    )

    )

    @Deprecated

    public static final int FOREGROUND_SERVICE_TYPE_DATA_SYNC = 1 << 0;

    public static final int FOREGROUND_SERVICE_TYPE_DATA_SYNC = 1 << 0;





    /**

    /**