diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2023-03-12 16:12:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-12 16:12:49 +0000 |
| commit | 07b95a8abdf1e9c6c8dfe4371acba4472ed82f19 (patch) | |
| tree | a1ef53aca103e3f818693dba81ef70ab8c219dac | |
| parent | aa00e17217cc5453435aa2d86bbcdf7881d81ce0 (diff) | |
| parent | 1ae5b8e863b79447d6d083adaeeee14bdbca6b78 (diff) | |
| download | base-07b95a8abdf1e9c6c8dfe4371acba4472ed82f19.tar.gz | |
Merge "Update system APIs based on feedback." am: 1ae5b8e863
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2481488
Change-Id: I86eac856a57e9bb8df7d764bd9fa98135d435a6b
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 cc3c6cbf44be..9882a4f35f99 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -762,11 +762,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 aa253f2ebe31..bccbb381bfb1 100644 --- a/core/java/android/app/BroadcastOptions.java +++ b/core/java/android/app/BroadcastOptions.java @@ -782,9 +782,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); @@ -795,9 +793,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); } |