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

Commit b09a41ab authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Change the delivery group namespace and key delimiter character."

parents 48eb17e2 1e1dcf56

core/java/android/app/BroadcastOptions.java

+6 −6
Original line number Diff line number Diff line
@@ -767,11 +767,11 @@ public class BroadcastOptions extends ComponentOptions { 
     */

    @SystemApi

    public void setDeliveryGroupMatchingKey(@NonNull String namespace, @NonNull String key) {

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

                "namespace should not contain '/'");

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

                "key should not contain '/'");

        mDeliveryGroupMatchingKey = namespace + "/" + key;

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

                "namespace should not contain ':'");

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

                "key should not contain ':'");

        mDeliveryGroupMatchingKey = namespace + ":" + key;

    }



    /**
@@ -779,7 +779,7 @@ public class BroadcastOptions extends ComponentOptions { 
     * broadcast belongs to.

     *

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

     *         {@link #setDeliveryGroupMatchingKey(String, String)}, concatenated with a {@code /}.

     *         {@link #setDeliveryGroupMatchingKey(String, String)}, concatenated with a {@code :}.

     * @hide

     */

    @SystemApi