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

Commit a3bf4324 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Automerger Merge Worker
Browse files

Merge "Don't throw if the matching key contains ":"." am: 6c6ceed2 am: 277d6276 

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



Change-Id: I3f008f1cfa6733079b2ba9ebf55299b6ab515014
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7c0b1167 277d6276

core/java/android/app/BroadcastOptions.java

+52 −14
Original line number Original line Diff line number Diff line
@@ -37,8 +37,6 @@ import android.os.PowerExemptionManager; 
import android.os.PowerExemptionManager.ReasonCode;

import android.os.PowerExemptionManager.ReasonCode;

import android.os.PowerExemptionManager.TempAllowListType;

import android.os.PowerExemptionManager.TempAllowListType;





import com.android.internal.util.Preconditions;



import java.lang.annotation.Retention;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.RetentionPolicy;

import java.util.Objects;

import java.util.Objects;
@@ -61,7 +59,8 @@ public class BroadcastOptions extends ComponentOptions { 
    private long mRequireCompatChangeId = CHANGE_INVALID;

    private long mRequireCompatChangeId = CHANGE_INVALID;

    private long mIdForResponseEvent;

    private long mIdForResponseEvent;

    private @DeliveryGroupPolicy int mDeliveryGroupPolicy;

    private @DeliveryGroupPolicy int mDeliveryGroupPolicy;

    private @Nullable String mDeliveryGroupMatchingKey;

    private @Nullable String mDeliveryGroupMatchingNamespaceFragment;

    private @Nullable String mDeliveryGroupMatchingKeyFragment;

    private @Nullable BundleMerger mDeliveryGroupExtrasMerger;

    private @Nullable BundleMerger mDeliveryGroupExtrasMerger;

    private @Nullable IntentFilter mDeliveryGroupMatchingFilter;

    private @Nullable IntentFilter mDeliveryGroupMatchingFilter;

    private @DeferralPolicy int mDeferralPolicy;

    private @DeferralPolicy int mDeferralPolicy;
@@ -209,7 +208,13 @@ public class BroadcastOptions extends ComponentOptions { 
            "android:broadcast.deliveryGroupPolicy";

            "android:broadcast.deliveryGroupPolicy";





    /**

    /**

     * Corresponds to {@link #setDeliveryGroupMatchingKey(String, String)}.

     * Corresponds to namespace fragment of {@link #setDeliveryGroupMatchingKey(String, String)}.

     */

    private static final String KEY_DELIVERY_GROUP_NAMESPACE =

            "android:broadcast.deliveryGroupMatchingNamespace";



    /**

     * Corresponds to key fragment of {@link #setDeliveryGroupMatchingKey(String, String)}.

     */

     */

    private static final String KEY_DELIVERY_GROUP_KEY =

    private static final String KEY_DELIVERY_GROUP_KEY =

            "android:broadcast.deliveryGroupMatchingKey";

            "android:broadcast.deliveryGroupMatchingKey";
@@ -350,7 +355,8 @@ public class BroadcastOptions extends ComponentOptions { 
        mIdForResponseEvent = opts.getLong(KEY_ID_FOR_RESPONSE_EVENT);

        mIdForResponseEvent = opts.getLong(KEY_ID_FOR_RESPONSE_EVENT);

        mDeliveryGroupPolicy = opts.getInt(KEY_DELIVERY_GROUP_POLICY,

        mDeliveryGroupPolicy = opts.getInt(KEY_DELIVERY_GROUP_POLICY,

                DELIVERY_GROUP_POLICY_ALL);

                DELIVERY_GROUP_POLICY_ALL);

        mDeliveryGroupMatchingKey = opts.getString(KEY_DELIVERY_GROUP_KEY);

        mDeliveryGroupMatchingNamespaceFragment = opts.getString(KEY_DELIVERY_GROUP_NAMESPACE);

        mDeliveryGroupMatchingKeyFragment = opts.getString(KEY_DELIVERY_GROUP_KEY);

        mDeliveryGroupExtrasMerger = opts.getParcelable(KEY_DELIVERY_GROUP_EXTRAS_MERGER,

        mDeliveryGroupExtrasMerger = opts.getParcelable(KEY_DELIVERY_GROUP_EXTRAS_MERGER,

                BundleMerger.class);

                BundleMerger.class);

        mDeliveryGroupMatchingFilter = opts.getParcelable(KEY_DELIVERY_GROUP_MATCHING_FILTER,

        mDeliveryGroupMatchingFilter = opts.getParcelable(KEY_DELIVERY_GROUP_MATCHING_FILTER,
@@ -864,11 +870,8 @@ public class BroadcastOptions extends ComponentOptions { 
    @NonNull

    @NonNull

    public BroadcastOptions setDeliveryGroupMatchingKey(@NonNull String namespace,

    public BroadcastOptions setDeliveryGroupMatchingKey(@NonNull String namespace,

            @NonNull String key) {

            @NonNull String key) {

        Preconditions.checkArgument(!namespace.contains(":"),

        mDeliveryGroupMatchingNamespaceFragment = Objects.requireNonNull(namespace);

                "namespace should not contain ':'");

        mDeliveryGroupMatchingKeyFragment = Objects.requireNonNull(key);

        Preconditions.checkArgument(!key.contains(":"),

                "key should not contain ':'");

        mDeliveryGroupMatchingKey = namespace + ":" + key;

        return this;

        return this;

    }

    }
@@ -881,7 +884,38 @@ public class BroadcastOptions extends ComponentOptions { 
     */

     */

    @Nullable

    @Nullable

    public String getDeliveryGroupMatchingKey() {

    public String getDeliveryGroupMatchingKey() {

        return mDeliveryGroupMatchingKey;

        if (mDeliveryGroupMatchingNamespaceFragment == null

                || mDeliveryGroupMatchingKeyFragment == null) {

            return null;

        }

        return String.join(":", mDeliveryGroupMatchingNamespaceFragment,

                mDeliveryGroupMatchingKeyFragment);

    }



    /**

     * Return the namespace fragment that is used to identify the delivery group that this

     * broadcast belongs to.

     *

     * @return the delivery group namespace fragment that was previously set using

     *         {@link #setDeliveryGroupMatchingKey(String, String)}.

     * @hide

     */

    @Nullable

    public String getDeliveryGroupMatchingNamespaceFragment() {

        return mDeliveryGroupMatchingNamespaceFragment;

    }



    /**

     * Return the key fragment that is used to identify the delivery group that this

     * broadcast belongs to.

     *

     * @return the delivery group key fragment that was previously set using

     *         {@link #setDeliveryGroupMatchingKey(String, String)}.

     * @hide

     */

    @Nullable

    public String getDeliveryGroupMatchingKeyFragment() {

        return mDeliveryGroupMatchingKeyFragment;

    }

    }





    /**

    /**
@@ -889,7 +923,8 @@ public class BroadcastOptions extends ComponentOptions { 
     * {@link #setDeliveryGroupMatchingKey(String, String)}.

     * {@link #setDeliveryGroupMatchingKey(String, String)}.

     */

     */

    public void clearDeliveryGroupMatchingKey() {

    public void clearDeliveryGroupMatchingKey() {

        mDeliveryGroupMatchingKey = null;

        mDeliveryGroupMatchingNamespaceFragment = null;

        mDeliveryGroupMatchingKeyFragment = null;

    }

    }





    /**

    /**
@@ -1101,8 +1136,11 @@ public class BroadcastOptions extends ComponentOptions { 
        if (mDeliveryGroupPolicy != DELIVERY_GROUP_POLICY_ALL) {

        if (mDeliveryGroupPolicy != DELIVERY_GROUP_POLICY_ALL) {

            b.putInt(KEY_DELIVERY_GROUP_POLICY, mDeliveryGroupPolicy);

            b.putInt(KEY_DELIVERY_GROUP_POLICY, mDeliveryGroupPolicy);

        }

        }

        if (mDeliveryGroupMatchingKey != null) {

        if (mDeliveryGroupMatchingNamespaceFragment != null) {

            b.putString(KEY_DELIVERY_GROUP_KEY, mDeliveryGroupMatchingKey);

            b.putString(KEY_DELIVERY_GROUP_NAMESPACE, mDeliveryGroupMatchingNamespaceFragment);

        }

        if (mDeliveryGroupMatchingKeyFragment != null) {

            b.putString(KEY_DELIVERY_GROUP_KEY, mDeliveryGroupMatchingKeyFragment);

        }

        }

        if (mDeliveryGroupPolicy == DELIVERY_GROUP_POLICY_MERGED) {

        if (mDeliveryGroupPolicy == DELIVERY_GROUP_POLICY_MERGED) {

            if (mDeliveryGroupExtrasMerger != null) {

            if (mDeliveryGroupExtrasMerger != null) {