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>
This commit is contained in:
Jeff Sharkey
2023-03-12 16:12:49 +00:00
committed by Automerger Merge Worker
2 changed files with 0 additions and 6 deletions

View File

@@ -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);

View File

@@ -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);
}