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

Merge "Update system APIs based on feedback." into udc-dev am: 479f4b2c2b

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

Change-Id: I481c2f7d9b29828837fc8fb0c80685c0339e1bfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jeff Sharkey
2023-03-17 13:14:06 +00:00
committed by Automerger Merge Worker
parent a50230beb4 479f4b2c2b
commit 2daa795e4f
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/api/current.txt
View File

@@ -5281,18 +5281,15 @@ package android.app {
public class BroadcastOptions {
method public void clearDeferralPolicy();
method public void clearDeliveryGroupMatchingFilter();
method public void clearDeliveryGroupMatchingKey();
method public void clearDeliveryGroupPolicy();
method @NonNull public static android.app.BroadcastOptions fromBundle(@NonNull android.os.Bundle);
method public int getDeferralPolicy();
method @Nullable public android.content.IntentFilter getDeliveryGroupMatchingFilter();
method @Nullable public String getDeliveryGroupMatchingKey();
method public int getDeliveryGroupPolicy();
method public boolean isShareIdentityEnabled();
method @NonNull public static android.app.BroadcastOptions makeBasic();
method @NonNull public android.app.BroadcastOptions setDeferralPolicy(int);
method @NonNull public android.app.BroadcastOptions setDeliveryGroupMatchingFilter(@NonNull android.content.IntentFilter);
method @NonNull public android.app.BroadcastOptions setDeliveryGroupMatchingKey(@NonNull String, @NonNull String);
method @NonNull public android.app.BroadcastOptions setDeliveryGroupPolicy(int);
method @NonNull public android.app.BroadcastOptions setShareIdentityEnabled(boolean);
@@ -11188,7 +11185,6 @@ package android.content {
method public final String getDataScheme(int);
method public final android.os.PatternMatcher getDataSchemeSpecificPart(int);
method public final String getDataType(int);
method @NonNull public final android.os.PersistableBundle getExtras();
method public final int getPriority();
method public final boolean hasAction(String);
method public final boolean hasCategory(String);
@@ -11207,7 +11203,6 @@ package android.content {
method public void readFromXml(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
method public final java.util.Iterator<android.os.PatternMatcher> schemeSpecificPartsIterator();
method public final java.util.Iterator<java.lang.String> schemesIterator();
method public final void setExtras(@NonNull android.os.PersistableBundle);
method public final void setPriority(int);
method public final java.util.Iterator<java.lang.String> typesIterator();
method public final void writeToParcel(android.os.Parcel, int);

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

@@ -889,6 +889,8 @@ public class BroadcastOptions extends ComponentOptions {
* <p> If neither matching key using {@link #setDeliveryGroupMatchingKey(String, String)} nor
* matching filter using this API is specified, then by default
* {@link Intent#filterEquals(Intent)} will be used to identify the delivery group.
*
* @hide
*/
@NonNull
public BroadcastOptions setDeliveryGroupMatchingFilter(@NonNull IntentFilter matchingFilter) {
@@ -902,6 +904,7 @@ public class BroadcastOptions extends ComponentOptions {
*
* @return the {@link IntentFilter} object that was previously set using
* {@link #setDeliveryGroupMatchingFilter(IntentFilter)}.
* @hide
*/
@Nullable
public IntentFilter getDeliveryGroupMatchingFilter() {
@@ -911,6 +914,8 @@ public class BroadcastOptions extends ComponentOptions {
/**
* Clears the {@link IntentFilter} object that was previously set using
* {@link #setDeliveryGroupMatchingFilter(IntentFilter)}.
*
* @hide
*/
public void clearDeliveryGroupMatchingFilter() {
mDeliveryGroupMatchingFilter = null;

2
core/java/android/content/IntentFilter.java
View File

@@ -2204,6 +2204,7 @@ public class IntentFilter implements Parcelable {
* <p> Subsequent calls to this method will override any previously set extras.
*
* @param extras The intent extras to match against.
* @hide
*/
public final void setExtras(@NonNull PersistableBundle extras) {
mExtras = extras;
@@ -2214,6 +2215,7 @@ public class IntentFilter implements Parcelable {
*
* @return the extras that were previously set using {@link #setExtras(PersistableBundle)} or
* an empty {@link PersistableBundle} object if no extras were set.
* @hide
*/
public final @NonNull PersistableBundle getExtras() {
return mExtras == null ? new PersistableBundle() : mExtras;

8
services/core/java/com/android/server/DropBoxManagerService.java
View File

@@ -311,14 +311,10 @@ public final class DropBoxManagerService extends SystemService {
extrasMerger.setMergeStrategy(DropBoxManager.EXTRA_DROPPED_COUNT,
BundleMerger.STRATEGY_NUMBER_INCREMENT_FIRST_AND_ADD);
final String tag = intent.getStringExtra(DropBoxManager.EXTRA_TAG);
final IntentFilter matchingFilter = new IntentFilter(
DropBoxManager.ACTION_DROPBOX_ENTRY_ADDED);
matchingFilter.addExtra(DropBoxManager.EXTRA_TAG, tag);
return BroadcastOptions.makeBasic()
.setDeliveryGroupPolicy(BroadcastOptions.DELIVERY_GROUP_POLICY_MERGED)
.setDeliveryGroupMatchingFilter(matchingFilter)
.setDeliveryGroupMatchingKey(DropBoxManager.ACTION_DROPBOX_ENTRY_ADDED,
intent.getStringExtra(DropBoxManager.EXTRA_TAG))
.setDeliveryGroupExtrasMerger(extrasMerger)
.setDeferralPolicy(BroadcastOptions.DEFERRAL_POLICY_UNTIL_ACTIVE)
.toBundle();