Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ae5b8e8 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Gerrit Code Review
Browse files

Merge "Update system APIs based on feedback."

parents cf6bf85d 293ee3fd

core/api/system-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -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);

core/java/android/app/BroadcastOptions.java

+0 −4
Original line number Diff line number Diff line
@@ -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);

    }