Merge "Drop _ROUTE from FLAG_SUGGESTED_ROUTE" (ba43b84c) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -24636,7 +24636,7 @@ package android.media {
	field @NonNull public static final android.os.Parcelable.Creator<android.media.RouteListingPreference.Item> CREATOR;		field @NonNull public static final android.os.Parcelable.Creator<android.media.RouteListingPreference.Item> CREATOR;
	field public static final int FLAG_ONGOING_SESSION = 1; // 0x1		field public static final int FLAG_ONGOING_SESSION = 1; // 0x1
	field public static final int FLAG_ONGOING_SESSION_MANAGED = 2; // 0x2		field public static final int FLAG_ONGOING_SESSION_MANAGED = 2; // 0x2
	field public static final int FLAG_SUGGESTED_ROUTE = 4; // 0x4		field public static final int FLAG_SUGGESTED = 4; // 0x4
	field public static final int SELECTION_BEHAVIOR_GO_TO_APP = 2; // 0x2		field public static final int SELECTION_BEHAVIOR_GO_TO_APP = 2; // 0x2
	field public static final int SELECTION_BEHAVIOR_NONE = 0; // 0x0		field public static final int SELECTION_BEHAVIOR_NONE = 0; // 0x0
	field public static final int SELECTION_BEHAVIOR_TRANSFER = 1; // 0x1		field public static final int SELECTION_BEHAVIOR_TRANSFER = 1; // 0x1

media/java/android/media/RouteListingPreference.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -259,7 +259,7 @@ public final class RouteListingPreference implements Parcelable {
	@IntDef(		@IntDef(
	flag = true,		flag = true,
	prefix = {"FLAG_"},		prefix = {"FLAG_"},
	value = {FLAG_ONGOING_SESSION, FLAG_SUGGESTED_ROUTE, FLAG_ONGOING_SESSION_MANAGED})		value = {FLAG_ONGOING_SESSION, FLAG_SUGGESTED, FLAG_ONGOING_SESSION_MANAGED})
	public @interface Flags {}		public @interface Flags {}

	/**		/**
	@@ -292,7 +292,7 @@ public final class RouteListingPreference implements Parcelable {
	* number supported by the UI, the routes listed first in {@link		* number supported by the UI, the routes listed first in {@link
	* RouteListingPreference#getItems()} will take priority.		* RouteListingPreference#getItems()} will take priority.
	*/		*/
	public static final int FLAG_SUGGESTED_ROUTE = 1 << 2;		public static final int FLAG_SUGGESTED = 1 << 2;

	/** @hide */		/** @hide */
	@Retention(RetentionPolicy.SOURCE)		@Retention(RetentionPolicy.SOURCE)
	@@ -399,7 +399,7 @@ public final class RouteListingPreference implements Parcelable {
	* Returns the flags associated to the route that corresponds to this item.		* Returns the flags associated to the route that corresponds to this item.
	*		*
	* @see #FLAG_ONGOING_SESSION		* @see #FLAG_ONGOING_SESSION
	* @see #FLAG_SUGGESTED_ROUTE		* @see #FLAG_SUGGESTED
	*/		*/
	@Flags		@Flags
	public int getFlags() {		public int getFlags() {

packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -636,7 +636,7 @@ public class InfoMediaManager extends MediaManager {
	List<RouteListingPreference.Item> itemList = routeListingPreference.getItems();		List<RouteListingPreference.Item> itemList = routeListingPreference.getItems();
	for (RouteListingPreference.Item item : itemList) {		for (RouteListingPreference.Item item : itemList) {
	// Put suggested devices on the top first before further organization		// Put suggested devices on the top first before further organization
	if (item.getFlags() == RouteListingPreference.Item.FLAG_SUGGESTED_ROUTE) {		if (item.getFlags() == RouteListingPreference.Item.FLAG_SUGGESTED) {
	finalizedItemList.add(0, item);		finalizedItemList.add(0, item);
	} else {		} else {
	finalizedItemList.add(item);		finalizedItemList.add(item);

packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -31,7 +31,7 @@ import static android.media.MediaRoute2Info.TYPE_USB_HEADSET;
	import static android.media.MediaRoute2Info.TYPE_WIRED_HEADPHONES;		import static android.media.MediaRoute2Info.TYPE_WIRED_HEADPHONES;
	import static android.media.MediaRoute2Info.TYPE_WIRED_HEADSET;		import static android.media.MediaRoute2Info.TYPE_WIRED_HEADSET;
	import static android.media.RouteListingPreference.Item.FLAG_ONGOING_SESSION;		import static android.media.RouteListingPreference.Item.FLAG_ONGOING_SESSION;
	import static android.media.RouteListingPreference.Item.FLAG_SUGGESTED_ROUTE;		import static android.media.RouteListingPreference.Item.FLAG_SUGGESTED;
	import static android.media.RouteListingPreference.Item.SELECTION_BEHAVIOR_TRANSFER;		import static android.media.RouteListingPreference.Item.SELECTION_BEHAVIOR_TRANSFER;
	import static android.media.RouteListingPreference.Item.SUBTEXT_AD_ROUTING_DISALLOWED;		import static android.media.RouteListingPreference.Item.SUBTEXT_AD_ROUTING_DISALLOWED;
	import static android.media.RouteListingPreference.Item.SUBTEXT_CUSTOM;		import static android.media.RouteListingPreference.Item.SUBTEXT_CUSTOM;
	@@ -551,7 +551,7 @@ public abstract class MediaDevice implements Comparable<MediaDevice> {
	private static class Api34Impl {		private static class Api34Impl {
	@DoNotInline		@DoNotInline
	static boolean isSuggestedDevice(RouteListingPreference.Item item) {		static boolean isSuggestedDevice(RouteListingPreference.Item item) {
	return item != null && (item.getFlags() & FLAG_SUGGESTED_ROUTE) != 0;		return item != null && (item.getFlags() & FLAG_SUGGESTED) != 0;
	}		}

	@DoNotInline		@DoNotInline

packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaManagerTest.java

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -259,8 +259,10 @@ public class InfoMediaManagerTest {
	ReflectionHelpers.setStaticField(Build.VERSION.class, "SDK_INT",		ReflectionHelpers.setStaticField(Build.VERSION.class, "SDK_INT",
	Build.VERSION_CODES.UPSIDE_DOWN_CAKE);		Build.VERSION_CODES.UPSIDE_DOWN_CAKE);
	final List<RouteListingPreference.Item> preferenceItemList = new ArrayList<>();		final List<RouteListingPreference.Item> preferenceItemList = new ArrayList<>();
	RouteListingPreference.Item item1 = new RouteListingPreference.Item.Builder(		RouteListingPreference.Item item1 =
	TEST_ID_4).setFlags(RouteListingPreference.Item.FLAG_SUGGESTED_ROUTE).build();		new RouteListingPreference.Item.Builder(TEST_ID_4)
			.setFlags(RouteListingPreference.Item.FLAG_SUGGESTED)
			.build();
	RouteListingPreference.Item item2 = new RouteListingPreference.Item.Builder(		RouteListingPreference.Item item2 = new RouteListingPreference.Item.Builder(
	TEST_ID_3).build();		TEST_ID_3).build();
	preferenceItemList.add(item1);		preferenceItemList.add(item1);