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

Commit 172cf2f2 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Update system APIs based on feedback. 

API council has requested that the recently added BroadcastOptions
APIs be modified to better match API guidelines.

Bug: 267646347
Test: treehugger
Change-Id: I1c215e096ea2be041920d669c5f4af97b6506f70
parent e801ab56

core/api/current.txt

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










@@ -11186,7 +11183,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);









@@ -11205,7 +11201,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);

























core/java/android/app/BroadcastOptions.java



+5
−0




























Original line number
Diff line number
Diff line








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

































core/java/android/content/IntentFilter.java



+2
−0




























Original line number
Diff line number
Diff line








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

































services/core/java/com/android/server/DropBoxManagerService.java



+2
−6




























Original line number
Diff line number
Diff line








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