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

Commit c1be8097 authored by Michael Groover's avatar Michael Groover Committed by Automerger Merge Worker
Browse files

Merge "Expose BroadcastOptions public constructor" into udc-dev am: e1295fff 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21541692



Change-Id: I1a8f8db056bdfc79d55c485f5235c85d0ec67dae
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 786c2845 e1295fff

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -5279,8 +5279,8 @@ package android.app { 
  }















  public class BroadcastOptions {













    ctor public BroadcastOptions();















    method public boolean isShareIdentityEnabled();













    method @NonNull public static android.app.BroadcastOptions makeBasic();















    method @NonNull public android.app.BroadcastOptions setShareIdentityEnabled(boolean);















    method @NonNull public android.os.Bundle toBundle();















  }

























core/api/system-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -843,6 +843,7 @@ package android.app {













    method public int getPendingIntentBackgroundActivityStartMode();















    method public boolean isDeferUntilActive();















    method @Deprecated public boolean isPendingIntentBackgroundActivityLaunchAllowed();













    method @Deprecated @NonNull public static android.app.BroadcastOptions makeBasic();















    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 @NonNull public android.app.BroadcastOptions setDeferUntilActive(boolean);

























core/java/android/app/BroadcastOptions.java



+9
−1




























Original line number
Diff line number
Diff line








@@ -262,7 +262,12 @@ public class BroadcastOptions extends ComponentOptions {













     * Creates a basic {@link BroadcastOptions} with no options initially set.















     *















     * @return an instance of {@code BroadcastOptions} against which options can be set













     *













     * @deprecated Use {@link BroadcastOptions#BroadcastOptions()} instead.













     * @hide















     */













    @Deprecated













    @SystemApi















    public static @NonNull BroadcastOptions makeBasic() {















        BroadcastOptions opts = new BroadcastOptions();















        return opts;









@@ -280,7 +285,10 @@ public class BroadcastOptions extends ComponentOptions {













        return opts;















    }





























    private BroadcastOptions() {













    /**













     * Creates a new {@code BroadcastOptions} with no options initially set.













     */













    public BroadcastOptions() {















        super();















        resetTemporaryAppAllowlist();















    }