diff options
| author | 2023-03-12 17:19:56 +0000 | |
|---|---|---|
| committer | 2023-03-12 17:19:56 +0000 | |
| commit | 6d406692ea750cf019d1ee102707d8d79e2751cc (patch) | |
| tree | c1ccb22e5996f99d8dfae1f2016cd07a9a824a0e | |
| parent | f252b781e75e0c06f07b6aec803b4b04affbcebe (diff) | |
| parent | 9b57c55f9f3edbc71ca3f06b54097a9988343604 (diff) | |
Merge "Update system APIs based on feedback." am: 1ae5b8e863 am: 07b95a8abd am: 9b57c55f9f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2481488
Change-Id: I01d062925152fcc1672af9fcf03df9c03ca88fb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/app/BroadcastOptions.java | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 765a17f7691a..c79c28ccc497 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -838,11 +838,9 @@ package android.app { 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); diff --git a/core/java/android/app/BroadcastOptions.java b/core/java/android/app/BroadcastOptions.java index 481f671d3350..a5095b2741fa 100644 --- a/core/java/android/app/BroadcastOptions.java +++ b/core/java/android/app/BroadcastOptions.java @@ -769,9 +769,7 @@ public class BroadcastOptions extends ComponentOptions { } /** {@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); @@ -782,9 +780,7 @@ public class BroadcastOptions extends ComponentOptions { } /** {@hide} */ - @SystemApi @Deprecated - // STOPSHIP: remove entirely after this API change lands in AOSP public boolean isDeferUntilActive() { return (mDeferralPolicy == DEFERRAL_POLICY_UNTIL_ACTIVE); } |