diff options
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | media/java/android/media/MediaRoute2Info.java | 14 |
2 files changed, 6 insertions, 10 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index c70fa37a0674..cc1451266ac8 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -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); diff --git a/media/java/android/media/MediaRoute2Info.java b/media/java/android/media/MediaRoute2Info.java index 57815370e2ba..681e1124d0ab 100644 --- a/media/java/android/media/MediaRoute2Info.java +++ b/media/java/android/media/MediaRoute2Info.java @@ -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) { |