Merge "When adding bluetooth phone account as emergency capable, also list it for multi user" into qt-dev
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index fded508..f188ae0 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -93,7 +93,7 @@
<string name="status_success" msgid="239573225847565868">"Преносот на датотека е успешно завршен."</string>
<string name="status_not_accept" msgid="1695082417193780738">"Содржината не е поддржана."</string>
<string name="status_forbidden" msgid="613956401054050725">"Преносот е забранет од целниот уред."</string>
- <string name="status_canceled" msgid="6664490318773098285">"Преносот е откажан од страна на корисникот."</string>
+ <string name="status_canceled" msgid="6664490318773098285">"Корисникот го откажа преносот."</string>
<string name="status_file_error" msgid="3671917770630165299">"Проблем со меморија."</string>
<string name="status_no_sd_card_nosdcard" msgid="573631036356922221">"Нема USB-меморија."</string>
<string name="status_no_sd_card_default" msgid="396564893716701954">"Нема SD-картичка. Вметнете SD-картичка за да се зачуваат пренесените датотеки."</string>
diff --git a/src/com/android/bluetooth/btservice/AdapterProperties.java b/src/com/android/bluetooth/btservice/AdapterProperties.java
index a166707..4b4b4df 100644
--- a/src/com/android/bluetooth/btservice/AdapterProperties.java
+++ b/src/com/android/bluetooth/btservice/AdapterProperties.java
@@ -24,6 +24,7 @@
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothHeadset;
import android.bluetooth.BluetoothHeadsetClient;
+import android.bluetooth.BluetoothHearingAid;
import android.bluetooth.BluetoothHidDevice;
import android.bluetooth.BluetoothHidHost;
import android.bluetooth.BluetoothMap;
@@ -133,6 +134,9 @@
case BluetoothHeadsetClient.ACTION_CONNECTION_STATE_CHANGED:
sendConnectionStateChange(BluetoothProfile.HEADSET_CLIENT, intent);
break;
+ case BluetoothHearingAid.ACTION_CONNECTION_STATE_CHANGED:
+ sendConnectionStateChange(BluetoothProfile.HEARING_AID, intent);
+ break;
case BluetoothA2dpSink.ACTION_CONNECTION_STATE_CHANGED:
sendConnectionStateChange(BluetoothProfile.A2DP_SINK, intent);
break;
@@ -206,6 +210,7 @@
IntentFilter filter = new IntentFilter();
filter.addAction(BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED);
filter.addAction(BluetoothHeadsetClient.ACTION_CONNECTION_STATE_CHANGED);
+ filter.addAction(BluetoothHearingAid.ACTION_CONNECTION_STATE_CHANGED);
filter.addAction(BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED);
filter.addAction(BluetoothA2dpSink.ACTION_CONNECTION_STATE_CHANGED);
filter.addAction(BluetoothHidDevice.ACTION_CONNECTION_STATE_CHANGED);