Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose BroadcastOptions public constructor" into udc-dev

Browse Source
This commit is contained in:
Michael Groover
2023-02-23 19:51:08 +00:00
committed by Android (Google) Code Review
parent 2d35bd90f1 51f52d8007
commit e1295fff9c
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -5279,8 +5279,8 @@ package android.app {
} }
public class BroadcastOptions { public class BroadcastOptions {
ctor public BroadcastOptions();
method public boolean isShareIdentityEnabled(); method public boolean isShareIdentityEnabled();
method @NonNull public static android.app.BroadcastOptions makeBasic();
method @NonNull public android.app.BroadcastOptions setShareIdentityEnabled(boolean); method @NonNull public android.app.BroadcastOptions setShareIdentityEnabled(boolean);
method @NonNull public android.os.Bundle toBundle(); method @NonNull public android.os.Bundle toBundle();
} }

1
core/api/system-current.txt
View File

@@ -843,6 +843,7 @@ package android.app {
method public int getPendingIntentBackgroundActivityStartMode(); method public int getPendingIntentBackgroundActivityStartMode();
method public boolean isDeferUntilActive(); method public boolean isDeferUntilActive();
method @Deprecated public boolean isPendingIntentBackgroundActivityLaunchAllowed(); 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.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 @RequiresPermission(android.Manifest.permission.START_ACTIVITIES_FROM_BACKGROUND) public void setBackgroundActivityStartsAllowed(boolean);
method @NonNull public android.app.BroadcastOptions setDeferUntilActive(boolean); method @NonNull public android.app.BroadcastOptions setDeferUntilActive(boolean);

10
core/java/android/app/BroadcastOptions.java
View File

@@ -262,7 +262,12 @@ public class BroadcastOptions extends ComponentOptions {
* Creates a basic {@link BroadcastOptions} with no options initially set. * Creates a basic {@link BroadcastOptions} with no options initially set.
* *
* @return an instance of {@code BroadcastOptions} against which options can be 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() { public static @NonNull BroadcastOptions makeBasic() {
BroadcastOptions opts = new BroadcastOptions(); BroadcastOptions opts = new BroadcastOptions();
return opts; return opts;
@@ -280,7 +285,10 @@ public class BroadcastOptions extends ComponentOptions {
return opts; return opts;
} }
private BroadcastOptions() { /**
* Creates a new {@code BroadcastOptions} with no options initially set.
*/
public BroadcastOptions() {
super(); super();
resetTemporaryAppAllowlist(); resetTemporaryAppAllowlist();
} }