Merge "Use new BluetoothUuid constants" am: cb68e37fef
am: d92587f213
Change-Id: I4ea44c5d69ec8b4d789d543f946254a1db8e4a11
diff --git a/service/src/com/android/car/BluetoothProfileDeviceManager.java b/service/src/com/android/car/BluetoothProfileDeviceManager.java
index e73d9ea..cfd45e5 100644
--- a/service/src/com/android/car/BluetoothProfileDeviceManager.java
+++ b/service/src/com/android/car/BluetoothProfileDeviceManager.java
@@ -91,12 +91,12 @@
sProfileActions.put(BluetoothProfile.A2DP_SINK,
new BluetoothProfileInfo(BluetoothA2dpSink.ACTION_CONNECTION_STATE_CHANGED,
KEY_BLUETOOTH_A2DP_SINK_DEVICES, new ParcelUuid[] {
- BluetoothUuid.AudioSource
+ BluetoothUuid.A2DP_SOURCE
}, new int[] {}));
sProfileActions.put(BluetoothProfile.HEADSET_CLIENT,
new BluetoothProfileInfo(BluetoothHeadsetClient.ACTION_CONNECTION_STATE_CHANGED,
KEY_BLUETOOTH_HFP_CLIENT_DEVICES, new ParcelUuid[] {
- BluetoothUuid.Handsfree_AG,
+ BluetoothUuid.HFP_AG,
BluetoothUuid.HSP_AG
}, new int[] {BluetoothProfile.MAP_CLIENT, BluetoothProfile.PBAP_CLIENT}));
sProfileActions.put(BluetoothProfile.MAP_CLIENT,
diff --git a/tests/carservice_unit_test/src/com/android/car/BluetoothProfileDeviceManagerTest.java b/tests/carservice_unit_test/src/com/android/car/BluetoothProfileDeviceManagerTest.java
index b5837fe..c774a7f 100644
--- a/tests/carservice_unit_test/src/com/android/car/BluetoothProfileDeviceManagerTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/BluetoothProfileDeviceManagerTest.java
@@ -105,7 +105,7 @@
private final String mSettingsKey = KEY_BLUETOOTH_HFP_CLIENT_DEVICES;
private final String mConnectionAction = BluetoothHeadsetClient.ACTION_CONNECTION_STATE_CHANGED;
private ParcelUuid[] mUuids = new ParcelUuid[] {
- BluetoothUuid.Handsfree_AG,
+ BluetoothUuid.HFP_AG,
BluetoothUuid.HSP_AG};
private ParcelUuid[] mBadUuids = new ParcelUuid[] {
BluetoothUuid.PANU};