Merge "Hide new route discovery preferences in T" into tm-dev (f4845021) · Commits · e / os / android_frameworks_base

core/api/current.txt

+0 −7

Original line number	Diff line number	Diff line
		@@ -22929,7 +22929,6 @@ 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();
		@@ -22963,7 +22962,6 @@ 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);
		@@ -23490,11 +23488,8 @@ package android.media {

		public final class RouteDiscoveryPreference implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public java.util.List<java.lang.String> getAllowedPackages();
		method @NonNull public java.util.List<java.lang.String> getDeduplicationPackageOrder();
		method @NonNull public java.util.List<java.lang.String> getPreferredFeatures();
		method public boolean shouldPerformActiveScan();
		method public boolean shouldRemoveDuplicates();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.media.RouteDiscoveryPreference> CREATOR;
		}
		@@ -23503,8 +23498,6 @@ package android.media {
		ctor public RouteDiscoveryPreference.Builder(@NonNull java.util.List<java.lang.String>, boolean);
		ctor public RouteDiscoveryPreference.Builder(@NonNull android.media.RouteDiscoveryPreference);
		method @NonNull public android.media.RouteDiscoveryPreference build();
		method @NonNull public android.media.RouteDiscoveryPreference.Builder setAllowedPackages(@NonNull java.util.List<java.lang.String>);
		method @NonNull public android.media.RouteDiscoveryPreference.Builder setDeduplicationPackageOrder(@NonNull java.util.List<java.lang.String>);
		method @NonNull public android.media.RouteDiscoveryPreference.Builder setPreferredFeatures(@NonNull java.util.List<java.lang.String>);
		method @NonNull public android.media.RouteDiscoveryPreference.Builder setShouldPerformActiveScan(boolean);
		}

media/java/android/media/MediaRoute2Info.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -539,6 +539,7 @@ public final class MediaRoute2Info implements Parcelable {
		/**
		* Gets the Deduplication ID of the route if available.
		* @see RouteDiscoveryPreference#shouldRemoveDuplicates()
		* @hide
		*/
		@NonNull
		public Set<String> getDeduplicationIds() {
		@@ -968,6 +969,7 @@ public final class MediaRoute2Info implements Parcelable {
		* <p>
		* If it's {@code null}, the route will not be removed.
		* @see RouteDiscoveryPreference#shouldRemoveDuplicates()
		* @hide
		*/
		@NonNull
		public Builder setDeduplicationIds(@NonNull Set<String> id) {

media/java/android/media/RouteDiscoveryPreference.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,7 @@ public final class RouteDiscoveryPreference implements Parcelable {
		* first in the provided list will remain.
		*
		* @see #shouldRemoveDuplicates()
		* @hide
		*/
		@NonNull
		public List<String> getDeduplicationPackageOrder() {
		@@ -130,6 +131,7 @@ public final class RouteDiscoveryPreference implements Parcelable {
		* <p>
		* If it's not empty, it will only discover routes from the provider whose package name
		* belongs to the list.
		* @hide
		*/
		@NonNull
		public List<String> getAllowedPackages() {
		@@ -151,6 +153,7 @@ public final class RouteDiscoveryPreference implements Parcelable {
		* Gets whether duplicate routes removal is enabled.
		*
		* @see #getDeduplicationPackageOrder()
		* @hide
		*/
		public boolean shouldRemoveDuplicates() {
		return !mPackageOrder.isEmpty();
		@@ -293,6 +296,7 @@ public final class RouteDiscoveryPreference implements Parcelable {
		* <p>
		* If it's non-empty, media router only discovers route from the provider in the list.
		* The default value is empty, which discovers routes from all providers.
		* @hide
		*/
		@NonNull
		public Builder setAllowedPackages(@NonNull List<String> allowedPackages) {
		@@ -324,6 +328,7 @@ public final class RouteDiscoveryPreference implements Parcelable {
		*
		* @param packageOrder ordered list of package names used to remove duplicate routes, or an
		* empty list if deduplication should not be enabled.
		* @hide
		*/
		@NonNull
		public Builder setDeduplicationPackageOrder(@NonNull List<String> packageOrder) {