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

Commit cb5679a8 authored by Santiago Seifert's avatar Santiago Seifert Committed by Android (Google) Code Review
Browse files

Merge "Add route deduplication IDs API"

parents 27988dee e757499d

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -23192,6 +23192,7 @@ package android.media { 
    method public int describeContents();

    method @Nullable public String getClientPackageName();

    method public int getConnectionState();

    method @NonNull public java.util.Set<java.lang.String> getDeduplicationIds();

    method @Nullable public CharSequence getDescription();

    method @Nullable public android.os.Bundle getExtras();

    method @NonNull public java.util.List<java.lang.String> getFeatures();
@@ -23225,6 +23226,7 @@ package android.media { 
    method @NonNull public android.media.MediaRoute2Info.Builder clearFeatures();

    method @NonNull public android.media.MediaRoute2Info.Builder setClientPackageName(@Nullable String);

    method @NonNull public android.media.MediaRoute2Info.Builder setConnectionState(int);

    method @NonNull public android.media.MediaRoute2Info.Builder setDeduplicationIds(@NonNull java.util.Set<java.lang.String>);

    method @NonNull public android.media.MediaRoute2Info.Builder setDescription(@Nullable CharSequence);

    method @NonNull public android.media.MediaRoute2Info.Builder setExtras(@Nullable android.os.Bundle);

    method @NonNull public android.media.MediaRoute2Info.Builder setIconUri(@Nullable android.net.Uri);

media/java/android/media/MediaRoute2Info.java

+4 −10
Original line number Diff line number Diff line
@@ -539,9 +539,9 @@ public final class MediaRoute2Info implements Parcelable { 
    }



    /**

     * Gets the Deduplication ID of the route if available.

     * @see RouteDiscoveryPreference#shouldRemoveDuplicates()

     * @hide

     * Gets the deduplication IDs associated to the route.

     *

     * <p>Two routes with a matching deduplication ID originate from the same receiver device.

     */

    @NonNull

    public Set<String> getDeduplicationIds() {
@@ -1017,13 +1017,7 @@ public final class MediaRoute2Info implements Parcelable { 
        }



        /**

         * Sets the deduplication ID of the route.

         * Routes have the same ID could be removed even when

         * they are from different providers.

         * <p>

         * If it's {@code null}, the route will not be removed.

         * @see RouteDiscoveryPreference#shouldRemoveDuplicates()

         * @hide

         * Sets the {@link MediaRoute2Info#getDeduplicationIds() deduplication IDs} of the route.

         */

        @NonNull

        public Builder setDeduplicationIds(@NonNull Set<String> id) {