Merge "Rename getDeviceRoute to getSelectedRoute" into main (bee38e9b) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/media/AudioPoliciesDeviceRouteController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -110,7 +110,7 @@ import java.util.Objects;

		@Override
		@NonNull
		public synchronized MediaRoute2Info getDeviceRoute() {
		public synchronized MediaRoute2Info getSelectedRoute() {
		if (mSelectedRoute != null) {
		return mSelectedRoute;
		}

services/core/java/com/android/server/media/DeviceRouteController.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -72,13 +72,9 @@ import com.android.media.flags.Flags;
		*/
		boolean selectRoute(@Nullable @MediaRoute2Info.Type Integer type);

		/**
		* Returns currently selected device (built-in or wired) route.
		*
		* @return non-null device route.
		*/
		/** Returns the currently selected device (built-in or wired) route. */
		@NonNull
		MediaRoute2Info getDeviceRoute();
		MediaRoute2Info getSelectedRoute();

		/**
		* Updates device route volume.

services/core/java/com/android/server/media/LegacyDeviceRouteController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -107,7 +107,7 @@ import java.util.Objects;

		@Override
		@NonNull
		public synchronized MediaRoute2Info getDeviceRoute() {
		public synchronized MediaRoute2Info getSelectedRoute() {
		return mDeviceRoute;
		}

services/core/java/com/android/server/media/SystemMediaRoute2Provider.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -228,8 +228,8 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider {
		return;
		}

		MediaRoute2Info deviceRoute = mDeviceRouteController.getDeviceRoute();
		if (TextUtils.equals(routeId, deviceRoute.getId())) {
		MediaRoute2Info selectedDeviceRoute = mDeviceRouteController.getSelectedRoute();
		if (TextUtils.equals(routeId, selectedDeviceRoute.getId())) {
		mBluetoothRouteController.transferTo(null);
		} else {
		mBluetoothRouteController.transferTo(routeId);
		@@ -278,11 +278,11 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider {
		return null;
		}

		MediaRoute2Info deviceRoute = mDeviceRouteController.getDeviceRoute();
		MediaRoute2Info selectedDeviceRoute = mDeviceRouteController.getSelectedRoute();

		RoutingSessionInfo.Builder builder = new RoutingSessionInfo.Builder(
		SYSTEM_SESSION_ID, packageName).setSystemSession(true);
		builder.addSelectedRoute(deviceRoute.getId());
		builder.addSelectedRoute(selectedDeviceRoute.getId());
		for (MediaRoute2Info route : mBluetoothRouteController.getAllBluetoothRoutes()) {
		builder.addTransferableRoute(route.getId());
		}
		@@ -314,7 +314,7 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider {
		MediaRoute2ProviderInfo.Builder builder = new MediaRoute2ProviderInfo.Builder();

		// We must have a device route in the provider info.
		builder.addRoute(mDeviceRouteController.getDeviceRoute());
		builder.addRoute(mDeviceRouteController.getSelectedRoute());

		for (MediaRoute2Info route : mBluetoothRouteController.getAllBluetoothRoutes()) {
		builder.addRoute(route);
		@@ -338,12 +338,12 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider {
		SYSTEM_SESSION_ID, "" /* clientPackageName */)
		.setSystemSession(true);

		MediaRoute2Info deviceRoute = mDeviceRouteController.getDeviceRoute();
		MediaRoute2Info selectedRoute = deviceRoute;
		MediaRoute2Info selectedDeviceRoute = mDeviceRouteController.getSelectedRoute();
		MediaRoute2Info selectedRoute = selectedDeviceRoute;
		MediaRoute2Info selectedBtRoute = mBluetoothRouteController.getSelectedRoute();
		if (selectedBtRoute != null) {
		selectedRoute = selectedBtRoute;
		builder.addTransferableRoute(deviceRoute.getId());
		builder.addTransferableRoute(selectedDeviceRoute.getId());
		}
		mSelectedRouteId = selectedRoute.getId();
		mDefaultRoute =

services/tests/servicestests/src/com/android/server/media/AudioPoliciesDeviceRouteControllerTest.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -90,7 +90,7 @@ public class AudioPoliciesDeviceRouteControllerTest {

		@Test
		public void getDeviceRoute_noSelectedRoutes_returnsDefaultDevice() {
		MediaRoute2Info route2Info = mController.getDeviceRoute();
		MediaRoute2Info route2Info = mController.getSelectedRoute();

		assertThat(route2Info.getName()).isEqualTo(ROUTE_NAME_DEFAULT);
		assertThat(route2Info.getType()).isEqualTo(MediaRoute2Info.TYPE_BUILTIN_SPEAKER);
		@@ -105,7 +105,7 @@ public class AudioPoliciesDeviceRouteControllerTest {
		audioRoutesInfo.mainType = AudioRoutesInfo.MAIN_HEADPHONES;
		callAudioRoutesObserver(audioRoutesInfo);

		MediaRoute2Info route2Info = mController.getDeviceRoute();
		MediaRoute2Info route2Info = mController.getSelectedRoute();
		assertThat(route2Info.getName()).isEqualTo(ROUTE_NAME_HEADPHONES);
		assertThat(route2Info.getType()).isEqualTo(MediaRoute2Info.TYPE_WIRED_HEADPHONES);
		}
		@@ -117,7 +117,7 @@ public class AudioPoliciesDeviceRouteControllerTest {

		mController.selectRoute(MediaRoute2Info.TYPE_DOCK);

		MediaRoute2Info route2Info = mController.getDeviceRoute();
		MediaRoute2Info route2Info = mController.getSelectedRoute();
		assertThat(route2Info.getName()).isEqualTo(ROUTE_NAME_DOCK);
		assertThat(route2Info.getType()).isEqualTo(MediaRoute2Info.TYPE_DOCK);
		}
		@@ -135,7 +135,7 @@ public class AudioPoliciesDeviceRouteControllerTest {

		mController.selectRoute(MediaRoute2Info.TYPE_DOCK);

		MediaRoute2Info route2Info = mController.getDeviceRoute();
		MediaRoute2Info route2Info = mController.getSelectedRoute();
		assertThat(route2Info.getName()).isEqualTo(ROUTE_NAME_DOCK);
		assertThat(route2Info.getType()).isEqualTo(MediaRoute2Info.TYPE_DOCK);
		}
		@@ -155,7 +155,7 @@ public class AudioPoliciesDeviceRouteControllerTest {

		mController.selectRoute(null);

		MediaRoute2Info route2Info = mController.getDeviceRoute();
		MediaRoute2Info route2Info = mController.getSelectedRoute();
		assertThat(route2Info.getName()).isEqualTo(ROUTE_NAME_HEADPHONES);
		assertThat(route2Info.getType()).isEqualTo(MediaRoute2Info.TYPE_WIRED_HEADPHONES);
		}
		@@ -171,7 +171,7 @@ public class AudioPoliciesDeviceRouteControllerTest {

		mController.selectRoute(MediaRoute2Info.TYPE_BLUETOOTH_A2DP);

		MediaRoute2Info route2Info = mController.getDeviceRoute();
		MediaRoute2Info route2Info = mController.getSelectedRoute();
		assertThat(route2Info.getName()).isEqualTo(ROUTE_NAME_HEADPHONES);
		assertThat(route2Info.getType()).isEqualTo(MediaRoute2Info.TYPE_WIRED_HEADPHONES);
		}
		@@ -202,7 +202,7 @@ public class AudioPoliciesDeviceRouteControllerTest {

		mController.updateVolume(VOLUME_SAMPLE_1);

		MediaRoute2Info route2Info = mController.getDeviceRoute();
		MediaRoute2Info route2Info = mController.getSelectedRoute();
		assertThat(route2Info.getType()).isEqualTo(MediaRoute2Info.TYPE_WIRED_HEADPHONES);
		assertThat(route2Info.getVolume()).isEqualTo(VOLUME_SAMPLE_1);
		}
		@@ -222,7 +222,7 @@ public class AudioPoliciesDeviceRouteControllerTest {

		mController.selectRoute(MediaRoute2Info.TYPE_DOCK);

		MediaRoute2Info route2Info = mController.getDeviceRoute();
		MediaRoute2Info route2Info = mController.getSelectedRoute();
		assertThat(route2Info.getType()).isEqualTo(MediaRoute2Info.TYPE_DOCK);
		assertThat(route2Info.getVolume()).isEqualTo(VOLUME_SAMPLE_1);
		}