Merge "Remove MediaRoute2Info.getDeviceType" into rvc-dev am: c439bfe783 am:... (3b982c09) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −6

Original line number	Diff line number	Diff line
		@@ -26858,7 +26858,6 @@ package android.media {
		method @Nullable public String getClientPackageName();
		method public int getConnectionState();
		method @Nullable public CharSequence getDescription();
		method public int getDeviceType();
		method @Nullable public android.os.Bundle getExtras();
		method @NonNull public java.util.List<java.lang.String> getFeatures();
		method @Nullable public android.net.Uri getIconUri();
		@@ -26873,10 +26872,6 @@ package android.media {
		field public static final int CONNECTION_STATE_CONNECTING = 1; // 0x1
		field public static final int CONNECTION_STATE_DISCONNECTED = 0; // 0x0
		field @NonNull public static final android.os.Parcelable.Creator<android.media.MediaRoute2Info> CREATOR;
		field public static final int DEVICE_TYPE_BLUETOOTH = 3; // 0x3
		field public static final int DEVICE_TYPE_REMOTE_SPEAKER = 2; // 0x2
		field public static final int DEVICE_TYPE_REMOTE_TV = 1; // 0x1
		field public static final int DEVICE_TYPE_UNKNOWN = 0; // 0x0
		field public static final String FEATURE_LIVE_AUDIO = "android.media.intent.category.LIVE_AUDIO";
		field public static final String FEATURE_LIVE_VIDEO = "android.media.intent.category.LIVE_VIDEO";
		field public static final String FEATURE_REMOTE_PLAYBACK = "android.media.intent.category.REMOTE_PLAYBACK";
		@@ -26894,7 +26889,6 @@ package android.media {
		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 setDescription(@Nullable CharSequence);
		method @NonNull public android.media.MediaRoute2Info.Builder setDeviceType(int);
		method @NonNull public android.media.MediaRoute2Info.Builder setExtras(@Nullable android.os.Bundle);
		method @NonNull public android.media.MediaRoute2Info.Builder setIconUri(@Nullable android.net.Uri);
		method @NonNull public android.media.MediaRoute2Info.Builder setVolume(int);

media/java/android/media/MediaRoute2Info.java

+0 −53

Original line number	Diff line number	Diff line
		@@ -111,38 +111,6 @@ public final class MediaRoute2Info implements Parcelable {
		@Retention(RetentionPolicy.SOURCE)
		public @interface Type {}

		/**
		* The default receiver device type of the route indicating the type is unknown.
		*
		* @see #getDeviceType
		*/
		public static final int DEVICE_TYPE_UNKNOWN = 0;

		/**
		* A receiver device type of the route indicating the presentation of the media is happening
		* on a TV.
		*
		* @see #getDeviceType
		*/
		public static final int DEVICE_TYPE_REMOTE_TV = 1;

		/**
		* A receiver device type of the route indicating the presentation of the media is happening
		* on a speaker.
		*
		* @see #getDeviceType
		*/
		public static final int DEVICE_TYPE_REMOTE_SPEAKER = 2;

		/**
		* A receiver device type of the route indicating the presentation of the media is happening
		* on a bluetooth device such as a bluetooth speaker.
		*
		* @see #getDeviceType
		*/
		public static final int DEVICE_TYPE_BLUETOOTH = 3;


		/**
		* The default route type indicating the type is unknown.
		*
		@@ -395,18 +363,6 @@ public final class MediaRoute2Info implements Parcelable {
		return mFeatures;
		}

		/**
		* Gets the type of the receiver device associated with this route.
		*
		* @return The type of the receiver device associated with this route:
		* {@link #DEVICE_TYPE_REMOTE_TV}, {@link #DEVICE_TYPE_REMOTE_SPEAKER},
		* {@link #DEVICE_TYPE_BLUETOOTH}.
		*/
		@Type
		public int getDeviceType() {
		return getType();
		}

		/**
		* Gets the type of this route.
		*
		@@ -599,7 +555,6 @@ public final class MediaRoute2Info implements Parcelable {
		.append("id=").append(getId())
		.append(", name=").append(getName())
		.append(", features=").append(getFeatures())
		.append(", deviceType=").append(getDeviceType())
		.append(", iconUri=").append(getIconUri())
		.append(", description=").append(getDescription())
		.append(", connectionState=").append(getConnectionState())
		@@ -751,14 +706,6 @@ public final class MediaRoute2Info implements Parcelable {
		return this;
		}

		/**
		* Sets the route's device type.
		*/
		@NonNull
		public Builder setDeviceType(@Type int type) {
		return setType(type);
		}

		/**
		* Sets the route's type.
		* @hide