Merge "Alert user when saving empty SIP profile."
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index b140e8e..d9e6df8 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -469,6 +469,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Voer alles in"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Voer SIM-kontakte in"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Voer in uit kontakte"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Kontak is ingevoer"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Kon nie kontak invoer nie"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Gehoorapparate"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Skakel gehoorapparaat-versoenbaarheid aan"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 48bbf30..a43e7d0 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"ሁሉንም አስመጣ"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"የSIM ዕውቂያዎች አስመጣ"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"ከዕውቂያዎች አስገባ"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"የመጣ እውቂያ"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"እውቂያን ማስመጣት አልተቻለም"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"ማዳመጫ መርጃዎች"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"የመስሚያ መርጃ ተጓዳኝአብራ"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index cd82e24..620120e 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"استيراد الكل"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"استيراد جهات اتصال شريحة SIM"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"استيراد من جهات الاتصال"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"تم استيراد جهة اتصال"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"أخفق استيراد جهة اتصال"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"أدوات السمع المساعدة"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"تشغيل التوافق مع أداة السمع"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index af3bd19..60367f7 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Hamısını import edin"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"SIM kontaktlar import edilir"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Kontaktlardan import edin"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Idxal olunmuş kontakt"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Kontakt idxalı uğursuz oldu"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Eşitmə yardımı"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Eşitmə yardımı uyğunluğunu aktivləşdirin"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 1dc4b16..ac00ab7 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Импортиране на всички"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Импортиране на контактите от SIM картата"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Импортиране от контактите"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Контактът е импортиран"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Импортирането на контакта не бе успешно"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Слухови апарати"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Включване на съвместимостта за слухов апарат"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 70e7135..76c5f2f 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"সবকিছু আমদানি করুন"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"সিম পরিচিতিগুলি আমদানি করা হচ্ছে"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"পরিচিতিগুলি থেকে আমদানি করুন"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"পরিচিতি আমদানি করা হয়েছে"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"পরিচিতি আমদানি করতে ব্যর্থ হয়েছে"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"শ্রবণ যন্ত্রগুলি"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"শ্রবণ যন্ত্র উপযুক্ততা চালু করুন"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index c96802b..4aa3bc4 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Importa-ho tot"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"S\'estan important els contactes de la SIM"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Importa dels contactes"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"El contacte s\'ha importat"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Error en importar el contacte"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Audiòfons"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Activa la compatibilitat amb audiòfons"</string>
<string-array name="tty_mode_entries">
@@ -502,8 +504,8 @@
<string name="ota_try_again" msgid="7685477206465902290">"Torna-ho a provar"</string>
<string name="ota_next" msgid="3904945374358235910">"Següent"</string>
<string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
- <string name="phone_entered_ecm_text" msgid="6266424252578731203">"S\'ha entrat al mode de crida de retorn d\'emergència"</string>
- <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Mode de crida de retorn d\'emergència"</string>
+ <string name="phone_entered_ecm_text" msgid="6266424252578731203">"S\'ha activat al mode de devolució de trucada d\'emergència"</string>
+ <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Mode de devolució de trucada d\'emergència"</string>
<string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Connexió de dades desactivada"</string>
<plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
<item quantity="other">No hi ha hagut connexió de dades durant <xliff:g id="COUNT_1">%s</xliff:g> minuts</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 37383fe..614e32c 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Importovat vše"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Importování kontaktů ze SIM karty"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Import z kontaktů"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Kontakt byl importován"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Kontakt se nepodařilo importovat"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Naslouchátka"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Zapnout režim kompatibility s naslouchátkem"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 3813bd9..dbe7823 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -471,6 +471,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Importer alle"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Importerer SIM-kontakter"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Importer fra kontakter"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Kontaktpersonen blev importeret"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Kontaktpersonen kunne ikke importeres"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Høreapparater"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Slå høreapparatskompatibilitet til"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f067003..c77d2b8 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -469,6 +469,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Alle importieren"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"SIM-Kontakte werden importiert"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Aus Kontakten importieren"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Kontakt wird importiert."</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Fehler beim Importieren des Kontakts"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Hörhilfen"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Hörhilfekompatibilität aktivieren"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index c4fafc3..e1d12c0 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Εισαγωγή όλων"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Εισαγωγή επαφών από κάρτα SIM"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Εισαγωγή από επαφές"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Εισαγόμενη επαφή"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Αποτυχία εισαγωγής επαφής"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Βοηθήματα ακρόασης"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Ενεργοποίηση συμβατότητας βοηθήματος ακρόασης"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index b4b039e..4760891 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Import all"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Importing SIM contacts"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Import from contacts"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Imported contact"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Failed to import contact"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Hearing aids"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Turn on hearing-aid compatibility"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index b4b039e..4760891 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Import all"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Importing SIM contacts"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Import from contacts"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Imported contact"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Failed to import contact"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Hearing aids"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Turn on hearing-aid compatibility"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index b4b039e..4760891 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Import all"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Importing SIM contacts"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Import from contacts"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Imported contact"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Failed to import contact"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Hearing aids"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Turn on hearing-aid compatibility"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index c109946..5408627 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Importar todo"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Importando contactos SIM"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Importar desde contactos"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Se importó el contacto"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"No se pudo importar el contacto"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Ayudas auditivas"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Activar compatibilidad de ayuda auditiva"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 6fecf0e..aa326d8 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -469,6 +469,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Importar todos"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Importando contactos de tarjeta SIM..."</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Importar de contactos"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Contacto importado"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Error al importar contactos"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Audífonos"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Activar compatibilidad con audífono"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index e6d2482..71be316 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Impordi kõik"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"SIM-kaardi kontaktide importimine"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Impordi kontaktidest"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Kontakt on imporditud"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Kontakti importimine ebaõnnestus"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Kuuldeaparaadid"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Lülita kuuldeaparaadi ühilduvus sisse"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index e3c3a0e..7805227 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -471,6 +471,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Inportatu guztiak"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"SIM txarteleko kontaktuak inportatzen"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Inportatu kontaktuetatik"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Kontaktua inportatu da"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Ezin izan da inportatu kontaktua"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Audiofonoak"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Aktibatu audiofonoen bateragarritasuna"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 56a08f4..941302f 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -411,7 +411,7 @@
<string name="pin2_attempts" msgid="720736232885011507">\n"<xliff:g id="NUMBER">%d</xliff:g> تلاش باقیمانده دارید."</string>
<string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 دیگر مسدود نیست"</string>
<string name="pin2_error_exception" msgid="1088689322248996699">"خطای شبکه یا سیمکارت"</string>
- <string name="doneButton" msgid="2859593360997984240">"انجام شد"</string>
+ <string name="doneButton" msgid="2859593360997984240">"تمام"</string>
<string name="voicemail_settings_number_label" msgid="8524164258691887790">"شماره پست صوتی"</string>
<string name="card_title_dialing" msgid="5769417478498348054">"شماره گیری"</string>
<string name="card_title_redialing" msgid="8253487008234167266">"در حال شمارهگیری مجدد"</string>
@@ -448,7 +448,7 @@
<string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"در حال روشن کردن رادیو..."</string>
<string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"سرویسی در دسترس نیست. دوباره امتحان کنید..."</string>
<string name="dial_emergency_error" msgid="1509085166367420355">"نمیتوانید تماس بگیرید. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> یک شماره اضطراری نیست."</string>
- <string name="dial_emergency_empty_error" msgid="9130194953830414638">"نمی توانید تماس بگیرید. یک شماره اضطراری را شمارهگیری کنید."</string>
+ <string name="dial_emergency_empty_error" msgid="9130194953830414638">"نمی توانید تماس بگیرید. یک شماره اضطراری را شمارهگیری کنید."</string>
<string name="dialerKeyboardHintText" msgid="9192914825413747792">"استفاده از صفحهکلید برای شماره گیری"</string>
<string name="onscreenHoldText" msgid="2285258239691145872">"نگهداشت"</string>
<string name="onscreenEndCallText" msgid="4403855834875398585">"پایان"</string>
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"وارد کردن همه"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"وارد کردن مخاطبین سیم"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"وارد کردن از مخاطبین"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"مخاطب واردشده"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"مخاطب وارد نشد"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"دستگاههای کمک شنوایی"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"روشن کردن سازگاری دستگاه کمک شنوایی"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 483058e..c795e92 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -469,6 +469,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Tuo kaikki"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Tuodaan SIM-kortin yhteystietoja"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Tuo yhteystiedoista"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Tuotu kontakti"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Kontaktin tuominen epäonnistui"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Kuulolaitteet"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Ota kuulolaitteen yhteensopivuustoiminto käyttöön"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 459e857..6d7c995 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -469,6 +469,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Tout importer"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Importation des contacts SIM"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Importer à partir des contacts"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Contacts importés"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Impossible d\'importer un contact"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Assistance auditive"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Activer la compatibilité du service d\'assistance auditive"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 78c3acb..a57ed44 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Tout importer"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Importation des contacts SIM"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Importer à partir des contacts"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Contact importé"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Échec de l\'importation du contact."</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Assistance auditive"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Activer la compatibilité du service d\'assistance auditive"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 283339b..c1b747b 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Importar todo"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Importando contactos da SIM"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Importar dos contactos"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Importouse o contacto"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Produciuse un erro ao importar o contacto"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Audiófonos"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Activar a compatibilidade con audiófonos"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index 29e5014..5e7ec3d 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -303,9 +303,9 @@
<string name="enable_disable_technology_news" msgid="3517184627114999149">"ટેક્નોલોજી સમાચાર"</string>
<string name="technology_news_enable" msgid="7995209394210455181">"તકનીકી સમાચાર સક્ષમ કરેલ છે"</string>
<string name="technology_news_disable" msgid="5483490380561851946">"તકનીકી સમાચાર અક્ષમ કરેલ છે"</string>
- <string name="enable_disable_multi_category" msgid="626771003122899280">"બહુ-કેટેગરી"</string>
- <string name="multi_category_enable" msgid="1179299804641721768">"બહુ-કેટેગરી સક્ષમ કરેલ છે"</string>
- <string name="multi_category_disable" msgid="880104702904139505">"બહુ-કેટેગરી અક્ષમ કરેલ છે"</string>
+ <string name="enable_disable_multi_category" msgid="626771003122899280">"બહુ-કૅટેગરી"</string>
+ <string name="multi_category_enable" msgid="1179299804641721768">"બહુ-કૅટેગરી સક્ષમ કરેલ છે"</string>
+ <string name="multi_category_disable" msgid="880104702904139505">"બહુ-કૅટેગરી અક્ષમ કરેલ છે"</string>
<string name="network_lte" msgid="7702681952521375754">"LTE (ભલામણ કરેલ)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (ભલામણ કરેલ)"</string>
<string name="network_global" msgid="1323190488685355309">"વૈશ્વિક"</string>
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"બધુ આયાત કરો"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"SIM સંપર્કો આયાત કરી રહ્યાં છે"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"સંપર્કોમાંથી આયાત કરો"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"સંપર્ક આયાત કર્યો"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"સંપર્ક આયાત કરવામાં નિષ્ફળ થયાં"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"સાંભળવામાં સહાયો"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"સાંભળવું અને સુસંગતતા ચાલુ કરો"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index db2de68..bccbf44 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"सभी आयात करें"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"सिम संपर्क आयात कर रहा है"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"संपर्कों से आयात करें"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"संपर्क आयात किया गया"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"संपर्क आयात करने में विफल"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"श्रवण सहायक साधन"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"श्रवण सहायक साधन संगतता चालू करें"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index bdbcf42..ae9f3a7 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Uvezi sve"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Uvoz SIM kontakata"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Uvezi iz kontakata"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Uvezeni kontakt"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Uvoz kontakta nije uspio"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Pomoć za osobe oštećenog sluha"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Uključi kompatibilnost za pomoć osobama oštećenog sluha"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 510d854..40c37fb 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Összes importálása"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"SIM kártya névjegyeinek importálása"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Importálás a Címtárból"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Importált névjegy"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Névjegy importálása sikertelen"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Hallókészülékek"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Hallókészülék-kompatibilitás bekapcsolása"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 6b2e431..a3d0ea2 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -471,6 +471,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Ներմուծել բոլորը"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Ներմուծվում է SIM-ի կոնտակտներից"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Ներմուծել կոնտակտներից"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Ներմուծված կոնտակտ"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Չհաջողվեց ներմուծել կոնտակտը"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Լսողական օգնական"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Միացնել լսողական օգնականի համատեղելիությունը"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index d2846f8..e99b52d 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Impor semua"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Mengimpor kontak dari SIM"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Impor dari kontak"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Kontak diimpor"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Gagal mengimpor kontak"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Alat bantu dengar"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Hidupkan kompatibilitas alat bantu dengar"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index e7af689..fb68d54 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Flytja allt inn"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Flytur inn tengiliði af SIM-korti"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Flytja inn úr tengiliðum"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Tengiliður fluttur inn"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Mistókst að flytja inn tengilið"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Heyrnartæki"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Kveikja á samhæfi við heyrnartæki"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 1b9ea2f..804b66a 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -469,6 +469,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Importa tutti"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Importazione contatti SIM"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Importa da contatti"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Contatto importato"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Importazione contatto non riuscita"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Apparecchi acustici"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Attiva la compatibilità con apparecchi acustici"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index baa2823..f3fd1b7 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"ייבא הכל"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"מייבא אנשי קשר מ-SIM"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"ייבא מאנשי קשר"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"איש הקשר יובא"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"ייבוא איש הקשר נכשל"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"מכשירי שמיעה"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"הפעל תאימות למכשיר שמיעה"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 7e0af33..22c7e07 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"すべてインポート"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"SIMの連絡先をインポート中"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"連絡先からインポート"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"連絡先をインポートしました"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"連絡先をインポートできませんでした"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"補聴機能"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"補聴機能の互換をON"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 13eb0e6..f607167 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"ყველას იმპორტი"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"მიმდინარეობს SIM კონტაქტების იმპორტი"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"კონტაქტებიდან იმპორტი"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"კონტაქტი იმპორტირებულია"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"კონტაქტის იმპორტი ვერ მოხერხდა"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"სმენის დახმარებები"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"სმენის დახმარების თავსებადობის ჩართვა"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index e9b727b..d410c1c 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Барлығын импорттау"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"SIM контактілерін импортттау"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Контактілерден импорттау"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Контакт импортталды"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Контактіні импорттау сәтсіз аяқталды"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Есту көмектері"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Есту көмегінің үйлесімділігін қосу"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index d368d72..0767335 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"នាំចូលទាំងអស់"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"នាំចូលទំនាក់ទំនងស៊ីមកាត"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"នាំចូលពីទំនាក់ទំនង"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"បាននាំចូលទំនាក់ទំនង"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"បានបរាជ័យក្នុងការនាំចូលទំនាក់ទំនង"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"ឧបករណ៍ជំនួសការស្ដាប់"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"បើកឧបករណ៍ជំនួសការស្ដាប់"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 4e58f93..5ad4416 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"ಎಲ್ಲವನ್ನೂ ಆಮದು ಮಾಡು"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"ಸಿಮ್ ಸಂಪರ್ಕಗಳನ್ನು ಆಮದು ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"ಸಂಪರ್ಕಗಳಿಂದ ಆಮದು ಮಾಡು"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"ಆಮದು ಮಾಡಿದ ಸಂಪರ್ಕ"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"ಸಂಪರ್ಕ ಆಮದು ಮಾಡುವಲ್ಲಿ ವಿಫಲವಾಗಿದೆ"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"ಶ್ರವಣ ಸಾಧನಗಳು"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"ಶ್ರವಣ ಸಾಧನ ಹೊಂದಾಣಿಕೆಯನ್ನು ಆನ್ ಮಾಡಿ"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index d2a702c..867b9c8 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"모두 가져오기"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"SIM 주소록 가져오는 중"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"주소록에서 가져오기"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"연락처를 가져왔습니다."</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"연락처를 가져오지 못했습니다."</string>
<string name="hac_mode_title" msgid="8740268574688743289">"보청기"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"보청기 호환 사용"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 6cf61f2..69bb499 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Баарын импорттоо"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"SIM-картадагы байланыштардан импорттоо"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Байланыштардан импорттоо"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Байланыш импорттолду"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Байланыш импорттолбой калды"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Угуу аппараты"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Угуу аппаратына шайкештигин күйгүзүү"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index cfdd683..0c5e7b4 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"ນຳເຂົ້າທັງໝົດ"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"ກຳລັງນຳເຂົ້າລາຍຊື່ຜູ່ຕິດຕໍ່ຈາກ SIM"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"ນຳເຂົ້າຈາກລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"ລາຍຊື່ຕິດຕໍ່ນຳເຂົ້າແລ້ວ"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"ນຳລາຍຊື່ຕິດຕໍ່ເຂົ້າບໍ່ສຳເລັດ"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"ການຊ່ວຍໄດ້ຍິນ"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"ເປີດໃຊ້ການຊ່ວຍໄດ້ຍິນ"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 02b90ec..c0f8c48 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Importuoti viską"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Importuojami SIM kortelės adresatai"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Importuoti iš adresatų"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Importuotas kontaktas"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Nepavyko importuoti kontakto"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Klausos aparatai"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Įjungti klausos aparato suderinamumą"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index eb2dbbc..549b12b 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -467,6 +467,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Importēt visu"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Notiek SIM kontaktpersonu importēšana"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Importēt no kontaktpersonām"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Kontaktpersona ir importēta."</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Neizdevās importēt kontaktpersonu."</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Dzirdes aparāti"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Ieslēgt saderību ar dzirdes aparātiem"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-mcc454-mnc12/config.xml b/res/values-mcc454-mnc12/config.xml
new file mode 100644
index 0000000..4329402
--- /dev/null
+++ b/res/values-mcc454-mnc12/config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<resources>
+ <!-- Show enabled tdscdma option for device when connect roaming network -->
+ <string-array name="config_support_tdscdma_roaming_on_networks" translatable="false">
+ <item>46000</item>
+ <item>46002</item>
+ <item>46007</item>
+ <item>46008</item>
+ </string-array>
+</resources>
diff --git a/res/values-mcc454-mnc13/config.xml b/res/values-mcc454-mnc13/config.xml
new file mode 100644
index 0000000..4329402
--- /dev/null
+++ b/res/values-mcc454-mnc13/config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<resources>
+ <!-- Show enabled tdscdma option for device when connect roaming network -->
+ <string-array name="config_support_tdscdma_roaming_on_networks" translatable="false">
+ <item>46000</item>
+ <item>46002</item>
+ <item>46007</item>
+ <item>46008</item>
+ </string-array>
+</resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index b2f4258..b413620 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -471,6 +471,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Увези ги сите"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Увезување контакти од СИМ"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Увези од контакти"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Увезен е контакт"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Не успеа да увезе контакт"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Слушни помагала"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Вклучи компатибилност на слушни помагала"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 921bb2d..cd6ed3f 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"എല്ലാം ഇമ്പോർട്ടുചെയ്യുക"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"സിം കോൺടാക്റ്റുകൾ ഇമ്പോർട്ടുചെയ്യുന്നു"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"കോൺടാക്റ്റുകളിൽ നിന്ന് ഇമ്പോർട്ടുചെയ്യുക"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"കോൺടാക്റ്റ് ഇമ്പോർട്ടുചെയ്തു"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"കോൺടാക്റ്റ് ഇമ്പോർട്ടുചെയ്യുന്നത് പരാജയപ്പെട്ടു"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"ശ്രവണ സഹായികൾ"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"ശ്രവണസഹായി അനുയോജ്യത ഓൺ ചെയ്യുക"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 032e003..9c72315 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Бүгдийг оруулах"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"SIM харилцагчдыг оруулж байна"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Харилцагчдаас оруулах"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Импортолсон харилцагчийн жагсаалт"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Харилцагчийн жагсаалтыг импортолж чадсангүй"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Сонсголын төхөөрөмж"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Сонсголын төхөөрөмж тааруулагчийг асаана уу"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index c8c6214..6c5e2ab 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"सर्व आयात करा"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"सिम संपर्क आयात करीत आहे"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"संपर्कांमधून आयात करा"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"आयात केलेला संपर्क"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"संपर्क आयात करण्यात अयशस्वी"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"श्रवणयंत्रे"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"श्रवणयंत्र सुसंगतता चालू करा"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 83b4ebc..efbe51a 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Import semua"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Mengimport Kenalan SIM"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Import daripada kenalan"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Kenalan yang diimport"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Gagal mengimport kenalan"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Alat pendengaran"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Hidupkan keserasian alat pendengaran"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index f778a94..65f5e42 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"အားလုံးကို ထည့်သွင်းပါ"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"ဆင်းမ်ကဒ်မှ လိပ်စာများအား ထည့်ပါ"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"လိပ်စားများထဲမှ ထည့်ပါ"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"တင်သွင်းခဲ့သည့် အဆက်အသွယ်"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"အဆက်အသွယ်ကို တင်သွင်း မရခဲ့"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"နားကြပ်"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"အကြားအားရုံကိရိယာနှင့် ကိုက်ညီမှုကို ဖွင့်ပါ"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 9a4dd2c..462ccfe 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -471,6 +471,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Importer alle"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Importerer kontakter fra SIM-kortet"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Importer fra kontakter"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Kontakten er importert"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Kunne ikke importere kontakten"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Høreapparater"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Slå på kompatibilitet med høreapparat"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index aec038e..ccea74b 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"सबै आयात गर्नुहोस्"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"SIM सम्पर्कहरू आयात गर्दै"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"सम्पर्कहरूबाट आयात गर्नुहोस्"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"आयातित सम्पर्क"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"सम्पर्क आयात गर्न असफल"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"श्रवण सहयोगी"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"श्रवण सहायता अनुकूलता खोल्नुहोस्"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 0980c5a..33cf2e3 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Alles importeren"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"SIM-contacten importeren"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Importeren uit contacten"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Contact geïmporteerd"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Kan contact niet importeren"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Gehoorapparaten"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Compatibiliteit voor gehoorapparaat inschakelen"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index d77937f..0b3ae13 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"ਸਾਰੇ ਆਯਾਤ ਕਰੋ"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"SIM ਸੰਪਰਕ ਆਯਾਤ ਕਰ ਰਿਹਾ ਹੈ"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"ਸੰਪਰਕਾਂ ਤੋਂ ਆਯਾਤ ਕਰੋ"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"ਆਯਾਤ ਕੀਤਾ ਸੰਪਰਕ"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"ਸੰਪਰਕ ਆਯਾਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"ਹੀਅਰਿੰਗ ਏਡਸ"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"ਹੀਅਰਿੰਗ ਏਡ ਅਨੁਕੂਲਤਾ ਚਾਲੂ ਕਰੋ"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ef7a95d..c415f58 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Importuj wszystko"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Importowanie kontaktów z karty SIM"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Importuj z Kontaktów"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Kontakt został zaimportowany"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Nie udało się zaimportować kontaktu"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Aparaty słuchowe"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Włącz funkcje zgodności z aparatem słuchowym"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index deaefa7..248bace 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Importar todos"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"A importar contactos do cartão SIM"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Importar a partir dos contactos"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Contacto importado"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Falha ao importar o contacto"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Aparelhos auxiliares de audição"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Ativar compatibilidade com aparelho auxiliar de audição"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 7a0e96c..35d9804 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Importar tudo"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Importando contatos do SIM"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Importar dos contatos"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Contato importado"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Falha ao importar contato"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Aparelhos auditivos"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Ativar compatibilidade com aparelhos auditivos"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 57839ae..7b9d255 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -36,9 +36,9 @@
<string name="audio_mode_earpiece" msgid="4156527186373869107">"Casca dispozitivului"</string>
<string name="audio_mode_wired_headset" msgid="1465350758489175975">"Cască cu fir"</string>
<string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
- <string name="wait_prompt_str" msgid="7601815427707856238">"Trimiteţi următoarele tonuri?\n"</string>
+ <string name="wait_prompt_str" msgid="7601815427707856238">"Trimiteți următoarele tonuri?\n"</string>
<string name="pause_prompt_str" msgid="1789964702154314806">"Se trimit tonuri\n"</string>
- <string name="send_button" msgid="4106860097497818751">"Trimiteţi"</string>
+ <string name="send_button" msgid="4106860097497818751">"Trimiteți"</string>
<string name="pause_prompt_yes" msgid="3564467212025151797">"Da"</string>
<string name="pause_prompt_no" msgid="6686238803236884877">"Nu"</string>
<string name="wild_prompt_str" msgid="5543521676355533577">"Înlocuiţi metacaracterul cu"</string>
@@ -458,13 +458,15 @@
<string name="onscreenMergeCallsText" msgid="6640195098064538950">"Îmbinaţi apelurile"</string>
<string name="onscreenSwapCallsText" msgid="1602990689244030047">"Schimbaţi"</string>
<string name="onscreenManageCallsText" msgid="5473231160123254154">"Gestionați apelurile"</string>
- <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Gestion. conferinţa"</string>
+ <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Gestion. conferința"</string>
<string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
<string name="onscreenVideoCallText" msgid="4800924186056115442">"Apel video"</string>
<string name="importSimEntry" msgid="6614358325359736031">"Importaţi"</string>
<string name="importAllSimEntries" msgid="1503181169636198673">"Importaţi-le pe toate"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Se importă persoanele din agenda de pe cardul SIM"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Importaţi din Agendă"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Persoana de contact a fost importată"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Persoana de contact nu a fost importată"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Asistenţă auditivă"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Activați compatibilitatea cu asistenţa auditivă"</string>
<string-array name="tty_mode_entries">
@@ -535,8 +537,8 @@
<string name="selectContact" msgid="781975788478987237">"selectarea unei persoane din agendă"</string>
<string name="not_voice_capable" msgid="2739898841461577811">"Apelarea vocală nu este acceptată"</string>
<string name="description_dial_button" msgid="7459705245418435351">"apelare"</string>
- <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibraţii"</string>
- <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibraţii"</string>
+ <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrații"</string>
+ <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrații"</string>
<string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Mesagerie vocală vizuală"</string>
<string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Sunet"</string>
<string name="preference_category_ringtone" msgid="5197960752529332721">"Ton de apel și vibrare"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index e0c8bf0..4e52181 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -467,6 +467,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Импортировать все"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Импорт контактов с SIM-карты"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Импортировать из контактов"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Контакт импортирован"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Не удалось импортировать контакт"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Слуховые аппараты"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Включить слуховой аппарат"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 8a5375f..4cd3971 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"සියල්ල ආයාත කරන්න"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"SIM සම්බන්ධතා ආයාත කරමින්"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"සම්බන්ධතා වෙතින් ආයාත කරන්න"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"ආයාත කළ සම්බන්ධතාවය"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"සම්බන්ධතාවය ආයාත කිරීමට නොහැකි විය"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"ඇසීමේ සහාය"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"ඇසීමේ සහාය සඳහා ගැලපීම සක්රිය කරන්න"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 5058f53..15a7d63 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Importovať všetko"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Importovanie kontaktov z SIM karty"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Import z kontaktov"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Kontakt bol importovaný"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Kontakt sa nepodarilo importovať"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Načúvacie pomôcky"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Zapnúť režim kompatibility s načúvacou pomôckou"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 289d22a..5e2aa37 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Uvozi vse"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Uvažanje stikov s kartice SIM"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Uvozi iz stikov"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Uvožen je bil stik"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Uvoz stika ni uspel"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Slušni pripomočki"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Vključi združljivost slušnega pripomočka"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index ffcaa77..cd822c7 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Importoji të gjitha"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Po importon kontaktet e kartës SIM"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Importo nga kontaktet"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Kontakti u importua"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Dështoi në importimin e kontaktit"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Aparatet e dëgjimit"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Aktivizo përputhshmërinë e aparateve të dëgjimit"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 081d4dc..1cb7c23 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Увези све"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Увоз SIM контаката"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Увези из контаката"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Контакт је увезен"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Увоз контакта није успео"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Слушни апарат"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Укључи компатибилност са слушним апаратом"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 28423e1..4927a71 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -471,6 +471,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Importera alla"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Importera SIM-kontakter"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Importera från Kontakter"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Importerad kontakt"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Det gick inte att importera kontakter"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Hörapparater"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Aktivera kompatibilitet med hörapparat"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 78668e5..538b4e7 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Leta zote"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Inaleta anwani za SIM"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Ingiza kutoka kwa anwani"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Imeingiza anwani"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Imeshindwa kuingiza anwani"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Vifaa vya kusaidia kusikia"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Washa utangamano wa kifaa cha kusaidia kusikia"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 5845de6..11c3fd5 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"எல்லாவற்றையும் இறக்குமதி செய்"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"சிம் தொடர்புகளிலிருந்து இறக்குமதி செய்கிறது"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"தொடர்புகளிலிருந்து இறக்குமதி செய்"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"தொடர்பு இறக்கப்பட்டது"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"தொடர்பை இறக்க முடியவில்லை"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"கேட்பதற்கான சாதனங்கள்"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"கேட்கும் சாதனத்தின் இணக்கத்தன்மையை இயக்கு"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index a288aaa..eb6cb4b 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"అన్నింటినీ దిగుమతి చేయి"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"SIM పరిచయాలను దిగుమతి చేస్తోంది"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"పరిచయాల నుండి దిగుమతి చేయి"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"పరిచయం దిగుమతి చేయబడింది"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"పరిచయాన్ని దిగుమతి చేయడంలో విఫలమైంది"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"వినికిడి సహాయక సాధనాలు"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"వినికిడి సహాయక సాధనం అనుకూలతను ప్రారంభించండి"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 3851397..50883f9 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"นำเข้าทั้งหมด"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"กำลังนำเข้าสมุดโทรศัพท์ในซิม"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"นำเข้าจากสมุดโทรศัพท์"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"นำเข้ารายชื่อติดต่อแล้ว"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"ไม่สามารถนำเข้ารายชื่อติดต่อ"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"เครื่องช่วยฟัง"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"เปิดการช่วยฟัง"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 6c0cb4f..472214e 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"I-import lahat"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Ini-import ang mga contact sa SIM"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"I-import mula sa mga contact"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Na-import ang contact"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Hindi na-import ang contact"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Mga hearing aid"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"I-on ang compatibility ng hearing aid"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 83506a4..ef11095 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Tümünü içe aktar"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"SIM kişileri içe aktarılıyor"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Kişilerden içe aktar"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Kişi içe aktarıldı"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Kişi içe aktarılamadı"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"İşitme cihazları"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"İşitme cihazı uyumluluğunu aç"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 0a05ae1..4d02928 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Імпорт. всі"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Імпорт контактів SIM-карти"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Імпортув. з контактів"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Імпортований контакт"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Контакт не імпортовано"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Слухові апарати"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Увімкнути функцію НАС"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 8c56db5..86c7cbc 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"سبھی کو درآمد کریں"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"SIM کے رابطے درآمد کر رہا ہے"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"رابطوں سے درآمد کریں"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"درآمد کردہ رابطہ"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"رابطہ درآمد کرنے میں ناکام"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"سماعتی آلات"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"سماعتی آلہ کی ہم آہنگی آن کریں"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 33761d7..ea28e22 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Barchasini import qilish"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"SIM-karta kontaktlarini import qilish"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Kontaktlardan import qilish"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Kontakt import qilindi"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Kontaktni import qilib bo‘lmadi"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Eshitish qurilmalari"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Eshitish qurilmalari bilan ishlash xusisiyatini yoqish"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 58a9d71..48b996b 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Nhập tất cả"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Đang nhập danh bạ trên SIM"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Nhập từ danh bạ"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Đã nhập liên hệ"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Không nhập được liên hệ"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Trợ thính"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Bật khả năng tương thích trợ thính"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index c6d9a6d..3c5f70c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -465,6 +465,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"全部导入"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"正在导入SIM联系人"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"从联系人导入"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"已导入联系人"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"无法导入联系人"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"助听器"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"启用助听器兼容模式"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 0e56fd8..e7243a0 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -471,6 +471,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"全部匯入"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"正在匯入 SIM 通訊錄"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"從通訊錄匯入"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"已匯入聯絡人"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"無法匯入聯絡人"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"助聽器"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"開啟助聽器相容功能"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index c9303b6..b7dce78 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -471,6 +471,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"全部匯入"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"匯入 SIM 聯絡人"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"從聯絡人匯入"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"已匯入聯絡人"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"無法匯入聯絡人"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"助聽器"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"開啟助聽器相容功能"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 9ed908c..40e93d5 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -469,6 +469,8 @@
<string name="importAllSimEntries" msgid="1503181169636198673">"Ngenisa konke"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"Ingenisa othintana nabo be-SIM"</string>
<string name="importToFDNfromContacts" msgid="2130620207013368580">"Ngenisa kothintana nabo"</string>
+ <string name="singleContactImportedMsg" msgid="6868483416182599206">"Ingenise oxhumana naye"</string>
+ <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Yehlulekile ukungenisa oxhumana naye"</string>
<string name="hac_mode_title" msgid="8740268574688743289">"Izinsiza zokuzwa"</string>
<string name="hac_mode_summary" msgid="6833851160514929341">"Vula ikhono lensiza yokuzwa"</string>
<string-array name="tty_mode_entries">
diff --git a/res/values/config.xml b/res/values/config.xml
index 6173499..139fb71 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -140,6 +140,9 @@
<bool name="config_enabled_lte" translatable="false">false</bool>
<!-- Show enabled tdscdma option for device -->
<bool name="config_support_tdscdma" translatable="false">false</bool>
+ <!-- Show enabled tdscdma option for device when connect roaming network -->
+ <string-array name="config_support_tdscdma_roaming_on_networks" translatable="false">
+ </string-array>
<!-- Show cdma auto network mode in (glabal) roaming -->
<!-- DEPRECATED: Use CarrierConfigManager#KEY_SHOW_CDMA_CHOICES_BOOL -->
<bool name="config_show_cdma" translatable="false">false</bool>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d71025d..6886eb1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1040,6 +1040,11 @@
<!-- Import a single contact entry from contacts to the SIM card -->
<string name="importToFDNfromContacts">Import from contacts</string>
+ <!-- Message shown when a single contact is imported from SIM card -->
+ <string name="singleContactImportedMsg">Imported contact</string>
+ <!-- Message shown when a single contact could not be imported from SIM card -->
+ <string name="failedToImportSingleContactMsg">Failed to import contact</string>
+
<!-- Hearing aid settings -->
<string name="hac_mode_title">Hearing aids</string>
<string name="hac_mode_summary">Turn on hearing aid compatibility</string>
diff --git a/sip/res/values-ja/strings.xml b/sip/res/values-ja/strings.xml
index 70d59bf..d9dbc59 100644
--- a/sip/res/values-ja/strings.xml
+++ b/sip/res/values-ja/strings.xml
@@ -33,7 +33,7 @@
<string name="removing_account" msgid="5537351356808985756">"アカウントを削除しています…"</string>
<string name="sip_menu_save" msgid="7882219814563869225">"保存"</string>
<string name="sip_menu_discard" msgid="2350421645423888438">"破棄"</string>
- <string name="alert_dialog_close" msgid="1326011828713435134">"プロフィールを閉じる"</string>
+ <string name="alert_dialog_close" msgid="1326011828713435134">"プロファイルを閉じる"</string>
<string name="alert_dialog_ok" msgid="4752048404605388940">"OK"</string>
<string name="close_profile" msgid="3122414058856309881">"閉じる"</string>
<string name="registration_status_checking_status" msgid="6136793741862200337">"ステータスを確認しています..."</string>
diff --git a/sip/res/values-ro/strings.xml b/sip/res/values-ro/strings.xml
index d900fd8..66ba6d9 100644
--- a/sip/res/values-ro/strings.xml
+++ b/sip/res/values-ro/strings.xml
@@ -57,7 +57,7 @@
<string name="proxy_address_title" msgid="6890163365640631841">"Adresă proxy de ieşire"</string>
<string name="port_title" msgid="6693965912656593862">"Numărul portului"</string>
<string name="transport_title" msgid="889155457465372527">"Tip de transport"</string>
- <string name="send_keepalive_title" msgid="599627072150501159">"Trimiteţi mesaje keep-alive"</string>
+ <string name="send_keepalive_title" msgid="599627072150501159">"Trimiteți mesaje keep-alive"</string>
<string name="advanced_settings" msgid="6622996380747040711">"Setări opţionale"</string>
<string name="auth_username_title" msgid="8262491689004708265">"Nume de utilizator pentru autentificare"</string>
<string name="auth_username_summary" msgid="941160241371436473">"Numele de utilizator folosit pentru autentificare"</string>
diff --git a/sip/src/com/android/services/telephony/sip/SipConnection.java b/sip/src/com/android/services/telephony/sip/SipConnection.java
index e9f8e05..0d8a6f8 100644
--- a/sip/src/com/android/services/telephony/sip/SipConnection.java
+++ b/sip/src/com/android/services/telephony/sip/SipConnection.java
@@ -134,7 +134,14 @@
try {
if (getPhone() != null && getState() == STATE_ACTIVE
&& getPhone().getRingingCall().getState() != Call.State.WAITING) {
- getPhone().switchHoldingAndActive();
+ // Double check with the internal state since a discrepancy in states could mean
+ // that the transactions is already in progress from a previous request.
+ if (mOriginalConnection != null &&
+ mOriginalConnection.getState() == Call.State.ACTIVE) {
+ getPhone().switchHoldingAndActive();
+ } else {
+ log("skipping switch from onHold due to internal state:");
+ }
}
} catch (CallStateException e) {
log("onHold, exception: " + e);
@@ -145,8 +152,16 @@
public void onUnhold() {
if (VERBOSE) log("onUnhold");
try {
- if (getPhone() != null && getState() == STATE_HOLDING) {
- getPhone().switchHoldingAndActive();
+ if (getPhone() != null && getState() == STATE_HOLDING &&
+ getPhone().getForegroundCall().getState() != Call.State.DIALING) {
+ // Double check with the internal state since a discrepancy in states could mean
+ // that the transaction is already in progress from a previous request.
+ if (mOriginalConnection != null &&
+ mOriginalConnection.getState() == Call.State.HOLDING) {
+ getPhone().switchHoldingAndActive();
+ } else {
+ log("skipping switch from onUnHold due to internal state.");
+ }
}
} catch (CallStateException e) {
log("onUnhold, exception: " + e);
diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index 7f0d2b7..aa78204 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -552,7 +552,8 @@
prefSet.removePreference(mButtonEnabledNetworks);
prefSet.removePreference(mLteDataServicePref);
} else if (carrierConfig.getBoolean(CarrierConfigManager
- .KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL)) {
+ .KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL)
+ && !mPhone.getServiceState().getRoaming()) {
prefSet.removePreference(mButtonPreferredNetworkMode);
prefSet.removePreference(mButtonEnabledNetworks);
@@ -626,7 +627,7 @@
mGsmUmtsOptions = null;
}
} else if (phoneType == PhoneConstants.PHONE_TYPE_GSM) {
- if (getResources().getBoolean(R.bool.config_support_tdscdma)) {
+ if (isSupportTdscdma()) {
mButtonEnabledNetworks.setEntries(
R.array.enabled_networks_tdscdma_choices);
mButtonEnabledNetworks.setEntryValues(
@@ -1165,7 +1166,8 @@
case Phone.NT_MODE_LTE_TDSCDMA:
case Phone.NT_MODE_LTE_TDSCDMA_WCDMA:
case Phone.NT_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
- if (getResources().getBoolean(R.bool.config_support_tdscdma)) {
+ case Phone.NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
+ if (isSupportTdscdma()) {
mButtonEnabledNetworks.setValue(
Integer.toString(Phone.NT_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA));
mButtonEnabledNetworks.setSummary(R.string.network_lte);
@@ -1186,22 +1188,6 @@
}
}
break;
- case Phone.NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
- if (isWorldMode()) {
- controlCdmaOptions(true);
- controlGsmOptions(false);
- }
- mButtonEnabledNetworks.setValue(
- Integer.toString(Phone.NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
- if (mPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA ||
- mIsGlobalCdma ||
- isWorldMode()) {
- mButtonEnabledNetworks.setSummary(R.string.network_global);
- } else {
- mButtonEnabledNetworks.setSummary((mShow4GForLTE == true)
- ? R.string.network_4G : R.string.network_lte);
- }
- break;
default:
String errMsg = "Invalid Network Mode (" + NetworkMode + "). Ignore.";
loge(errMsg);
@@ -1300,7 +1286,11 @@
apnExpand.setEnabled(isWorldMode() || enable);
}
if (operatorSelectionExpand != null) {
- operatorSelectionExpand.setEnabled(enable);
+ if (enable) {
+ operatorSelectionExpand.setEnabled(true);
+ } else {
+ prefSet.removePreference(operatorSelectionExpand);
+ }
}
if (carrierSettings != null) {
prefSet.removePreference(carrierSettings);
@@ -1323,4 +1313,22 @@
}
}
+ private boolean isSupportTdscdma() {
+ if (getResources().getBoolean(R.bool.config_support_tdscdma)) {
+ return true;
+ }
+
+ String operatorNumeric = mPhone.getServiceState().getOperatorNumeric();
+ String[] numericArray = getResources().getStringArray(
+ R.array.config_support_tdscdma_roaming_on_networks);
+ if (numericArray.length == 0 || operatorNumeric == null) {
+ return false;
+ }
+ for (String numeric : numericArray) {
+ if (operatorNumeric.equals(numeric)) {
+ return true;
+ }
+ }
+ return false;
+ }
}
diff --git a/src/com/android/phone/NetworkSetting.java b/src/com/android/phone/NetworkSetting.java
index 3d32817..a08bd40 100644
--- a/src/com/android/phone/NetworkSetting.java
+++ b/src/com/android/phone/NetworkSetting.java
@@ -204,7 +204,7 @@
Message msg = mHandler.obtainMessage(EVENT_NETWORK_SELECTION_DONE);
Phone phone = PhoneFactory.getPhone(mPhoneId);
if (phone != null) {
- phone.selectNetworkManually(mNetworkMap.get(selectedCarrier), msg);
+ phone.selectNetworkManually(mNetworkMap.get(selectedCarrier), true, msg);
displayNetworkSeletionInProgress(networkStr);
handled = true;
} else {
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 7e06fdf..64da1a5 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -176,6 +176,19 @@
}
/**
+ * A request object to use for transmitting data to an ICC.
+ */
+ private static final class ManualNetworkSelectionArgument {
+ public OperatorInfo operatorInfo;
+ public boolean persistSelection;
+
+ public ManualNetworkSelectionArgument(OperatorInfo operatorInfo, boolean persistSelection) {
+ this.operatorInfo = operatorInfo;
+ this.persistSelection = persistSelection;
+ }
+ }
+
+ /**
* A request object for use with {@link MainThreadHandler}. Requesters should wait() on the
* request after sending. The main thread will notify the request when it is complete.
*/
@@ -696,10 +709,12 @@
case CMD_SET_NETWORK_SELECTION_MODE_MANUAL:
request = (MainThreadRequest) msg.obj;
- OperatorInfo operator = (OperatorInfo) request.argument;
+ ManualNetworkSelectionArgument selArg =
+ (ManualNetworkSelectionArgument) request.argument;
onCompleted = obtainMessage(EVENT_SET_NETWORK_SELECTION_MODE_MANUAL_DONE,
request);
- getPhoneFromRequest(request).selectNetworkManually(operator, onCompleted);
+ getPhoneFromRequest(request).selectNetworkManually(selArg.operatorInfo,
+ selArg.persistSelection, onCompleted);
break;
case EVENT_SET_NETWORK_SELECTION_MODE_MANUAL_DONE:
@@ -2180,10 +2195,13 @@
* Set the network selection mode to manual with the selected carrier.
*/
@Override
- public boolean setNetworkSelectionModeManual(int subId, OperatorInfo operator) {
+ public boolean setNetworkSelectionModeManual(int subId, OperatorInfo operator,
+ boolean persistSelection) {
enforceModifyPermissionOrCarrierPrivilege();
if (DBG) log("setNetworkSelectionModeManual: subId:" + subId + " operator:" + operator);
- return (Boolean) sendRequest(CMD_SET_NETWORK_SELECTION_MODE_MANUAL, operator, subId);
+ ManualNetworkSelectionArgument arg = new ManualNetworkSelectionArgument(operator,
+ persistSelection);
+ return (Boolean) sendRequest(CMD_SET_NETWORK_SELECTION_MODE_MANUAL, arg, subId);
}
/**
@@ -2730,7 +2748,7 @@
}
/**
- * Besides READ_PHONE_STATE, WRITE_SMS also allows apps to get phone numbers.
+ * Besides READ_PHONE_STATE, WRITE_SMS and READ_SMS also allow apps to get phone numbers.
*/
private boolean canReadPhoneNumber(String callingPackage, String message) {
// Default SMS app can always read it.
@@ -2740,11 +2758,19 @@
}
try {
return canReadPhoneState(callingPackage, message);
- } catch (SecurityException e) {
- // Can be read with READ_SMS too.
- mApp.enforceCallingOrSelfPermission(android.Manifest.permission.READ_SMS, message);
- return mAppOps.noteOp(AppOpsManager.OP_READ_SMS,
- Binder.getCallingUid(), callingPackage) == AppOpsManager.MODE_ALLOWED;
+ } catch (SecurityException readPhoneStateSecurityException) {
+ try {
+ // Can be read with READ_SMS too.
+ mApp.enforceCallingOrSelfPermission(android.Manifest.permission.READ_SMS, message);
+ return mAppOps.noteOp(AppOpsManager.OP_READ_SMS,
+ Binder.getCallingUid(), callingPackage) == AppOpsManager.MODE_ALLOWED;
+ } catch (SecurityException readSmsSecurityException) {
+ // Throw exception with message including both READ_PHONE_STATE and READ_SMS
+ // permissions
+ throw new SecurityException(message + ": Neither user " + Binder.getCallingUid() +
+ " nor current process has " + android.Manifest.permission.READ_PHONE_STATE +
+ " or " + android.Manifest.permission.READ_SMS + ".");
+ }
}
}
diff --git a/src/com/android/phone/SimContacts.java b/src/com/android/phone/SimContacts.java
index 9f7f868..f668917 100644
--- a/src/com/android/phone/SimContacts.java
+++ b/src/com/android/phone/SimContacts.java
@@ -20,8 +20,10 @@
import android.app.ActionBar;
import android.app.ProgressDialog;
import android.content.ContentProviderOperation;
+import android.content.ContentProviderResult;
import android.content.ContentResolver;
import android.content.ContentValues;
+import android.content.Context;
import android.content.DialogInterface;
import android.content.DialogInterface.OnCancelListener;
import android.content.DialogInterface.OnClickListener;
@@ -52,6 +54,7 @@
import android.widget.ListView;
import android.widget.SimpleCursorAdapter;
import android.widget.TextView;
+import android.widget.Toast;
import java.util.ArrayList;
@@ -132,7 +135,7 @@
}
}
- private static void actuallyImportOneSimContact(
+ private static boolean actuallyImportOneSimContact(
final Cursor cursor, final ContentResolver resolver, Account account) {
final NamePhoneTypePair namePhoneTypePair =
new NamePhoneTypePair(cursor.getString(NAME_COLUMN));
@@ -194,20 +197,32 @@
}
try {
- resolver.applyBatch(ContactsContract.AUTHORITY, operationList);
+ final ContentProviderResult[] results = resolver.applyBatch(ContactsContract.AUTHORITY,
+ operationList);
+ return results.length > 0; // Batch operations either all succeed or all fail.
} catch (RemoteException e) {
Log.e(LOG_TAG, String.format("%s: %s", e.toString(), e.getMessage()));
} catch (OperationApplicationException e) {
Log.e(LOG_TAG, String.format("%s: %s", e.toString(), e.getMessage()));
}
+ return false;
}
private void importOneSimContact(int position) {
final ContentResolver resolver = getContentResolver();
+ final Context context = getApplicationContext();
if (mCursor.moveToPosition(position)) {
- actuallyImportOneSimContact(mCursor, resolver, mAccount);
+ if (actuallyImportOneSimContact(mCursor, resolver, mAccount)){
+ Toast.makeText(context, R.string.singleContactImportedMsg, Toast.LENGTH_SHORT)
+ .show();
+ } else {
+ Toast.makeText(context, R.string.failedToImportSingleContactMsg, Toast.LENGTH_SHORT)
+ .show();
+ }
} else {
Log.e(LOG_TAG, "Failed to move the cursor to the position \"" + position + "\"");
+ Toast.makeText(context, R.string.failedToImportSingleContactMsg, Toast.LENGTH_SHORT)
+ .show();
}
}
diff --git a/src/com/android/phone/vvm/omtp/SimChangeReceiver.java b/src/com/android/phone/vvm/omtp/SimChangeReceiver.java
index a3255e3..4e7c165 100644
--- a/src/com/android/phone/vvm/omtp/SimChangeReceiver.java
+++ b/src/com/android/phone/vvm/omtp/SimChangeReceiver.java
@@ -67,9 +67,14 @@
case CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED:
int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+
+ if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+ Log.i(TAG, "Received SIM change for invalid subscription id.");
+ return;
+ }
+
OmtpVvmCarrierConfigHelper carrierConfigHelper =
new OmtpVvmCarrierConfigHelper(context, subId);
-
if (carrierConfigHelper.isOmtpVvmType()) {
PhoneAccountHandle phoneAccount = PhoneUtils.makePstnPhoneAccountHandle(
SubscriptionManager.getPhoneId(subId));
diff --git a/src/com/android/services/telephony/CdmaConnection.java b/src/com/android/services/telephony/CdmaConnection.java
index d13f66f..7d88234 100644
--- a/src/com/android/services/telephony/CdmaConnection.java
+++ b/src/com/android/services/telephony/CdmaConnection.java
@@ -77,8 +77,9 @@
Connection connection,
EmergencyTonePlayer emergencyTonePlayer,
boolean allowMute,
- boolean isOutgoing) {
- super(connection);
+ boolean isOutgoing,
+ String telecomCallId) {
+ super(connection, telecomCallId);
mEmergencyTonePlayer = emergencyTonePlayer;
mAllowMute = allowMute;
mIsOutgoing = isOutgoing;
@@ -145,7 +146,7 @@
@Override
public TelephonyConnection cloneConnection() {
CdmaConnection cdmaConnection = new CdmaConnection(getOriginalConnection(),
- mEmergencyTonePlayer, mAllowMute, mIsOutgoing);
+ mEmergencyTonePlayer, mAllowMute, mIsOutgoing, getTelecomCallId());
return cdmaConnection;
}
@@ -190,9 +191,9 @@
void forceAsDialing(boolean isDialing) {
if (isDialing) {
- setDialing();
+ setStateOverride(Call.State.DIALING);
} else {
- updateState(true);
+ resetStateOverride();
}
}
diff --git a/src/com/android/services/telephony/ConferenceParticipantConnection.java b/src/com/android/services/telephony/ConferenceParticipantConnection.java
index 4e7546d..78f9ca3 100644
--- a/src/com/android/services/telephony/ConferenceParticipantConnection.java
+++ b/src/com/android/services/telephony/ConferenceParticipantConnection.java
@@ -16,6 +16,7 @@
package com.android.services.telephony;
+import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneConstants;
import android.net.Uri;
@@ -23,6 +24,8 @@
import android.telecom.ConferenceParticipant;
import android.telecom.DisconnectCause;
import android.telecom.PhoneAccount;
+import android.telephony.PhoneNumberUtils;
+import android.telephony.SubscriptionInfo;
import android.text.TextUtils;
/**
@@ -60,12 +63,14 @@
ConferenceParticipant participant) {
mParentConnection = parentConnection;
+
int presentation = getParticipantPresentation(participant);
Uri address;
if (presentation != PhoneConstants.PRESENTATION_ALLOWED) {
address = null;
} else {
- address = getParticipantAddress(participant);
+ String countryIso = getCountryIso(parentConnection.getCall().getPhone());
+ address = getParticipantAddress(participant, countryIso);
}
setAddress(address, presentation);
setCallerDisplayName(participant.getDisplayName(), presentation);
@@ -197,9 +202,11 @@
* format into a typical tel: style URI.
*
* @param participant The conference participant.
+ * @param countryIso The country ISO of the current subscription; used when formatting the
+ * participant phone number to E.164 format.
* @return The participant's address URI.
*/
- private Uri getParticipantAddress(ConferenceParticipant participant) {
+ private Uri getParticipantAddress(ConferenceParticipant participant, String countryIso) {
Uri address = participant.getHandle();
if (address == null) {
return address;
@@ -233,7 +240,44 @@
}
number = numberParts[0];
- return Uri.fromParts(PhoneAccount.SCHEME_TEL, number, null);
+ // Attempt to format the number in E.164 format and use that as part of the TEL URI.
+ // RFC2806 recommends to format telephone numbers using E.164 since it is independent of
+ // how the dialing of said numbers takes place.
+ // If conversion to E.164 fails, the returned value is null. In that case, fallback to the
+ // number which was in the CEP data.
+ String formattedNumber = null;
+ if (!TextUtils.isEmpty(countryIso)) {
+ formattedNumber = PhoneNumberUtils.formatNumberToE164(number, countryIso);
+ }
+
+ return Uri.fromParts(PhoneAccount.SCHEME_TEL,
+ formattedNumber != null ? formattedNumber : number, null);
+ }
+
+ /**
+ * Given a {@link Phone} instance, determines the country ISO associated with the phone's
+ * subscription.
+ *
+ * @param phone The phone instance.
+ * @return The country ISO.
+ */
+ private String getCountryIso(Phone phone) {
+ if (phone == null) {
+ return null;
+ }
+
+ int subId = phone.getSubId();
+
+ SubscriptionInfo subInfo = TelecomAccountRegistry.getInstance(null).
+ getSubscriptionManager().getActiveSubscriptionInfo(subId);
+
+ if (subInfo == null) {
+ return null;
+ }
+ // The SubscriptionInfo reports ISO country codes in lower case. Convert to upper case,
+ // since ultimately we use this ISO when formatting the CEP phone number, and the phone
+ // number formatting library expects uppercase ISO country codes.
+ return subInfo.getCountryIso().toUpperCase();
}
/**
diff --git a/src/com/android/services/telephony/GsmConnection.java b/src/com/android/services/telephony/GsmConnection.java
index 1273c60..4bd7a32 100644
--- a/src/com/android/services/telephony/GsmConnection.java
+++ b/src/com/android/services/telephony/GsmConnection.java
@@ -22,8 +22,8 @@
* Manages a single phone call handled by GSM.
*/
final class GsmConnection extends TelephonyConnection {
- GsmConnection(Connection connection) {
- super(connection);
+ GsmConnection(Connection connection, String telecomCallId) {
+ super(connection, telecomCallId);
}
/**
@@ -35,7 +35,8 @@
*/
@Override
public TelephonyConnection cloneConnection() {
- GsmConnection gsmConnection = new GsmConnection(getOriginalConnection());
+ GsmConnection gsmConnection = new GsmConnection(getOriginalConnection(),
+ getTelecomCallId());
return gsmConnection;
}
diff --git a/src/com/android/services/telephony/ImsConference.java b/src/com/android/services/telephony/ImsConference.java
index c7c6e92..30e7a94 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -780,7 +780,7 @@
PhoneAccountHandle phoneAccountHandle =
PhoneUtils.makePstnPhoneAccountHandle(mConferenceHost.getPhone());
if (mConferenceHost.getPhone().getPhoneType() == PhoneConstants.PHONE_TYPE_GSM) {
- GsmConnection c = new GsmConnection(originalConnection);
+ GsmConnection c = new GsmConnection(originalConnection, getTelecomCallId());
c.updateState();
// Copy the connect time from the conferenceHost
c.setConnectTimeMillis(mConferenceHost.getConnectTimeMillis());
@@ -866,6 +866,8 @@
StringBuilder sb = new StringBuilder();
sb.append("[ImsConference objId:");
sb.append(System.identityHashCode(this));
+ sb.append(" telecomCallID:");
+ sb.append(getTelecomCallId());
sb.append(" state:");
sb.append(Connection.stateToString(getState()));
sb.append(" hostConnection:");
diff --git a/src/com/android/services/telephony/ImsConferenceController.java b/src/com/android/services/telephony/ImsConferenceController.java
index 7c45657..d0b1c49 100644
--- a/src/com/android/services/telephony/ImsConferenceController.java
+++ b/src/com/android/services/telephony/ImsConferenceController.java
@@ -327,6 +327,7 @@
conference.addListener(mConferenceListener);
conference.updateConferenceParticipantsAfterCreation();
mConnectionService.addConference(conference);
+ conferenceHostConnection.setTelecomCallId(conference.getTelecomCallId());
// Cleanup TelephonyConnection which backed the original connection and remove from telecom.
// Use the "Other" disconnect cause to ensure the call is logged to the call log but the
diff --git a/src/com/android/services/telephony/TelecomAccountRegistry.java b/src/com/android/services/telephony/TelecomAccountRegistry.java
index 154fc33..4f8a20f 100644
--- a/src/com/android/services/telephony/TelecomAccountRegistry.java
+++ b/src/com/android/services/telephony/TelecomAccountRegistry.java
@@ -363,6 +363,13 @@
}
/**
+ * @return Reference to the {@code TelecomAccountRegistry}'s subscription manager.
+ */
+ SubscriptionManager getSubscriptionManager() {
+ return mSubscriptionManager;
+ }
+
+ /**
* Returns the address (e.g. the phone number) associated with a subscription.
*
* @param handle The phone account handle to find the subscription address for.
diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 95c2c59..996b938 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -318,8 +318,11 @@
};
private com.android.internal.telephony.Connection mOriginalConnection;
- private Call.State mOriginalConnectionState = Call.State.IDLE;
+ private Call.State mConnectionState = Call.State.IDLE;
private Bundle mOriginalConnectionExtras = new Bundle();
+ private boolean mIsStateOverridden = false;
+ private Call.State mOriginalConnectionState = Call.State.IDLE;
+ private Call.State mConnectionOverriddenState = Call.State.IDLE;
private boolean mWasImsConnection;
@@ -378,7 +381,9 @@
private final Set<TelephonyConnectionListener> mTelephonyListeners = Collections.newSetFromMap(
new ConcurrentHashMap<TelephonyConnectionListener, Boolean>(8, 0.9f, 1));
- protected TelephonyConnection(com.android.internal.telephony.Connection originalConnection) {
+ protected TelephonyConnection(com.android.internal.telephony.Connection originalConnection,
+ String callId) {
+ setTelecomCallId(callId);
if (originalConnection != null) {
setOriginalConnection(originalConnection);
}
@@ -493,7 +498,7 @@
Log.v(this, "performHold");
// TODO: Can dialing calls be put on hold as well since they take up the
// foreground call slot?
- if (Call.State.ACTIVE == mOriginalConnectionState) {
+ if (Call.State.ACTIVE == mConnectionState) {
Log.v(this, "Holding active call");
try {
Phone phone = mOriginalConnection.getCall().getPhone();
@@ -524,7 +529,7 @@
public void performUnhold() {
Log.v(this, "performUnhold");
- if (Call.State.HOLDING == mOriginalConnectionState) {
+ if (Call.State.HOLDING == mConnectionState) {
try {
// Here's the deal--Telephony hold/unhold is weird because whenever there exists
// more than one call, one of them must always be active. In other words, if you
@@ -645,6 +650,7 @@
clearOriginalConnection();
mOriginalConnectionExtras.clear();
mOriginalConnection = originalConnection;
+ mOriginalConnection.setTelecomCallId(getTelecomCallId());
getPhone().registerForPreciseCallStateChanged(
mHandler, MSG_PRECISE_CALL_STATE_CHANGED, null);
getPhone().registerForHandoverStateChanged(
@@ -863,19 +869,32 @@
return true;
}
- void updateState() {
- updateState(false);
+ void setStateOverride(Call.State state) {
+ mIsStateOverridden = true;
+ mConnectionOverriddenState = state;
+ // Need to keep track of the original connection's state before override.
+ mOriginalConnectionState = mOriginalConnection.getState();
+ updateStateInternal();
}
- void updateState(boolean force) {
- if (mOriginalConnection == null) {
- return;
- }
+ void resetStateOverride() {
+ mIsStateOverridden = false;
+ updateStateInternal();
+ }
- Call.State newState = mOriginalConnection.getState();
- Log.v(this, "Update state from %s to %s for %s", mOriginalConnectionState, newState, this);
- if (mOriginalConnectionState != newState || force) {
- mOriginalConnectionState = newState;
+ void updateStateInternal() {
+ Call.State newState;
+ // If the state is overridden and the state of the original connection hasn't changed since,
+ // then we continue in the overridden state, else we go to the original connection's state.
+ if (mIsStateOverridden && mOriginalConnectionState == mOriginalConnection.getState()) {
+ newState = mConnectionOverriddenState;
+ } else {
+ newState = mOriginalConnection.getState();
+ }
+ Log.v(this, "Update state from %s to %s for %s", mConnectionState, newState, this);
+
+ if (mConnectionState != newState) {
+ mConnectionState = newState;
switch (newState) {
case IDLE:
break;
@@ -903,6 +922,14 @@
break;
}
}
+ }
+
+ void updateState() {
+ if (mOriginalConnection == null) {
+ return;
+ }
+
+ updateStateInternal();
updateStatusHints();
updateConnectionCapabilities();
updateAddress();
@@ -1075,15 +1102,13 @@
void resetStateForConference() {
if (getState() == Connection.STATE_HOLDING) {
- if (mOriginalConnection.getState() == Call.State.ACTIVE) {
- setActive();
- }
+ resetStateOverride();
}
}
boolean setHoldingForConference() {
if (getState() == Connection.STATE_ACTIVE) {
- setOnHold();
+ setStateOverride(Call.State.HOLDING);
return true;
}
return false;
@@ -1242,6 +1267,8 @@
StringBuilder sb = new StringBuilder();
sb.append("[TelephonyConnection objId:");
sb.append(System.identityHashCode(this));
+ sb.append(" telecomCallID:");
+ sb.append(getTelecomCallId());
sb.append(" type:");
if (isImsConnection()) {
sb.append("ims");
diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index a14a884..d28239e 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -278,7 +278,8 @@
}
final TelephonyConnection connection =
- createConnectionFor(phone, null, true /* isOutgoing */, request.getAccountHandle());
+ createConnectionFor(phone, null, true /* isOutgoing */, request.getAccountHandle(),
+ request.getTelecomCallId());
if (connection == null) {
return Connection.createFailedConnection(
DisconnectCauseUtil.toTelecomDisconnectCause(
@@ -353,7 +354,7 @@
Connection connection =
createConnectionFor(phone, originalConnection, false /* isOutgoing */,
- request.getAccountHandle());
+ request.getAccountHandle(), request.getTelecomCallId());
if (connection == null) {
return Connection.createCanceledConnection();
} else {
@@ -419,7 +420,7 @@
TelephonyConnection connection =
createConnectionFor(phone, unknownConnection,
!unknownConnection.isIncoming() /* isOutgoing */,
- request.getAccountHandle());
+ request.getAccountHandle(), request.getTelecomCallId());
if (connection == null) {
return Connection.createCanceledConnection();
@@ -481,15 +482,16 @@
Phone phone,
com.android.internal.telephony.Connection originalConnection,
boolean isOutgoing,
- PhoneAccountHandle phoneAccountHandle) {
+ PhoneAccountHandle phoneAccountHandle,
+ String telecomCallId) {
TelephonyConnection returnConnection = null;
int phoneType = phone.getPhoneType();
if (phoneType == TelephonyManager.PHONE_TYPE_GSM) {
- returnConnection = new GsmConnection(originalConnection);
+ returnConnection = new GsmConnection(originalConnection, telecomCallId);
} else if (phoneType == TelephonyManager.PHONE_TYPE_CDMA) {
boolean allowMute = allowMute(phone);
returnConnection = new CdmaConnection(
- originalConnection, mEmergencyTonePlayer, allowMute, isOutgoing);
+ originalConnection, mEmergencyTonePlayer, allowMute, isOutgoing, telecomCallId);
}
if (returnConnection != null) {
// Listen to Telephony specific callbacks from the connection