summaryrefslogtreecommitdiffstats
path: root/packages/SettingsLib
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2015-06-25 14:14:06 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-25 14:14:06 +0000
commit00270ad2186bd0796fbae46e6f7dc18cae1e8122 (patch)
tree0481a7b321c1c1c5aa335a4db948ff70d0f8f547 /packages/SettingsLib
parent62fdc0cffe7f947d45ade5cbc3c0086b9af88be5 (diff)
parent107cb81f9054a406b94e249c99fd7d64be71faec (diff)
downloadframeworks_base-00270ad2186bd0796fbae46e6f7dc18cae1e8122.zip
frameworks_base-00270ad2186bd0796fbae46e6f7dc18cae1e8122.tar.gz
frameworks_base-00270ad2186bd0796fbae46e6f7dc18cae1e8122.tar.bz2
am 107cb81f: Merge "Make BluetoothEventManager listen to ALIAS_CHANGED" into mnc-dev
* commit '107cb81f9054a406b94e249c99fd7d64be71faec': Make BluetoothEventManager listen to ALIAS_CHANGED
Diffstat (limited to 'packages/SettingsLib')
-rwxr-xr-xpackages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java
index 9a2f71c..bf92fda 100755
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java
@@ -93,6 +93,7 @@ public final class BluetoothEventManager {
addHandler(BluetoothDevice.ACTION_FOUND, new DeviceFoundHandler());
addHandler(BluetoothDevice.ACTION_DISAPPEARED, new DeviceDisappearedHandler());
addHandler(BluetoothDevice.ACTION_NAME_CHANGED, new NameChangedHandler());
+ addHandler(BluetoothDevice.ACTION_ALIAS_CHANGED, new NameChangedHandler());
// Pairing broadcasts
addHandler(BluetoothDevice.ACTION_BOND_STATE_CHANGED, new BondStateChangedHandler());