summaryrefslogtreecommitdiff
path: root/src/com/android/car
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/car')
-rw-r--r--src/com/android/car/messenger/MessengerDelegate.java10
-rw-r--r--src/com/android/car/messenger/bluetooth/BluetoothHelper.java2
2 files changed, 8 insertions, 4 deletions
diff --git a/src/com/android/car/messenger/MessengerDelegate.java b/src/com/android/car/messenger/MessengerDelegate.java
index 4662625..926e3bc 100644
--- a/src/com/android/car/messenger/MessengerDelegate.java
+++ b/src/com/android/car/messenger/MessengerDelegate.java
@@ -186,9 +186,13 @@ public class MessengerDelegate implements BluetoothMonitor.OnBluetoothEventListe
intent,
PendingIntent.FLAG_ONE_SHOT);
- success = BluetoothHelper.sendMessage(mBluetoothMapClient,
- senderKey.getDeviceAddress(), recipientUris, messageText,
- sentIntent, null);
+ try {
+ success = BluetoothHelper.sendMessage(mBluetoothMapClient,
+ senderKey.getDeviceAddress(), recipientUris, messageText,
+ sentIntent, null);
+ } catch (IllegalArgumentException e) {
+ L.w(TAG, "Invalid device address: " + senderKey.getDeviceAddress());
+ }
}
}
}
diff --git a/src/com/android/car/messenger/bluetooth/BluetoothHelper.java b/src/com/android/car/messenger/bluetooth/BluetoothHelper.java
index 09629b5..e95b386 100644
--- a/src/com/android/car/messenger/bluetooth/BluetoothHelper.java
+++ b/src/com/android/car/messenger/bluetooth/BluetoothHelper.java
@@ -20,7 +20,7 @@ public class BluetoothHelper {
/**
* Returns a (potentially empty) immutable set of bonded (paired) devices.
*/
- public static Set<BluetoothDevice> getPairedDevices() {
+ public static Set<BluetoothDevice> getBondedDevices() {
BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
if (adapter != null) {