From d1b1bb3cbc4dbea8972d46781274e879c89a2e30 Mon Sep 17 00:00:00 2001 From: Makoto Onuki Date: Wed, 2 Feb 2022 13:54:11 -0800 Subject: [PATCH] (really) Deprecate BIND_ALLOW_FOREGROUND_SERVICE_STARTS_FROM_BACKGROUND In the previous CL (Ib53e2cdf45a10454), I mistakenly deprecated the wrong flag. This CL fixes it. Bug: 189235490 Test: prebuilt Change-Id: I79c1f63475d80e0b077b577f32ae2cbca37edad2 --- core/api/system-current.txt | 4 ++-- core/java/android/content/Context.java | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/core/api/system-current.txt b/core/api/system-current.txt index b3dd7a76a8cfd..c8fb5d5726d96 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -2701,8 +2701,8 @@ package android.content { field public static final String APP_PREDICTION_SERVICE = "app_prediction"; field public static final String BACKUP_SERVICE = "backup"; field public static final String BATTERY_STATS_SERVICE = "batterystats"; - field @Deprecated public static final int BIND_ALLOW_BACKGROUND_ACTIVITY_STARTS = 1048576; // 0x100000 - field public static final int BIND_ALLOW_FOREGROUND_SERVICE_STARTS_FROM_BACKGROUND = 262144; // 0x40000 + field public static final int BIND_ALLOW_BACKGROUND_ACTIVITY_STARTS = 1048576; // 0x100000 + field @Deprecated public static final int BIND_ALLOW_FOREGROUND_SERVICE_STARTS_FROM_BACKGROUND = 262144; // 0x40000 field public static final String CLOUDSEARCH_SERVICE = "cloudsearch"; field public static final String CONTENT_SUGGESTIONS_SERVICE = "content_suggestions"; field public static final String CONTEXTHUB_SERVICE = "contexthub"; diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index a0864d6459d3b..3977f8b64bf64 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -408,6 +408,7 @@ public abstract class Context { * @hide */ @SystemApi + @Deprecated public static final int BIND_ALLOW_FOREGROUND_SERVICE_STARTS_FROM_BACKGROUND = 0x00040000; /** @@ -421,12 +422,13 @@ public abstract class Context { public static final int BIND_SCHEDULE_LIKE_TOP_APP = 0x00080000; /** - * This flag has never been used. + * Flag for {@link #bindService}: allow background activity starts from the bound service's + * process. + * This flag is only respected if the caller is holding + * {@link android.Manifest.permission#START_ACTIVITIES_FROM_BACKGROUND}. * @hide - * @deprecated This flag has never been used. */ @SystemApi - @Deprecated public static final int BIND_ALLOW_BACKGROUND_ACTIVITY_STARTS = 0x00100000; /**