commit 1ae5b8e863b79447d6d083adaeeee14bdbca6b78
author Jeff Sharkey <jsharkey@google.com> Sun Mar 12 15:31:43 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun Mar 12 15:31:43 2023 +0000
tree 5f3e0c2665b8a96bfcd7918a658ea16209631a4c
parent cf6bf85d60a6cc5079a5da76bcdcf61065116b36
parent 293ee3fdde0a6833c2dcf54a172b5c7fb2bf824d

Merge "Update system APIs based on feedback."

core/api/system-current.txt

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 7eedbc3..f7fd03a 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -762,11 +762,9 @@
   public class BroadcastOptions {
     method public void clearRequireCompatChange();
     method public int getPendingIntentBackgroundActivityStartMode();
-    method @Deprecated public boolean isDeferUntilActive();
     method @Deprecated public boolean isPendingIntentBackgroundActivityLaunchAllowed();
     method @RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RESPONSE_STATS) public void recordResponseEventWhileInBackground(@IntRange(from=0) long);
     method @RequiresPermission(android.Manifest.permission.START_ACTIVITIES_FROM_BACKGROUND) public void setBackgroundActivityStartsAllowed(boolean);
-    method @Deprecated @NonNull public android.app.BroadcastOptions setDeferUntilActive(boolean);
     method public void setDontSendToRestrictedApps(boolean);
     method @Deprecated public void setPendingIntentBackgroundActivityLaunchAllowed(boolean);
     method @NonNull public android.app.BroadcastOptions setPendingIntentBackgroundActivityStartMode(int);

core/java/android/app/BroadcastOptions.java

diff --git a/core/java/android/app/BroadcastOptions.java b/core/java/android/app/BroadcastOptions.java
index aa253f2..bccbb38 100644
--- a/core/java/android/app/BroadcastOptions.java
+++ b/core/java/android/app/BroadcastOptions.java
@@ -782,9 +782,7 @@
     }
 
     /** {@hide} */
-    @SystemApi
     @Deprecated
-    // STOPSHIP: remove entirely after this API change lands in AOSP
     public @NonNull BroadcastOptions setDeferUntilActive(boolean shouldDefer) {
         if (shouldDefer) {
             setDeferralPolicy(DEFERRAL_POLICY_UNTIL_ACTIVE);
@@ -795,9 +793,7 @@
     }
 
     /** {@hide} */
-    @SystemApi
     @Deprecated
-    // STOPSHIP: remove entirely after this API change lands in AOSP
     public boolean isDeferUntilActive() {
         return (mDeferralPolicy == DEFERRAL_POLICY_UNTIL_ACTIVE);
     }