Merge "Extend BluetoothRouteController interface with selectRoute method" into udc-dev

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

@@ -142,6 +142,12 @@ class AudioPoliciesBluetoothRouteController implements BluetoothRouteController
         mContext.unregisterReceiver(mDeviceStateChangedReceiver);
     }
 
+    @Override
+    public boolean selectRoute(String deviceAddress) {
+        // Temporary no-op.
+        return false;
+    }
+
     /**
      * Transfers to a given bluetooth route.
      * The dedicated BT device with the route would be activated.

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

@@ -68,6 +68,17 @@ import java.util.Objects;
      */
     void stop();
 
+
+    /**
+     * Selects the route with the given {@code deviceAddress}.
+     *
+     * @param deviceAddress The physical address of the device to select. May be null to unselect
+     *                      the currently selected device.
+     * @return Whether the selection succeeds. If the selection fails, the state of the instance
+     * remains unaltered.
+     */
+    boolean selectRoute(@Nullable String deviceAddress);
+
     /**
      * Transfers Bluetooth output to the given route.
      *
@@ -144,6 +155,12 @@ import java.util.Objects;
             // no op
         }
 
+        @Override
+        public boolean selectRoute(String deviceAddress) {
+            // no op
+            return false;
+        }
+
         @Override
         public void transferTo(String routeId) {
             // no op

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

@@ -132,6 +132,12 @@ class LegacyBluetoothRouteController implements BluetoothRouteController {
         mContext.unregisterReceiver(mDeviceStateChangedReceiver);
     }
 
+    @Override
+    public boolean selectRoute(String deviceAddress) {
+        // No-op as the class decides if a route is selected based on Bluetooth events.
+        return false;
+    }
+
     /**
      * Transfers to a given bluetooth route.
      * The dedicated BT device with the route would be activated.