Merge changes from topic "presubmit-am-3dd8456477cc4638bd44cc60d1a43b48" into sc-mainline-prod am: a9464df35c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/16102861
Change-Id: I8509bde4cb568737027da384a3252d4a5ed5b267
diff --git a/Android.bp b/Android.bp
index 5eb8765..0649958 100644
--- a/Android.bp
+++ b/Android.bp
@@ -40,6 +40,7 @@
"voip-common",
"ims-common",
"libprotobuf-java-lite",
+ "app-compat-annotations",
"unsupportedappusage",
"org.apache.http.legacy",
],
@@ -97,3 +98,8 @@
type: "lite",
},
}
+
+platform_compat_config {
+ name: "TeleService-platform-compat-config",
+ src: ":TeleService",
+}
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 86f72bc..09947f4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -147,7 +147,6 @@
<uses-permission android:name="android.permission.WRITE_SMS" />
<uses-permission android:name="android.permission.SEND_SMS" />
<uses-permission android:name="android.permission.SEND_RESPOND_VIA_MESSAGE" />
- <uses-permission android:name="android.permission.SET_TIME_ZONE" />
<uses-permission android:name="android.permission.SUGGEST_TELEPHONY_TIME_AND_ZONE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
@@ -156,7 +155,6 @@
<uses-permission android:name="android.permission.DEVICE_POWER" />
<uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
<uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.WRITE_APN_SETTINGS" />
@@ -189,8 +187,6 @@
<uses-permission android:name="android.permission.REGISTER_SIM_SUBSCRIPTION" />
<uses-permission android:name="android.permission.BIND_IMS_SERVICE" />
<uses-permission android:name="android.permission.BIND_CARRIER_SERVICES" />
- <!-- BIND_CARRIER_MESSAGING_SERVICE has been deprecated in favor of BIND_CARRIER_SERVICES. -->
- <uses-permission android:name="android.permission.BIND_CARRIER_MESSAGING_SERVICE" />
<uses-permission android:name="android.permission.BIND_EUICC_SERVICE" />
<uses-permission android:name="android.permission.BIND_TELEPHONY_NETWORK_SERVICE" />
<uses-permission android:name="android.permission.BIND_CELL_BROADCAST_SERVICE" />
@@ -235,6 +231,9 @@
<uses-permission android:name="android.permission.MANAGE_SUBSCRIPTION_PLANS"/>
<uses-permission android:name="android.permission.OBSERVE_ROLE_HOLDERS"/>
<uses-permission android:name="android.permission.BIND_GBA_SERVICE"/>
+ <!-- Permissions required for reading and logging compat changes -->
+ <uses-permission android:name="android.permission.LOG_COMPAT_CHANGE"/>
+ <uses-permission android:name="android.permission.READ_COMPAT_CHANGE_CONFIG"/>
<!-- Needed to listen to changes in projection state. -->
<uses-permission android:name="android.permission.READ_PROJECTION_STATE"/>
@@ -436,8 +435,7 @@
android:configChanges="orientation|screenSize|keyboardHidden"
android:exported="true"
android:theme="@style/DialerSettingsLight">
- <intent-filter>
- <action android:name="android.intent.action.VIEW" />
+ <intent-filter android:priority="1">
<action android:name="android.intent.action.MAIN" />
<action android:name="android.telecom.action.SHOW_CALL_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
diff --git a/OWNERS b/OWNERS
index 1ea2d9e..b4ef543 100644
--- a/OWNERS
+++ b/OWNERS
@@ -6,12 +6,12 @@
tgunn@google.com
jminjie@google.com
shuoq@google.com
-nazaninb@google.com
sarahchin@google.com
xiaotonj@google.com
huiwang@google.com
jayachandranc@google.com
chinmayd@google.com
amruthr@google.com
+sasindran@google.com
per-file *SimPhonebookProvider* = file:platform/packages/apps/Contacts:/OWNERS
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 75b9d49..3831b6b 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -10,6 +10,38 @@
},
{
"name": "CarrierAppIntegrationTestCases"
+ },
+ {
+ "name": "CtsSimRestrictedApisTestCases",
+ "options": [
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
+ },
+ {
+ "name": "CtsTelephony2TestCases",
+ "options": [
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
+ },
+ {
+ "name": "CtsTelephony3TestCases",
+ "options": [
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
+ },
+ {
+ "name": "CtsTelephonyProviderTestCases",
+ "options": [
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
}
]
}
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 76b13c6..1ca5708 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Kan nie \'n oproep maak nie, aangesien \'n ander uitgaande oproep reeds besig is om te skakel."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Kan nie \'n oproep maak nie, aangesien daar \'n onbeantwoorde inkomende oproep is. Beantwoord of weier die inkomende oproep voordat jy \'n nuwe oproep plaas."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Kan nie \'n oproep maak nie, aangesien oproepmaking gedeaktiveer is deur die ro.telephony.disable-belstelseleienskap te gebruik."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Kan nie \'n oproep maak nie, aangesien daar reeds twee oproepe aan die gang is. Ontkoppel een van die oproepe of voeg dit saam in \'n konferensie voordat \'n nuwe oproep gemaak word."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Kan nie ’n oproep maak nie, aangesien twee oproepe reeds aan die gang is. Ontkoppel een van die oproepe of voeg dit saam in ’n konferensie voordat ’n nuwe oproep gemaak word."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Om <xliff:g id="SUPP_SERVICE">%s</xliff:g> te gebruik, maak seker dat mobiele data aangeskakel is. Jy kan dit in selnetwerk-instellings verander."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Om <xliff:g id="SUPP_SERVICE">%s</xliff:g> te gebruik, maak seker dat mobiele data en dataswerwing aangeskakel is. Jy kan dit in selnetwerk-instellings verander."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Om <xliff:g id="SUPP_SERVICE">%1$s</xliff:g> te gebruik, maak seker dat mobiele data vir SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g> aangeskakel is. Jy kan dit in selnetwerk-instellings verander."</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index a808559..c618ce7 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"ሊላ ወጪ ጥሪ እየደወለ ስለሆነ ጥሪ ማድረግ አይቻልም።"</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"ያልተመለሰ ገቢ ጥሪ ስላለ ጥሪ ማድረግ አይቻልም። አዲስ ጥሪ ከማድረግዎ በፊት ገቢውን ጥሪ ይመልሱ ወይም ይዝጉ።"</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"ጥሪ ማድረግ አይቻልም ምክንያቱም ጥሪ ማድረግ በ ro.telephony.disable-call የስርዓት ባህሪ ተሰናክልሏል።"</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"ጥሪ ማድረግ አይቻልም ምክንያቱም ቀድሞ ሁለት ጥሪዎች በሂደት ላይ ናቸው። አዲስ ጥሪ ከማድረግዎ በፊት ከጥሪዎቹ አንዱን ያቋርጡ ወይም ወደ ጉባዔ ይቀይሯችው።"</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"ጥሪ ማድረግ አይቻልም ምክንያቱም አስቀድሞ ሁለት ጥሪዎች በሂደት ላይ ናቸው። አዲስ ጥሪ ከማድረግዎ በፊት ከጥሪዎቹ አንዱን ያቋርጡ ወይም ወደ ጉባዔ ያዋህዷቸው።"</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"<xliff:g id="SUPP_SERVICE">%s</xliff:g>ን ለመጠቀም፣ ሞባይል ውሂብ መብራቱን ያረጋግጡ። ይህን በሞባይል አውታረመረብ ቅንብሮች ውስጥ መለወጥ ይችላሉ።"</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"<xliff:g id="SUPP_SERVICE">%s</xliff:g>ን ለመጠቀም፣ ሞባይል ውሂብ እና የውሂብ ዝውውር መብራታቸውን ያረጋግጡ። እነዚህን በ ሞባይል አውታረመረብ ቅንብሮች ውስጥ መለወጥ ይችላሉ።"</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g> ን ለመጠቀም ሞባይል ውሂብ ለ ሲም <xliff:g id="SIM_NUMBER">%2$d</xliff:g> መብራቱን ያረጋግጡ። ይህን በሞባይል አውታረመረብ ቅንብሮች ውስጥ መለወጥ ይችላሉ።"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 21a540f..f92cf52 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -839,7 +839,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"لا يمكن إجراء مكالمة لأنّ هناك مكالمة صادرة أخرى تجري بالفعل."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"لا يمكن إجراء مكالمة لأنّ هناك مكالمة واردة لم يتم الرد عليها. يُرجى الرد على المكالمة الواردة أو رفضها قبل إجراء مكالمة جديدة."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"لا يمكن إجراء مكالمة لأنّه قد تم إيقاف وظيفة الاتصال باستخدام ميزة النظام ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"لا يمكن إجراء مكالمة لأنّ هناك مكالمتين قيد التقدّم بالفعل. يمكنك إنهاء إحدى المكالمتين أو دمجهما في مكالمة جماعية قبل إجراء مكالمة جديدة."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"لا يمكن إجراء مكالمة لأنّ هناك مكالمتين جاريتين حاليًا. يمكنك إنهاء إحدى المكالمتين أو دمجهما في مكالمة جماعية قبل إجراء مكالمة جديدة."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"لاستخدام <xliff:g id="SUPP_SERVICE">%s</xliff:g>، تأكّد من تفعيل بيانات الجوّال. يمكنك تغيير هذا الإعداد في إعدادات شبكة الجوّال."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"لاستخدام <xliff:g id="SUPP_SERVICE">%s</xliff:g>، تأكّد من تفعيل بيانات الجوّال وتجوال البيانات. يمكنك تغيير هذين الإعدادين في إعدادات شبكة الجوّال."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"لاستخدام <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>، تأكّد من تفعيل بيانات الجوّال لشريحة SIM رقم <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. يمكنك تغيير هذا الإعداد في إعدادات شبكة الجوّال."</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 607be68..8c257f3 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"অইন এটা বহিৰ্গামী কল ডায়েল কৰি থকাৰ কাৰণে বেলেগ কল কৰিব নোৱাৰি।"</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"বেলেগ কল কৰিব নোৱাৰি, কাৰণ এটা অন্তৰ্গামী কল এতিয়াও সক্ৰিয় হৈ আছে যাৰ উত্তৰ দিয়া হোৱা নাই। নতুন কল এটা কৰাৰ আগেয়ে সেই কলটোৰ উত্তৰ দিয়ক বা কলটো প্ৰত্যাখ্যান কৰক।"</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"কোনো কল কৰিব নোৱাৰি কাৰণ ro.telephony.disable-call ছিষ্টেম প্ৰ’পাৰ্টি ব্যৱহাৰ কৰি কল কৰাৰ সুবিধা অক্ষম কৰা হৈছে।"</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"কোনো কল কৰিব নোৱাৰি কাৰণ ইতিমধ্যে দুটা বেলেগ কল চলি আছে। নতুন এটা কল কৰাৰ আগেয়ে সেই দুটাৰ ভিতৰত এটাৰ সংযোগ বিচ্ছিন্ন কৰক বা কল দুটা একত্ৰিত কৰি এটা কনফাৰেন্স কললৈ সলনি কৰক।"</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"কল কৰিব নোৱাৰি, কাৰণ ইতিমধ্যে দুটা কল চলি আছে। এটা নতুন কল কৰাৰ আগতে সেই দুটা কলৰ এটাৰ সংযোগ বিচ্ছিন্ন কৰক অথবা কল দুটা একত্ৰিত কৰি এটা কনফাৰেন্স কললৈ সলনি কৰক।"</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> ব্যৱহাৰ কৰিবলৈ ম’বাইল ডেটা অন হৈ থকাটো নিশ্চিত কৰক। আপুনি ম’বাইল নেটৱৰ্ক ছেটিংসমূহ-লৈ গৈ ইয়াক সলনি কৰিব পাৰে।"</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> ব্যৱহাৰ কৰিবলৈ ম’বাইল ডেটা আৰু ডেটা ৰ’মিং অন হৈ থকাটো নিশ্চিত কৰক। আপুনি ম’বাইল নেটৱৰ্ক ছেটিংসমূহ-লৈ গৈ ইয়াক সলনি কৰিব পাৰে।"</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g> ব্যৱহাৰ কৰিবলৈ <xliff:g id="SIM_NUMBER">%2$d</xliff:g> ছিমত ম’বাইল ডেটা অন হৈ থকাটো নিশ্চিত কৰক। আপুনি ম’বাইল নেটৱৰ্ক ছেটিংসমূহ-লৈ গৈ ইয়াক সলনি কৰিব পাৰে।"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 5ec4dc5..9bd6029 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Başqa gedən zəngin nömrəsi yığıldığına görə zəng etmək mümkün deyil."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Cavabsız gələn zəng olduğuna görə zəng etmək mümkün deyil. Yeni zəng etməzdən əvvəl gələn zəngə cavab verin və ya imtina edin."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Zəng ro.telephony.disable-call sistem funksiyası ilə deaktiv edildiyinə görə zəng etmək mümkün deyil."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Davam edən iki zəng olduğuna görə zəng etmək mümkün deyil. Zənglərin birini kəsin və ya yeni zəng etməzdən əvvəl onları konfransa birləşdirin."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Davam edən iki zəng olduğuna görə zəng etmək mümkün deyil. Yeni zəng etməzdən əvvəl zənglərin birini dayandırın və ya onları konfransa birləşdirin."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> istifadə etmək üçün mobil datanın aktiv olduğundan əmin olun. Bunu mobil şəbəkə ayarlarında dəyişə bilərsiniz."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> istifadə etmək üçün mobil data və data rouminqin aktiv olduğundan əmin olun. Bunu mobil şəbəkə ayarlarında dəyişə bilərsiniz."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g> istifadə etmək üçün <xliff:g id="SIM_NUMBER">%2$d</xliff:g> SIM nömrəsində mobil datanın aktiv olduğundan əmin olun. Bunu mobil şəbəkə ayarlarında dəyişə bilərsiniz."</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index bf39f18..5941826 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -830,7 +830,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Ne možete da pozovete jer se već upućuje drugi odlazni poziv."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Ne možete da pozovete jer imate dolazni poziv na koji niste odgovorili. Odgovorite na dolazni poziv ili ga odbijte pre upućivanja novog poziva."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Ne možete da pozovete jer je pozivanje onemogućeno preko svojstva sistema ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Ne možete da pozovete jer su dva poziva već u toku. Prekinite jedan od poziva ili ih objedinite u konferenciju da biste uputili novi poziv."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Ne možete da pozovete jer su dva poziva već u toku. Prekinite jedan od njih ili ih objedinite u konferenciju da biste uputili novi poziv."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Da biste koristili <xliff:g id="SUPP_SERVICE">%s</xliff:g>, uverite se da su uključeni mobilni podaci. To možete da promenite u podešavanjima mobilne mreže."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Da biste koristili <xliff:g id="SUPP_SERVICE">%s</xliff:g>, uverite se da su uključeni mobilni podaci i prenos podataka u romingu. To možete da promenite u podešavanjima mobilne mreže."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Da biste koristili <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, uverite se da su za SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g> uključeni mobilni podaci. To možete da promenite u podešavanjima mobilne mreže."</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 6674bee..c69ca07 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -833,7 +833,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Немагчыма зрабіць выклік, паколькі зараз ідзе выходны выклік."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Нельга зрабіць выклік, паколькі ёсць уваходны выклік без адказу. Адкажыце на ўваходны выклік або адхіліце яго, каб зрабіць новы."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Немагчыма зрабіць выклік, паколькі выклікі адключаны ў сістэмных наладах ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Немагчыма зрабіць выклік, паколькі зараз выконваюцца два выклікі. Адключыце адзін з выклікаў або аб\'яднайце іх у канферэнцыю, каб зрабіць новы выклік."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Немагчыма зрабіць новы выклік, бо ўжо выконваюцца два іншыя. Каб зрабіць новы выклік, завяршыце адзін з бягучых ці аб\'яднайце іх у канферэнц-выклік."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Уключыце перадачу мабільных даных для выкарыстання сэрвісу <xliff:g id="SUPP_SERVICE">%s</xliff:g>. Гэта можна зрабіць у наладах мабільнай сеткі."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Уключыце перадачу мабільных даных і інтэрнэт-роўмінг для выкарыстання сэрвісу <xliff:g id="SUPP_SERVICE">%s</xliff:g>. Гэта можна зрабіць у наладах мабільнай сеткі."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Уключыце перадачу мабільных даных на SIM-карце <xliff:g id="SIM_NUMBER">%2$d</xliff:g> для выкарыстання сэрвісу <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>. Гэта можна зрабіць у наладах мабільнай сеткі."</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 216c789..378645b 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Не може да се извърши обаждане, тъй като в момента се набира друго изходящо обаждане."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Не може да се извърши обаждане, тъй като има неотговорено входящо обаждане. Отговорете му или го отхвърлете, преди да извършите ново обаждане."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Не може да се извърши обаждане, тъй като обажданията са деактивирани чрез системното свойство ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Не може да се извърши обаждане, тъй като вече се провеждат две обаждания. Прекъснете едно от тях или ги обединете в конферентен разговор, преди да извършите ново обаждане."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Не може да се извърши обаждане, тъй като вече се провеждат две обаждания. Прекъснете едно от тях или ги обединете в конферентен разговор, преди да извършите ново обаждане."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"За да използвате <xliff:g id="SUPP_SERVICE">%s</xliff:g>, мобилните данни трябва да са включени. Можете да промените това в настройките за мобилната мрежа."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"За да използвате <xliff:g id="SUPP_SERVICE">%s</xliff:g>, мобилните данни и роумингът на данни трябва да са включени. Можете да промените това в настройките за мобилната мрежа."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"За да използвате <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, мобилните данни за SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g> трябва да са включени. Можете да промените това в настройките за мобилната мрежа."</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 81a2b33..2da6d3e 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"আপনি আগেই আউটগোয়িং কল ডায়াল করেছেন তাই অন্য কল করা যাবে না।"</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"কল করতে পারবেন না কারণ এমন একটি ইনকামিং কল আছে যার উত্তর দেওয়া হয়নি। নতুন কল করতে বর্তমান কলটির উত্তর দিন অথবা প্রত্যাখান করুন।"</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"\'ro.telephony কল বন্ধ করা সিস্টেম প্রপার্টি\' ব্যবহার করে কল বন্ধ করা হয়েছে তাই কল করা যাবে না।"</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"আগে থেকেই দুটি কল চলছে তাই কল করা যাবে না। নতুন কল করতে একটি কল বন্ধ করুন অথবা কনফারেন্স কলে মার্জ করুন।"</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"দুটি কল চলছে, তাই আরেকটি কল করা যাচ্ছে না। নতুন কল করার আগে যেকোনও একটি কল কেটে দিন অথবা দুটিকে একসাথে একটি কনফারেন্সে মার্জ করুন।"</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> ব্যবহার করতে হলে, মোবাইল ডেটা চালু আছে কিনা দেখে নিন। আপনি সেটিংস থেকে এটি পরিবর্তন করতে পারেন।"</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> ব্যবহার করতে হলে, মোবাইল ডেটা এবং ডেটা রোমিং চালু আছে কিনা দেখে নিন। আপনি সেটিংস থেকে এটি পরিবর্তন করতে পারেন।"</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g>ব্যবহার করতে হলে, <xliff:g id="SIM_NUMBER">%2$d</xliff:g>-এ মোবাইল ডেটা চালু আছে কিনা দেখে নিন। আপনি সেটিংস থেকে এটি পরিবর্তন করতে পারেন।"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 5c1e681..a5c5e86 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -830,7 +830,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Nije moguće uputiti poziv zbog uspostavljanja drugog odlaznog poziva."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Nije moguće uputiti poziv zbog neodgovorenog dolaznog poziva. Odgovorite ili odbijte dolazni poziv prije upućivanja novog poziva."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Nije moguće uputiti poziv zbog onemogućenog pozivanja putem sistemske funkcije ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Nije moguće uputiti poziv jer su dva poziva već u toku. Prekinite jedan od njih ili ih objedinite u konferencijski poziv prije upućivanja novog poziva."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Nije moguće uputiti poziv jer su dva poziva već u toku. Prekinite jedan od njih ili ih spojite u konferencijski poziv prije upućivanja novog poziva."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Za korištenje usluge <xliff:g id="SUPP_SERVICE">%s</xliff:g>, provjerite je li uključen prijenos podataka na mobilnoj mreži. Ovo možete promijeniti u postavkama mobilne mreže."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Za korištenje usluge <xliff:g id="SUPP_SERVICE">%s</xliff:g>, provjerite jesu li uključeni prijenos podataka na mobilnoj mreži i roming podataka. Ovo možete promijeniti u postavkama mobilne mreže."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Za korištenje usluge <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, provjerite je li za SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g> uključen prijenos podataka na mobilnoj mreži. Ovo možete promijeniti u postavkama mobilne mreže."</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 5350ab0..51b058c 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"No es pot fer la trucada perquè ja hi ha una trucada sortint en curs."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"No es pot fer la trucada perquè hi ha una trucada entrant sense resposta. Respon-hi o rebutja-la abans de fer més trucades."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"No es pot fer la trucada perquè l\'opció de trucar s\'ha desactivat mitjançant la propietat del sistema ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"No es pot fer la trucada perquè ja n\'hi ha dues en curs. Desconnecta\'n una o combina-les en una conferència abans de fer-ne més de noves."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"No es pot fer la trucada perquè ja n\'hi ha dues en curs. Desconnecta\'n una o combina-les en una conferència abans de fer-ne més de noves."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Comprova que les dades mòbils estiguin activades per utilitzar <xliff:g id="SUPP_SERVICE">%s</xliff:g>. Pots canviar aquesta opció a la configuració de xarxa mòbil."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Comprova que les dades mòbils i la itinerància de dades estiguin activades per utilitzar <xliff:g id="SUPP_SERVICE">%s</xliff:g>. Pots canviar aquestes opcions a la configuració de xarxa mòbil."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Comprova que les dades mòbils estiguin activades a la SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g> per utilitzar <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>. Pots canviar aquesta opció a la configuració de xarxa mòbil."</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 926681b..a2ce692 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -833,7 +833,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Nemůžete provést hovor, když už se jeden odchozí hovor vytáčí."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Nemůžete provést hovor, protože máte nepřijatý příchozí hovor. Přijměte nebo odmítněte příchozí hovor, než provedete nový."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Nemůžete provést hovor, protože volání bylo zakázáno systémovým příkazem ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Nemůžete provést hovor, protože už probíhají dva hovory. Odpojte jeden hovor nebo je slučte do konference, než provedete nový hovor."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Nemůžete uskutečnit hovor, protože už probíhají dva hovory. Než zahájíte nový hovor, jeden ze stávajících odpojte nebo je slučte do konference."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Pokud chcete používat službu <xliff:g id="SUPP_SERVICE">%s</xliff:g>, zkontrolujte, že máte zapnutá mobilní data. Můžete to změnit v nastavení mobilní sítě."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Pokud chcete používat službu <xliff:g id="SUPP_SERVICE">%s</xliff:g>, zkontrolujte, že máte zapnutá mobilní data a datový roaming. Můžete to změnit v nastavení mobilní sítě."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Pokud chcete používat službu <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, zkontrolujte, že máte zapnutá mobilní data pro SIM kartu <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. Můžete to změnit v nastavení mobilní sítě."</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index ecfb98d..b3bd5ad 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Der kan ikke foretages et opkald, fordi et udgående opkald allerede ringer."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Der kan ikke foretages et opkald, fordi et indgående opkald ringer. Besvar eller afvis det indgående opkald, før du foretager et nyt opkald."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Der kan ikke foretages et opkald, fordi foretagelse af opkald er blevet deaktiveret ved hjælp af systemegenskaben ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Der kan ikke foretages et opkald, fordi der allerede er to igangværende opkald. Afslut et af opkaldene, eller flet dem til et konferenceopkald, før du foretager et nyt opkald."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Der kan ikke foretages et opkald, fordi der allerede er to igangværende opkald. Afslut et af opkaldene, eller flet dem til et telefonmøde, før du foretager et nyt opkald."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Hvis du vil bruge <xliff:g id="SUPP_SERVICE">%s</xliff:g>, skal du sørge for, at mobildata er slået til. Du kan ændre dette under indstillingerne for mobilnetværk."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Hvis du vil bruge <xliff:g id="SUPP_SERVICE">%s</xliff:g>, skal du sørge for, at mobildata og dataroaming er slået til. Du kan ændre dette under indstillingerne for mobilnetværk."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Hvis du vil bruge <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, skal du sørge for, at mobildata er slået til for SIM-kortet <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. Du kan ændre dette under indstillingerne for mobilnetværk."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 7af3720..85e8c8b 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Anruf nicht möglich, da bereits ein anderer ausgehender Anruf aufgebaut wird."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Anruf nicht möglich, da ein nicht angenommener eingehender Anruf vorhanden ist. Nimm den eingehenden Anruf an oder lehne ihn ab, bevor du einen neuen Anruf startest."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Anruf nicht möglich, weil Anrufe über die Systemeigenschaft \"ro.telephony.disable-call\" deaktiviert wurden."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Anruf nicht möglich, weil bereits zwei Anrufe aktiv sind. Beenden einen der Anrufe oder führe beide Anrufe in einer Telefonkonferenz zusammen, bevor du einen neuen Anruf startest."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Anruf nicht möglich, weil bereits zwei Anrufe aktiv sind. Beende einen der Anrufe oder führe beide Anrufe in einer Telefonkonferenz zusammen, bevor du einen neuen Anruf startest."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Damit du <xliff:g id="SUPP_SERVICE">%s</xliff:g> nutzen kannst, müssen mobile Daten aktiviert sein. Du kannst dies in den Einstellungen für das Mobilfunknetz ändern."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Damit du <xliff:g id="SUPP_SERVICE">%s</xliff:g> nutzen kannst, müssen mobile Daten und Daten-Roaming aktiviert sein. Du kannst dies in den Einstellungen für das Mobilfunknetz ändern."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Damit du <xliff:g id="SUPP_SERVICE">%1$s</xliff:g> nutzen kannst, müssen mobile Daten für SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g> aktiviert sein. Du kannst dies in den Einstellungen für das Mobilfunknetz ändern."</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 1c88d8e..b2682c1 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Δεν είναι δυνατή η πραγματοποίηση της κλήσης, επειδή βρίσκεται ήδη σε εξέλιξη εξερχόμενη κλήση."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Δεν είναι δυνατή η πραγματοποίηση κλήσης, επειδή υπάρχει αναπάντητη εισερχόμενη κλήση. Απαντήστε ή απορρίψτε την εισερχόμενη κλήση, προτού πραγματοποιήσετε μια νέα κλήση."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Δεν είναι δυνατή η πραγματοποίηση κλήσης επειδή η κλήση έχει απενεργοποιηθεί μέσω της ιδιότητας συστήματος ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Δεν είναι δυνατή η πραγματοποίηση κλήσης, επειδή υπάρχουν ήδη δύο κλήσεις σε εξέλιξη. Αποσυνδέστε μια από τις κλήσεις ή συγχωνεύστε τες σε μια διάσκεψη, προτού πραγματοποιήσετε μια νέα κλήση."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Δεν είναι δυνατή η πραγματοποίηση κλήσης, επειδή υπάρχουν ήδη δύο κλήσεις σε εξέλιξη. Αποσυνδέστε μια από τις κλήσεις ή συγχωνεύστε τες σε μια συνδιάσκεψη, προτού πραγματοποιήσετε μια νέα κλήση."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Για να χρησιμοποιήσετε την υπηρεσία \"<xliff:g id="SUPP_SERVICE">%s</xliff:g>\", βεβαιωθείτε ότι τα δεδομένα κινητής τηλεφωνίας είναι ενεργοποιημένα. Μπορείτε να το αλλάξετε αυτό από τις ρυθμίσεις δικτύου κινητής τηλεφωνίας."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Για να χρησιμοποιήσετε την υπηρεσία \"<xliff:g id="SUPP_SERVICE">%s</xliff:g>\", βεβαιωθείτε ότι τα δεδομένα κινητής τηλεφωνίας, καθώς και η περιαγωγή δεδομένων, είναι ενεργοποιημένα. Μπορείτε να το αλλάξετε αυτό από τις ρυθμίσεις δικτύου κινητής τηλεφωνίας."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Για να χρησιμοποιήσετε την υπηρεσία \"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g>\", βεβαιωθείτε ότι τα δεδομένα κινητής τηλεφωνίας είναι ενεργοποιημένα για τη SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. Μπορείτε να το αλλάξετε αυτό από τις ρυθμίσεις δικτύου κινητής τηλεφωνίας."</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 35999b8..6deb419 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Cannot place a call as another outgoing call is already dialling."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Cannot place a call as there is an unanswered incoming call. Answer or reject the incoming call prior to placing a new call."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Cannot place a call as calling has been disabled using the ro.telephony.disable-call system property."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Cannot place a call a there are already two calls in progress. Disconnect one of the calls or merge them into a conference prior to placing a new call."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Cannot place a call as there are already two calls in progress. Disconnect one of the calls or merge them into a conference prior to placing a new call."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"To use <xliff:g id="SUPP_SERVICE">%s</xliff:g>, make sure that mobile data is turned on. You can change this in mobile network settings."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"To use <xliff:g id="SUPP_SERVICE">%s</xliff:g>, make sure that mobile data and data roaming are turned on. You can change these in mobile network settings."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"To use <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, make sure that mobile data is turned on for SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. You can change this in mobile network settings."</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 2ca6c18..53736cf 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Cannot place a call as another outgoing call is already dialling."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Cannot place a call as there is an unanswered incoming call. Answer or reject the incoming call prior to placing a new call."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Cannot place a call as calling has been disabled using the ro.telephony.disable-call system property."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Cannot place a call a there are already two calls in progress. Disconnect one of the calls or merge them into a conference prior to placing a new call."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Cannot place a call as there are already two calls in progress. Disconnect one of the calls or merge them into a conference prior to placing a new call."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"To use <xliff:g id="SUPP_SERVICE">%s</xliff:g>, make sure that mobile data is turned on. You can change this in mobile network settings."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"To use <xliff:g id="SUPP_SERVICE">%s</xliff:g>, make sure that mobile data and data roaming are turned on. You can change these in mobile network settings."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"To use <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, make sure that mobile data is turned on for SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. You can change this in mobile network settings."</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 35999b8..6deb419 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Cannot place a call as another outgoing call is already dialling."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Cannot place a call as there is an unanswered incoming call. Answer or reject the incoming call prior to placing a new call."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Cannot place a call as calling has been disabled using the ro.telephony.disable-call system property."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Cannot place a call a there are already two calls in progress. Disconnect one of the calls or merge them into a conference prior to placing a new call."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Cannot place a call as there are already two calls in progress. Disconnect one of the calls or merge them into a conference prior to placing a new call."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"To use <xliff:g id="SUPP_SERVICE">%s</xliff:g>, make sure that mobile data is turned on. You can change this in mobile network settings."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"To use <xliff:g id="SUPP_SERVICE">%s</xliff:g>, make sure that mobile data and data roaming are turned on. You can change these in mobile network settings."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"To use <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, make sure that mobile data is turned on for SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. You can change this in mobile network settings."</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 35999b8..6deb419 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Cannot place a call as another outgoing call is already dialling."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Cannot place a call as there is an unanswered incoming call. Answer or reject the incoming call prior to placing a new call."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Cannot place a call as calling has been disabled using the ro.telephony.disable-call system property."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Cannot place a call a there are already two calls in progress. Disconnect one of the calls or merge them into a conference prior to placing a new call."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Cannot place a call as there are already two calls in progress. Disconnect one of the calls or merge them into a conference prior to placing a new call."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"To use <xliff:g id="SUPP_SERVICE">%s</xliff:g>, make sure that mobile data is turned on. You can change this in mobile network settings."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"To use <xliff:g id="SUPP_SERVICE">%s</xliff:g>, make sure that mobile data and data roaming are turned on. You can change these in mobile network settings."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"To use <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, make sure that mobile data is turned on for SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. You can change this in mobile network settings."</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 04094fb..7cf9329 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Cannot place a call as another outgoing call is already dialing."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Cannot place a call as there is an unanswered incoming call. Answer or reject the incoming call prior to placing a new call."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Cannot place a call as calling has been disabled using the ro.telephony.disable-call system property."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Cannot place a call a there are already two calls in progress. Disconnect one of the calls or merge them into a conference prior to placing a new call."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Cannot place a call as there are already two calls in progress. Disconnect one of the calls or merge them into a conference prior to placing a new call."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"To use <xliff:g id="SUPP_SERVICE">%s</xliff:g>, make sure mobile data is turned on. You can change this in mobile network settings."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"To use <xliff:g id="SUPP_SERVICE">%s</xliff:g>, make sure mobile data and data roaming are turned on. You can change these in mobile network settings."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"To use <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, make sure mobile data is turned on for SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. You can change this in mobile network settings."</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index c0135c0..54a2c7b 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"No puedes realizar la llamada porque ya estás marcando otra llamada saliente."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"No puedes realizar la llamada porque tienes una llamada entrante que no respondiste. Respóndela o recházala antes de realizar una nueva."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"No puedes realizar la llamada porque se desactivaron las llamadas con la propiedad ro.telephony.disable-call del sistema."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"No puedes realizar la llamada porque hay dos llamadas en curso. Antes de realizar una nueva, desconecta una de ellas o combínalas en una conferencia."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"No puedes hacer la llamada porque hay dos llamadas en curso. Finaliza una de ellas o combínalas en una conferencia antes de llamar de nuevo."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Para usar <xliff:g id="SUPP_SERVICE">%s</xliff:g>, asegúrate de que los datos móviles estén activados. Puedes cambiar esto en la configuración de la red móvil."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Para usar <xliff:g id="SUPP_SERVICE">%s</xliff:g>, asegúrate de que los datos móviles y el roaming de datos estén activados. Puedes cambiar esto en la configuración de la red móvil."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Para usar <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, asegúrate de que los datos móviles estén activados para la SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. Puedes cambiar esto en la configuración de la red móvil."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index a106ba2..f11db56 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"No se puede llamar porque ya se está realizando otra llamada."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"No se puede llamar porque hay una llamada entrante sin responder. Contéstala o recházala para poder llamar de nuevo."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"No se puede llamar porque se han inhabilitado las llamadas mediante la propiedad del sistema ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"No se puede llamar porque ya hay dos llamadas en curso. Interrumpe una de ellas o combínalas en una conferencia para poder llamar de nuevo."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"No se puede llamar porque ya hay dos llamadas en curso. Interrumpe una de ellas o combínalas en una conferencia antes de hacer otra llamada."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Para utilizar <xliff:g id="SUPP_SERVICE">%s</xliff:g>, los datos móviles deben estar activados. Puedes cambiar esta opción en los ajustes de red móvil."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Para utilizar <xliff:g id="SUPP_SERVICE">%s</xliff:g>, los datos móviles y el roaming de datos deben estar activados. Puedes cambiar estas opciones en los ajustes de red móvil."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Para utilizar <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, los datos móviles deben estar activados en la SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. Puedes cambiar esta opción en los ajustes de red móvil."</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 076160a..47a6f93 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Kõnet ei saa teha, kuna teist väljuvat kõnet juba valitakse."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Kõnet ei saa teha, kuna telefonis on sissetulev vastamata kõne. Enne uue kõne tegemist vastake kõnele või katkestage see."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Kõnet ei saa teha, kuna helistamine on süsteemi atribuudiga ro.telephony.disable-call keelatud."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Kõnet ei saa teha, kuna kaks kõnet on juba pooleli. Enne uue kõne tegemist katkestage üks kõnedest või liitke need konverentskõnedeks."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Kõnet ei saa teha, kuna kaks kõnet on juba pooleli. Enne uue kõne tegemist katkestage üks kõnedest või liitke need konverentskõnedeks."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Teenuse <xliff:g id="SUPP_SERVICE">%s</xliff:g> kasutamiseks veenduge, et mobiilne andmeside oleks sisse lülitatud. Seda saab muuta mobiilsidevõrgu seadetes."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Teenuse <xliff:g id="SUPP_SERVICE">%s</xliff:g> kasutamiseks veenduge, et mobiilne andmeside ja andmesiderändlus oleks sisse lülitatud. Seda saab muuta mobiilsidevõrgu seadetes."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Teenuse <xliff:g id="SUPP_SERVICE">%1$s</xliff:g> kasutamiseks veenduge, et mobiilne andmeside oleks SIM-kaardil <xliff:g id="SIM_NUMBER">%2$d</xliff:g> sisse lülitatud. Seda saab muuta mobiilsidevõrgu seadetes."</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 4d5b23d..e472ac7 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Ezin da egin deia, beste dei bat abian delako."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Ezin da egin deia, oraindik erantzun ez diozun dei bat jasotzen ari zarelako. Beste dei bat egin aurretik, erantzun deiari edo bazter ezazu."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Ezin da egin deia, deiak egiteko aukera desgaitu egin delako sistemaren ro.telephony.disable-call propietatea erabilita."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Ezin da egin deia, dagoeneko bi dei daudelako abian. Beste dei bat egin aurretik, eten deietako bat edo bateratu deiak konferentzia-dei bakarrean."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Ezin da egin deia, dagoeneko bi dei daudelako abian. Beste dei bat egin aurretik, eten deietako bat edo bateratu deiak konferentzia-dei bakarrean."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> erabiltzeko, ziurtatu datu-konexioa aktibatuta dagoela. Sare mugikorren ezarpenetan alda dezakezu aukera hau."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> erabiltzeko, ziurtatu datu-konexioa eta datu-ibiltaritza aktibatuta daudela. Sare mugikorren ezarpenetan alda ditzakezu aukera horiek."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g> erabiltzeko, ziurtatu datu-konexioa aktibatuta dagoela <xliff:g id="SIM_NUMBER">%2$d</xliff:g> SIM txartelean. Sare mugikorren ezarpenetan alda dezakezu aukera hori."</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index eb9086e..d7ed34e 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"نمیتوانید تماسی برقرار کنید، چون تماس خروجی دیگری درحال شمارهگیری است."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"نمیتوانید تماسی برقرار کنید، چون تماس ورودی بیپاسخی درحال شمارهگیری است. قبل از برقراری تماس جدید، به آن پاسخ دهید یا آن را رد کنید."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"نمیتوانید تماسی برقرار کنید چون برقراری تماس تلفنی با استفاده از مشخصه سیستم ro.telephony.disable-call غیرفعال شده است."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"نمیتوانید تماسی برقرار کنید، چون هماکنون دو تماس دیگر درحال انجام است. قبل از برقراری تماس جدید، یکی از تماسها را قطع کنید یا آنها را بهصورت کنفرانسی ادغام کنید."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"نمیتوانید تماسی برقرار کنید، زیرا هماکنون دو تماس دیگر درحال انجام است. قبلاز برقراری تماس جدید، یکی از تماسها را قطع کنید یا آنها را بهصورت کنفرانسی ادغام کنید."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"برای استفاده از <xliff:g id="SUPP_SERVICE">%s</xliff:g>، مطمئن شوید داده تلفن همراه روشن شده باشد. میتوانید در تنظیمات شبکه تلفن همراه این تنظیم را تغییر دهید."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"برای استفاده از <xliff:g id="SUPP_SERVICE">%s</xliff:g>، مطمئن شوید داده تلفن همراه و فراگردی داده روشن شده باشد. میتوانید در تنظیمات شبکه تلفن همراه، این تنظیمات را تغییر دهید."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"برای استفاده از <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>، مطمئن شوید داده تلفن همراه برای سیمکارت <xliff:g id="SIM_NUMBER">%2$d</xliff:g> روشن باشد. میتوانید در تنظیمات شبکه تلفن همراه این تنظیم را تغییر دهید."</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 34d40a8..81f935e 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Puhelua ei voida soittaa, koska toisen lähtevän puhelun soittaminen on kesken."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Puhelua ei voida soittaa, koska saapuvaan puheluun ei ole vielä vastattu. Vastaa saapuvaan puheluun tai hylkää se, ennen kuin soitat uuden puhelun."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Puhelua ei voida soittaa, koska soittaminen on poistettu käytöstä ro.telephony.disable-call-järjestelmätoiminnolla."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Puhelua ei voida soittaa, koska kaksi puhelua on jo käynnissä. Katkaise toinen puheluista tai yhdistä puhelut puhelinneuvotteluksi ennen uuden puhelun soittamista."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Puhelua ei voida soittaa, koska kaksi puhelua on jo käynnissä. Katkaise toinen puheluista tai yhdistä puhelut neuvotteluksi ennen uuden puhelun soittamista."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> toimii, jos mobiilidata on käytössä. Voit ottaa mobiilidatan käyttöön mobiiliverkkoasetuksista."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> toimii, jos mobiilidata ja roaming ovat käytössä. Voit ottaa ne käyttöön mobiiliverkkoasetuksista."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g> toimii, jos mobiilidata on käytössä SIM-kortilla <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. Voit ottaa mobiilidatan käyttöön mobiiliverkkoasetuksista."</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 3236666..7316ed0 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Impossible de passer un appel, car un autre appel sortant est déjà en cours de composition."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Impossible de passer un appel, car il y a un appel entrant sans réponse. Répondez à l\'appel entrant ou refusez-le avant de passer un nouvel appel."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Impossible de passer un appel, car la fonction d\'appel a été désactivée à l\'aide de la propriété système ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Impossible de passer un appel, car deux appels sont déjà en cours. Déconnectez-en un ou fusionnez-les en conférence téléphonique avant de passer un nouvel appel."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Impossible de passer un appel, car deux appels sont déjà en cours. Déconnectez-en un ou fusionnez-les en conférence téléphonique avant de passer un nouvel appel."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Avant d\'utiliser <xliff:g id="SUPP_SERVICE">%s</xliff:g>, assurez-vous que les données cellulaires sont activées. Vous pouvez modifier cette option dans les paramètres du réseau cellulaire."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Avant d\'utiliser <xliff:g id="SUPP_SERVICE">%s</xliff:g>, assurez-vous que les données cellulaires et l\'itinérance des données sont activées. Vous pouvez modifier ces options dans les paramètres du réseau cellulaire."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Avant d\'utiliser <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, assurez-vous que les données cellulaires sont activées pour la carte SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. Vous pouvez modifier cette option dans les paramètres du réseau cellulaire."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 957e361..8457b5d 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Impossible de passer un appel lorsqu\'un appel sortant est déjà en cours."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Impossible de passer un appel lorsqu\'un appel entrant attend une réponse. Répondez à cet appel ou refusez-le avant de passer un nouvel appel."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Impossible de passer un appel, car la fonction d\'appel a été désactivée à l\'aide de la propriété système ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Impossible de passer un appel, car deux appels sont déjà en cours. Mettez fin à l\'un des appels ou fusionnez-les afin de créer une conférence avant de passer un nouvel appel."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Impossible de passer un appel, car deux appels sont déjà en cours. Mettez fin à l\'un des appels ou fusionnez-les afin de créer une conférence avant de passer un nouvel appel."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Pour utiliser <xliff:g id="SUPP_SERVICE">%s</xliff:g>, assurez-vous que les données mobiles sont activées. Vous pouvez modifier cette option dans les paramètres de réseau mobile."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Pour utiliser <xliff:g id="SUPP_SERVICE">%s</xliff:g>, assurez-vous que les données mobiles et l\'itinérance des données sont activées. Vous pouvez modifier ces options dans les paramètres de réseau mobile."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Pour utiliser <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, assurez-vous que les données mobiles sont activées pour la carte SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. Vous pouvez modifier cette option dans les paramètres de réseau mobile."</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 6fdca2d..1125e2f 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Non podes facer unha chamada porque xa hai outra en curso."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Non podes chamar porque te están chamando nestes momentos. Para poder facer unha chamada, primeiro tes que responder á outra ou rexeitala."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Non podes realizar unha chamada porque se desactivou esa función a través da propiedade do sistema ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Non podes realizar unha chamada porque xa hai dúas en curso. Para poder chamar, desconecta unha das que están en curso ou combínaas nunha conferencia."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Non podes facer unha chamada porque xa hai dúas en curso. Para poder facer unha chamada nova, desconecta unha das dúas ou combínaas nunha conferencia."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Para usar <xliff:g id="SUPP_SERVICE">%s</xliff:g>, asegúrate de que os datos móbiles están activados. Podes cambiar esta opción na configuración de rede de telefonía móbil."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Para usar <xliff:g id="SUPP_SERVICE">%s</xliff:g>, asegúrate de que os datos móbiles e a itinerancia de datos están activados. Podes cambiar esta opción na configuración de rede de telefonía móbil."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Para usar <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, asegúrate de que os datos móbiles da SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g> están activados. Podes cambiar esta opción na configuración de rede de telefonía móbil."</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 454dc44..74283aa 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"કૉલ કરી શકાતો નથી કારણ કે બીજો આઉટગોઇંગ કૉલ પહેલાંથી ડાયલ કરવામાં આવી રહ્યો છે."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"કૉલ કરી શકાતો નથી કારણ કે ઇનકમિંગ કૉલનો જવાબ આપવામાં આવી રહ્યો નથી. નવો કૉલ કરતા પૂર્વે ઇનકમિંગ કૉલનો જવાબ આપો અથવા નકારો."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"કૉલ કરી શકાતો નથી કેમકે કૉલિંગની સુવિધા ro.telephony.disable-call સિસ્ટમ પ્રોપર્ટીનો ઉપયોગ કરીને બંધ કરવામાં આવી છે."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"કૉલ કરી શકાતો નથી કારણ કે બે કૉલ પહેલાંથી ચાલુ છે. નવો કૉલ કરતા પૂર્વે એક કૉલને ડિસ્કનેક્ટ કરો અથવા તેમને કોન્ફરન્સ કૉલમાં મર્જ કરો."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"કૉલ કરી શકાતો નથી, કારણ કે બે કૉલ પહેલાંથી ચાલુ છે. નવો કૉલ કરતા પહેલાં તેમાંથી એક કૉલને ડિસ્કનેક્ટ કરો અથવા તેને કૉન્ફરન્સમાં મર્જ કરો."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"<xliff:g id="SUPP_SERVICE">%s</xliff:g>નો ઉપયોગ કરવા માટે, મોબાઇલ ડેટા ચાલુ હોવાની ખાતરી કરો. તમે આને મોબાઇલ નેટવર્ક સેટિંગમાં બદલી શકો છો."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"<xliff:g id="SUPP_SERVICE">%s</xliff:g>નો ઉપયોગ કરવા માટે, મોબાઇલ ડેટા અને ડેટા રોમિંગ ચાલુ હોવાની ખાતરી કરો. તમે આને મોબાઇલ નેટવર્ક સેટિંગમાં બદલી શકો છો."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g>નો ઉપયોગ કરવા માટે, SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g> માટે મોબાઇલ ડેટા ચાલુ હોવાની ખાતરી કરો. તમે આને મોબાઇલ નેટવર્ક સેટિંગમાં બદલી શકો છો."</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index f604fdd..c941be2 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"कॉल नहीं किया जा सकता, क्योंकि कोई दूसरा किया गया कॉल (आउटगोइंग) पहले से ही डायल हो रहा है."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"कॉल नहीं किया जा सकता, क्योंकि एक आने वाले कॉल (इनकमिंग) का जवाब नहीं दिया जा रहा है. नया कॉल करने से पहले आने वाले कॉल (इनकमिंग) का जवाब दें या उसे अस्वीकार करें."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"कॉल नहीं किया जा सकता क्योंकि कॉलिंग की सुविधा को ROS.टेलीफ़ोनी की कॉल बंद करें सिस्टम प्रॉपर्टी का उपयोग करके बंद कर दिया गया है."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"कॉल नहीं किया जा सकता, क्योंकि पहले से ही दो कॉल जारी हैं. नया कॉल करने से पहले उनमें से किसी एक कॉल को बंद करें या उन्हें कॉन्फ़्रेंस में मर्ज करें."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"कॉल नहीं किया जा सका, क्योंकि पहले से ही दो कॉल जारी हैं. नया कॉल करने से पहले, उनमें से किसी एक कॉल को बंद करें या उन्हें कॉन्फ़्रेंस कॉल में मर्ज करें."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> का उपयोग करने के लिए, पक्का करें कि मोबाइल डेटा चालू है. आप मोबाइल नेटवर्क सेटिंग में जाकर इसे बदल सकते हैं."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> का उपयोग करने के लिए पक्का करें कि मोबाइल डेटा और डेटा रोमिंग चालू हैं. आप मोबाइल नेटवर्क सेटिंग में जाकर इन्हें बदल सकते हैं."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g> का उपयोग करने के लिए पक्का करें कि सिम <xliff:g id="SIM_NUMBER">%2$d</xliff:g> का डेटा चालू है. आप मोबाइल नेटवर्क सेटिंग में जाकर इसे बदल सकते हैं."</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index b9a8d0b..f0e8c76 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -830,7 +830,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Nije moguće uputiti poziv jer se odlazni poziv već upućuje."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Poziv se ne može uputiti jer postoji neodgovoreni dolazni poziv. Odgovorite ili odbijte dolazni poziv prije upućivanja novog poziva."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Poziv se ne može uputiti jer je pozivanje onemogućeno pomoću entiteta sustava ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Poziv se ne može uputiti jer su već dva poziva u tijeku. Prekinite jedan poziv ili spojite dva poziva u konferencijski poziv prije nego što uputite drugi poziv."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Poziv se ne može uputiti jer su već dva poziva u tijeku. Prekinite jedan poziv ili spojite dva poziva u konferencijski poziv prije nego što uputite drugi poziv."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Da biste koristili uslugu <xliff:g id="SUPP_SERVICE">%s</xliff:g>, provjerite jesu li vaši mobilni podaci uključeni. Tu opciju možete promijeniti u postavkama mobilne mreže."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Da biste koristili uslugu <xliff:g id="SUPP_SERVICE">%s</xliff:g>, provjerite jesu li mobilni podaci i roaming podataka uključeni. Tu opciju možete promijeniti u postavkama mobilne mreže."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Da biste koristili uslugu <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, provjerite jesu li mobilni podaci za SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g> uključeni. Tu opciju možete promijeniti u postavkama mobilne mreže."</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 80d1865..9d23ebe 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Nem kezdeményezhet hívást, mert folyamatban van egy másik kimenő hívás indítása."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Nem kezdeményezhet hívást, mert folyamatban van egy megválaszolatlan bejövő hívás. Mielőtt új hívást indítana, vegye fel, vagy utasítsa el a bejövő hívást."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Nem kezdeményezhet hívást, mivel a hívás le van tiltva ro.telephony.disable-call rendszertulajdonsággal."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Nem kezdeményezhet hívást, mivel már két hívás van folyamatban. Mielőtt új hívást indítana, tegye le az egyiket, vagy egyesítse őket egy konferenciahívásban."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Nem kezdeményezhet hívást, mert már két hívás van folyamatban. Mielőtt új hívást indítana, tegye le az egyiket, vagy egyesítse őket egy konferenciahívásban."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"A(z) <xliff:g id="SUPP_SERVICE">%s</xliff:g> használatához győződjön meg róla, hogy a mobiladat-kapcsolat be van kapcsolva. Ezt a mobilhálózat beállításainál módosíthatja."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"A(z) <xliff:g id="SUPP_SERVICE">%s</xliff:g> használatához győződjön meg róla, hogy a mobiladat-kapcsolat és az adatbarangolás be van kapcsolva. Ezt a mobilhálózat beállításainál módosíthatja."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"A(z) <xliff:g id="SUPP_SERVICE">%1$s</xliff:g> használatához győződjön meg róla, hogy a mobiladat-kapcsolat be van kapcsolva a SIM-kártyán (<xliff:g id="SIM_NUMBER">%2$d</xliff:g>). Ezt a mobilhálózat beállításainál módosíthatja."</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 7ccb20d..62da686 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Հնարավոր չէ զանգել, քանի որ տվյալ պահին մեկ այլ ելքային զանգ է կատարվում:"</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Հնարավոր չէ զանգել, քանի որ անպատասխան մուտքային զանգ կա: Նախքան նոր զանգ կատարելը պատասխանեք մուտքային զանգին կամ մերժեք այն:"</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Հնարավոր չէ զանգել, քանի որ զանգելու գործառույթը զանգերի համակարգի ro.telephony.disable կարգավորման միջոցով կասեցվել է:"</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Հնարավոր չէ զանգել, քանի որ արդեն երկու ընթացիկ զանգ կա: Նախքան նոր զանգ կատարելը ավարտեք զանգերից մեկը կամ միավորեք դրանք մեկ խմբային զանգում:"</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Հնարավոր չէ զանգել, քանի որ արդեն երկու ընթացիկ զանգ կա։ Նախքան նոր զանգ կատարելը ավարտեք զանգերից մեկը կամ միավորեք դրանք մեկ խմբային զանգում։"</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> ծառայությունից օգտվելու համար համոզվեք, որ բջջային ինտերնետը միացված է: Սա կարող եք փոխել բջջային ցանցի կարգավորումներում:"</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> ծառայությունից օգտվելու համար համոզվեք, որ բջջային ինտերնետը և ինտերնետը ռոումինգում միացված են: Սրանք կարող եք փոխել բջջային ցանցի կարգավորումներում:"</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g> ծառայությունից օգտվելու համար համոզվեք, որ SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g> քարտի համար բջջային ինտերնետը միացված է: Սա կարող եք փոխել բջջային ցանցի կարգավորումներում:"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index eb1106b..83e6ef7 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Tidak dapat melakukan panggilan karena panggilan keluar lainnya sedang berlangsung."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Tidak dapat melakukan panggilan karena ada panggilan masuk yang belum terjawab. Jawab atau tolak panggilan masuk sebelum melakukan panggilan."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Tidak dapat melakukan panggilan karena panggilan telah dinonaktifkan menggunakan properti sistem ro.telephony.disable-call"</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Tidak dapat melakukan panggilan karena ada dua panggilan yang sedang berlangsung. Putuskan salah satu panggilan atau gabungkan keduanya menjadi konferensi sebelum melakukan panggilan baru."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Tidak dapat melakukan panggilan karena ada dua panggilan yang sedang berlangsung. Putuskan salah satu panggilan atau gabungkan keduanya menjadi satu konferensi sebelum melakukan panggilan baru."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Untuk menggunakan <xliff:g id="SUPP_SERVICE">%s</xliff:g>, pastikan kuota internet diaktifkan. Anda dapat mengubahnya di setelan jaringan seluler."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Untuk menggunakan <xliff:g id="SUPP_SERVICE">%s</xliff:g>, pastikan kuota internet dan roaming data diaktifkan. Anda dapat mengubahnya di setelan jaringan seluler."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Untuk menggunakan <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, pastikan kuota internet diaktifkan untuk SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. Anda dapat mengubahnya di setelan jaringan seluler."</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index b44afa2..80e14c3 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Ekki er hægt að hringja símtal þar sem þegar er verið að hringja annað símtal."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Ekki er hægt að hringja símtal þar sem ósvarað símtal er að berast. Svaraðu eða hafnaðu símtalinu áður en þú hringir nýtt símtal."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Ekki er hægt að hringja símtal þar sem símtöl hafa verið gerð óvirk með því að nota kerfiseiginleikann ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Ekki er hægt að hringja símtal þar sem þegar eru tvö símtöl í gangi. Aftengdu annað símtalið eða sameinaðu þau í símafund áður en þú hringir nýtt símtal."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Ekki er hægt að hringja símtal vegna þess að þegar eru tvö símtöl í gangi. Aftengdu annað símtalið eða sameinaðu þau í símafund áður en þú hringir nýtt símtal."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Til að nota <xliff:g id="SUPP_SERVICE">%s</xliff:g> skaltu ganga úr skugga um að kveikt sé á farsímagögnum. Þú getur breytt þessu í stillingum farsímakerfis."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Til að nota <xliff:g id="SUPP_SERVICE">%s</xliff:g> skaltu ganga úr skugga um að kveikt sé á farsímagögnum og gagnareiki. Þú getur breytt þessu í stillingum farsímakerfis."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Til að nota <xliff:g id="SUPP_SERVICE">%1$s</xliff:g> skaltu ganga úr skugga um að kveikt sé á farsímagögnum fyrir SIM-kortið <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. Þú getur breytt þessu í stillingum farsímakerfis."</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index d38c50f..18ee718 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Impossibile effettuare una chiamata perché è già presente un\'altra chiamata in uscita in composizione."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Impossibile effettuare una chiamata perché è presente una chiamata in arrivo senza risposta. Rispondi o rifiuta la chiamata in arrivo prima di effettuare una nuova chiamata."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Impossibile effettuare una chiamata perché le chiamate sono state disattivate utilizzando la proprietà di sistema ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Impossibile effettuare una chiamata perché sono già presenti due chiamate in corso. Unisci le chiamate in una conferenza o scollegane una prima di effettuare una nuova chiamata."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Impossibile effettuare una chiamata perché due chiamate sono già in corso. Unisci le chiamate in una conferenza o scollegane una prima di effettuare una nuova chiamata."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Per utilizzare <xliff:g id="SUPP_SERVICE">%s</xliff:g>, assicurati che i dati mobili siano attivi. Puoi modificare questa opzione nelle impostazioni della rete mobile."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Per utilizzare <xliff:g id="SUPP_SERVICE">%s</xliff:g>, assicurati che i dati mobili e il roaming dei dati siano attivi. Puoi modificare queste opzioni nelle impostazioni della rete mobile."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Per utilizzare <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, assicurati che i dati mobili siano attivi per la SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. Puoi modificare questa opzione nelle impostazioni della rete mobile."</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 5fbf20d..22b00c1 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -833,7 +833,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"אי אפשר להתקשר כי יש שיחה יוצאת אחרת."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"אי אפשר להתקשר כי יש שיחה נכנסת אחרת. צריך לענות לשיחה או לדחות אותה ורק אז לנסות להתקשר למספר אחר."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"אי אפשר להתקשר כי השיחות הושבתו באמצעות מאפיין המערכת ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"אי אפשר להתקשר כי כבר יש שתי שיחות פעילות. צריך לנתק את אחת מהשיחות או למזג אותן לשיחת ועידה ורק אז לנסות להתקשר למספר אחר."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"אי אפשר להתקשר כי כבר יש שתי שיחות פעילות. צריך לנתק את אחת מהשיחות או למזג אותן לשיחת ועידה ורק אז לנסות להתקשר למספר אחר."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"כדי להשתמש בשירות \'<xliff:g id="SUPP_SERVICE">%s</xliff:g>\', צריך לוודא שהחיבור לחבילת הגלישה מופעל. אפשר להפעיל אותו בהגדרות של הרשת הסלולרית."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"כדי להשתמש בשירות \'<xliff:g id="SUPP_SERVICE">%s</xliff:g>\', צריך לוודא שהחיבור לחבילת הגלישה והנדידה מופעלים. אפשר להפעיל אותם בהגדרות של הרשת הסלולרית."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"כדי להשתמש בשירות \'<xliff:g id="SUPP_SERVICE">%1$s</xliff:g>\', צריך לוודא שהחיבור לחבילת הגלישה מופעל בכרטיס ה-SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. אפשר להפעיל אותו בהגדרות של הרשת הסלולרית."</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 6d65ce7..7e626ab 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"すでに別の通話を発信中のため、新しく通話を発信することはできません。"</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"通話を着信中のため、新しく通話を発信することはできません。着信中の通話に応答するか、通話を拒否すると、新しく通話を発信できるようになります。"</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"ro.telephony.disable-call システム プロパティを使用して通話機能が無効に設定されているため、通話を発信することはできません。"</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"通話中の電話がすでに 2 件あるため、新しく通話を発信することはできません。通話中の電話のどちらかを終了するか、2 件の通話を統合してグループ通話にすると、新しく通話を発信できるようになります。"</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"進行中の通話がすでに 2 件あるため、新しく通話を発信することはできません。進行中の通話のどちらかを終了するか、2 件の通話を統合してグループ通話にすると、新しく通話を発信できるようになります。"</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"<xliff:g id="SUPP_SERVICE">%s</xliff:g>を利用するには、モバイルデータが ON になっている必要があります。モバイルデータの ON と OFF の切り替えは、モバイル ネットワーク設定で行えます。"</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"<xliff:g id="SUPP_SERVICE">%s</xliff:g>を利用するには、モバイルデータとデータ ローミングが ON になっている必要があります。これらの ON と OFF の切り替えは、モバイル ネットワーク設定で行えます。"</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g>を利用するには、SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g> のモバイルデータが ON になっている必要があります。モバイルデータの ON と OFF の切り替えは、モバイル ネットワーク設定で行えます。"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index dfd6c9a..1a02f33 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"ზარის განხორციელება შეუძლებელია, რადგან სხვა გამავალი ზარი უკვე იკრიფება."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"ზარის განხორციელება შეუძლებელია, რადგან გაქვთ უპასუხო შემომავალი ზარი. უპასუხეთ ან უარყავით შემომავალი ზარი ახალი ზარის განხორციელებამდე."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"ზარის განხორციელება შეუძლებელია, რადგან დარეკვა გამორთულია ro.telephony.disable-call სისტემის თვისების გამოყენებით."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"ზარის განხორციელება შეუძლებელია, რადგან უკვე ორი ზარი მიმდინარეობს. ახალი ზარის განსახორციელებლად გათიშეთ ერთ-ერთი ზარი ან გააერთიანეთ ისინი კონფერენციად."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"ზარის განხორციელება შეუძლებელია, რადგან უკვე ორი ზარი მიმდინარეობს. ახალი ზარის განსახორციელებლად გათიშეთ ერთ-ერთი ზარი ან გააერთიანეთ ისინი კონფერენციად."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"<xliff:g id="SUPP_SERVICE">%s</xliff:g>-ის გამოსაყენებლად დარწმუნდით, რომ მობილური ინტერნეტი ჩართულია. ეს შეგიძლიათ მობილური ქსელის პარამეტრებში შეცვალოთ."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"<xliff:g id="SUPP_SERVICE">%s</xliff:g>-ის გამოსაყენებლად დარწმუნდით, რომ მობილური ინტერნეტი და ინტერნეტის როუმინგი ჩართულია. ეს შეგიძლიათ მობილური ქსელის პარამეტრებში შეცვალოთ."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g>-ის გამოსაყენებლად დარწმუნდით, რომ მობილური ინტერნეტი ჩართულია SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g>-სთვის. ეს შეგიძლიათ მობილური ქსელის პარამეტრებში შეცვალოთ."</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index baf170c..5e5a3c5 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Қоңырау шалу мүмкін емес, себебі басқа шығыс қоңырау орындалуда."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Қоңырау шалу мүмкін емес, себебі жауап берілмеген кіріс қоңырау бар. Кіріс қоңырауға жауап беріңіз немесе оны өшіріңіз."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Қоңырау шалу мүмкін емес, себебі қоңырау шалу функциясы ro.telephony.disable-call жүйелік параметрі арқылы өшірілген."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Қоңырау шалу мүмкін емес, себебі екі қоңырау орындалуда. Жаңа қоңырауды бастау үшін олардың біреуін тоқтатыңыз немесе бір конференцияға қосыңыз."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Қоңырау шалу мүмкін емес, себебі екі қоңырау орындалуда. Жаңа қоңырауды бастау үшін олардың біреуін тоқтатыңыз немесе бір конференцияға қосыңыз."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> пайдалану үшін мобильді интернеттің қосылғанына көз жеткізіңіз. Оны мобильдік желі параметрлерінен өзгертуге болады."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> пайдалану үшін мобильді интернет пен деректер роумингінің қосылғанына көз жеткізіңіз. Оны мобильдік желі параметрлерінен өзгертуге болады."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g> пайдалану үшін SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g> картасында мобильді интернеттің қосылғанына көз жеткізіңіз. Оны мобильдік желі параметрлерінен өзгертуге болады."</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index fb246f9..8d59549 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"មិនអាចធ្វើការហៅទូរសព្ទបានទេ ដោយសារមានគេកំពុងហៅទូរសព្ទចេញរួចហើយ។"</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"មិនអាចធ្វើការហៅទូរសព្ទបានទេ ដោយសារមានការហៅទូរសព្ទចូលមួយមិនបានឆ្លើយ។ ឆ្លើយតប ឬបដិសេធការហៅទូរសព្ទចូល មុនពេលធ្វើការហៅទូរសព្ទថ្មីមួយទៀត។"</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"មិនអាចធ្វើការហៅទូរសព្ទបានទេ ដោយសារមានការហៅទូរសព្ទមួយត្រូវបានបិទតាមរយៈការប្រើប្រាស់លក្ខណៈប្រព័ន្ធ ro.telephony.disable-call ។"</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"មិនអាចធ្វើការហៅទូរសព្ទបានទេ ដោយសារមានការហៅទូរសព្ទពីរកំពុងដំណើរការរួចហើយ។ ផ្ដាច់ការហៅទូរសព្ទមួយ ឬបញ្ចូលការហៅទូរសព្ទទាំងពីរចូលគ្នាជាការប្រជុំមួយ មុននឹងធ្វើការហៅទូរសព្ទថ្មីមួយ។"</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"មិនអាចធ្វើការហៅទូរសព្ទបានទេ ដោយសារមានការហៅទូរសព្ទពីរកំពុងដំណើរការរួចហើយ។ ផ្ដាច់ការហៅទូរសព្ទមួយ ឬដាក់ការហៅទូរសព្ទទាំងនេះចូលគ្នាជាការប្រជុំមួយ មុននឹងធ្វើការហៅទូរសព្ទថ្មី។"</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"ដើម្បីប្រើប្រាស់ <xliff:g id="SUPP_SERVICE">%s</xliff:g> សូមប្រាកដថាទិន្នន័យទូរសព្ទចល័តត្រូវបានបើក។ អ្នកអាចផ្លាស់ប្ដូរជម្រើសនេះនៅក្នុងការកំណត់បណ្ដាញទូរសព្ទចល័ត។"</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"ដើម្បីប្រើប្រាស់ <xliff:g id="SUPP_SERVICE">%s</xliff:g> សូមប្រាកដថាទិន្នន័យទូរសព្ទចល័ត និងការរ៉ូមីងទិន្នន័យត្រូវបានបើក។ អ្នកអាចផ្លាស់ប្ដូរជម្រើសទាំងនេះនៅក្នុងការកំណត់បណ្ដាញទូរសព្ទចល័ត។"</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"ដើម្បីប្រើប្រាស់ <xliff:g id="SUPP_SERVICE">%1$s</xliff:g> សូមប្រាកដថាទិន្នន័យទូរសព្ទចល័តត្រូវបានបើកសម្រាប់ស៊ីម <xliff:g id="SIM_NUMBER">%2$d</xliff:g> ។ អ្នកអាចផ្លាស់ប្ដូរជម្រើសនេះនៅក្នុងការកំណត់បណ្ដាញទូរសព្ទចល័ត។"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index c94e6c7..23329a3 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"ಹೊಸ ಕರೆಯನ್ನು ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ ಏಕೆಂದರೆ ಮತ್ತೊಂದು ಕರೆಯನ್ನು ಈಗಾಗಲೇ ಮಾಡಲಾಗುತ್ತಿದೆ."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"ಉತ್ತರಿಸದೇ ಒಳಬರುವ ಕರೆ ಬರುತ್ತಿರುವುದರಿಂದ ಕರೆ ಮಾಡಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಹೊಸ ಕರೆಯನ್ನು ಮಾಡುವ ಮೊದಲು ಕರೆಗೆ ಉತ್ತರ ನೀಡಿ ಅಥವಾ ತಿರಸ್ಕರಿಸಿ."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"ಕರೆ ವೈಶಿಷ್ಟ್ಯವನ್ನು ro.telephony.disable-call ಸಿಸ್ಟಂ ಗುಣಲಕ್ಷಣದಿಂದ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿರುತ್ತದೆ, ಆದ್ದರಿಂದ ಕರೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"ಈಗಾಗಲೇ ಎರಡು ಕರೆಗಳು ಪ್ರಗತಿಯಲ್ಲಿರುವುದರಿಂದ, ಕರೆ ಮಾಡಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.ಒಂದು ಕರೆಯ ಸಂಪರ್ಕವನ್ನು ಕಡಿತಗೊಳಿಸಿ ಅಥವಾ ನೀವು ಹೊಸ ಕರೆಯನ್ನು ಮಾಡುವ ಮೊದಲು ಎರಡು ಕರೆಗಳನ್ನು ಒಂದೇ ಕಾನ್ಫರೆನ್ಸ್ನಲ್ಲಿ ವಿಲೀನಗೊಳಿಸಿ."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"ಈಗಾಗಲೇ ಎರಡು ಕರೆಗಳು ಪ್ರಗತಿಯಲ್ಲಿರುವುದರಿಂದ, ಕರೆ ಮಾಡಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಒಂದು ಕರೆಯ ಸಂಪರ್ಕವನ್ನು ಕಡಿತಗೊಳಿಸಿ ಅಥವಾ ಹೊಸ ಕರೆಯನ್ನು ಮಾಡುವ ಮೊದಲು ಎರಡು ಕರೆಗಳನ್ನು ಒಂದೇ ಕಾನ್ಫರೆನ್ಸ್ನಲ್ಲಿ ವಿಲೀನಗೊಳಿಸಿ."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> ಅನ್ನು ಬಳಸಲು, ಮೊಬೈಲ್ ಡೇಟಾ ಆನ್ ಆಗಿದೆಯೇ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ. ನೀವು ಇದನ್ನು ಮೊಬೈಲ್ ನೆಟ್ವರ್ಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಬದಲಾಯಿಸಬಹುದು."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> ಅನ್ನು ಬಳಸಲು, ಮೊಬೈಲ್ ಡೇಟಾ ಮತ್ತು ಡೇಟಾ ರೋಮಿಂಗ್ ಆನ್ ಆಗಿದೆಯೇ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ. ನೀವು ಇದನ್ನು ಮೊಬೈಲ್ ನೆಟ್ವರ್ಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಬದಲಾಯಿಸಬಹುದು."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g> ಅನ್ನು ಬಳಸಲು, <xliff:g id="SIM_NUMBER">%2$d</xliff:g> ಸಿಮ್ಗಾಗಿ ಮೊಬೈಲ್ ಡೇಟಾ ಆನ್ ಆಗಿದೆಯೇ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ. ನೀವು ಇದನ್ನು ಮೊಬೈಲ್ ನೆಟ್ವರ್ಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಬದಲಾಯಿಸಬಹುದು."</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 52ad67b..3cca5b9 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"이미 다른 발신 전화에서 다이얼 중이므로 전화를 걸 수 없습니다."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"받지 않은 수신 전화가 있으므로 전화를 걸 수 없습니다. 새로 전화를 걸기 전에 수신 전화를 받거나 거절하세요."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"ro.telephony.disable-call 시스템 속성을 사용하여 통화 기능이 사용 중지되었으므로 전화를 걸 수 없습니다."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"이미 진행 중인 두 건의 통화가 있으므로 전화를 걸 수 없습니다. 새로 전화를 걸기 전에 통화 중 하나를 연결 해제하거나 두 통화를 다자간 통화로 병합하세요."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"이미 진행 중인 두 건의 통화가 있으므로 전화를 걸 수 없습니다. 새로 전화를 걸기 전에 통화 중 하나를 연결 해제하거나 두 통화를 다자간 통화로 병합하세요."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"<xliff:g id="SUPP_SERVICE">%s</xliff:g>을(를) 사용하려면 모바일 데이터가 사용 설정되어 있는지 확인하세요. 이 설정은 모바일 네트워크 설정에서 변경할 수 있습니다."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"<xliff:g id="SUPP_SERVICE">%s</xliff:g>을(를) 사용하려면 모바일 데이터 및 데이터 로밍이 사용 설정되어 있는지 확인하세요. 이 설정은 모바일 네트워크 설정에서 변경할 수 있습니다."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g>을(를) 사용하려면 SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g>에 모바일 데이터가 사용 설정되어 있는지 확인하세요. 이 설정은 모바일 네트워크 설정에서 변경할 수 있습니다."</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index c4ea6fa..4c14870 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Чалуу аткарылбайт, анткени башка чыгуучу чалуу терилүүдө."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Чалуу аткарылбайт, анткени кирүүчү чалууга жооп берилген жок. Жаңы чалуу аткаруудан мурун кирүүчү чалууга жооп берип же четке кагыңыз."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Чалуу аткарылбайт, анткени чалуу ro.telephony.disable-call тутуму аркылуу өчүрүлгөн."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Чалуу аткарылбайт, анткени эки чалуу аткарылууда. Бир чалууну өчүрүңүз же аларды конференцияга бириктириңиз."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Чалуу аткарылбайт, анткени эки чалуу аткарылууда. Бир чалууну өчүрүңүз же аларды конференцияга бириктириңиз."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> колдонуу үчүн мобилдик Интернет күйгүзүлгөнүн текшериңиз. Муну мобилдик тармак жөндөөлөрүнөн өзгөртсөңүз болот."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> колдонуу үчүн мобилдик Интернет жана Интернет-роуминг күйгүзүлгөнүн текшериңиз. Муну мобилдик тармак жөндөөлөрүнөн өзгөртсөңүз болот."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g> колдонуу үчүн <xliff:g id="SIM_NUMBER">%2$d</xliff:g> SIM-картасында мобилдик Интернет күйгүзүлгөнүн текшериңиз. Муну мобилдик тармак жөндөөлөрүнөн өзгөртсөңүз болот."</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index a7b1640..eb89c92 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"ບໍ່ສາມາດໂທອອກໄດ້ເນື່ອງຈາກກຳລັງມີສາຍໂທອອກຢູ່ກ່ອນແລ້ວ."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"ບໍ່ສາມາດໂທອອກໄດ້ເນື່ອງຈາກມີສາຍທີ່ກຳລັງໂທເຂົ້າມາທີ່ຍັງບໍ່ໄດ້ຮັບຢູ່. ກະລຸນາຮັບສາຍ ຫຼື ວາງສາຍທີ່ກຳລັງໂທເຂົ້າມາກ່ອນຈະໂທໃໝ່."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"ບໍ່ສາມາດໂທໄດ້ເນື່ອງຈາກມີການປິດການໂທໂດຍໃຊ້ຄຸນສົມບັດລະບົບ ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"ບໍ່ສາມາດໂທໄດ້ເນື່ອງຈາກມີສອງສາຍກຳລັງໂທຢູ່. ກະລຸນາຕັດການເຊື່ອມຕໍ່ສາຍໃດໜຶ່ງອອກ ຫຼື ຮວມສາຍເປັນການປະຊຸມສາຍກ່ອນໂທໃໝ່."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"ບໍ່ສາມາດໂທໄດ້ເນື່ອງຈາກມີສອງສາຍກຳລັງໂທຢູ່. ກະລຸນາຕັດການເຊື່ອມຕໍ່ສາຍໃດໜຶ່ງອອກ ຫຼື ຮວມສາຍເປັນການປະຊຸມທາງໂທລະສັບກ່ອນໂທໃໝ່."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"ເພື່ອໃຊ້ <xliff:g id="SUPP_SERVICE">%s</xliff:g>, ກະລຸນາກວດສອບວ່າເປີດໃຊ້ອິນເຕີເນັດມືຖືແລ້ວ. ທ່ານສາມາດປ່ຽນໄດ້ໃນການຕັ້ງຄ່າເຄືອຂ່າຍ."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"ເພື່ອໃຊ້ <xliff:g id="SUPP_SERVICE">%s</xliff:g>, ກະລຸນາກວດສອບວ່າເປີດໃຊ້ອິນເຕີເນັດມືຖື ແລະ ການໂຣມມິງອິນເຕີເນັດແລ້ວ. ທ່ານສາມາດປ່ຽນໄດ້ໃນການຕັ້ງຄ່າເຄືອຂ່າຍ."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"ເພື່ອໃຊ້ <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, ກະລຸນາກວດສອບວ່າເປີດໃຊ້ອິນເຕີເນັດມືຖືສຳລັບຊິມ <xliff:g id="SIM_NUMBER">%2$d</xliff:g> ແລ້ວ. ທ່ານສາມາດປ່ຽນໄດ້ໃນການຕັ້ງຄ່າເຄືອຂ່າຍ."</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 44e358f..26622c2 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -833,7 +833,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Negalite skambinti, nes šiuo metu vykdomas kitas siunčiamasis skambutis."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Negalite skambinti, nes yra neatsakytas gaunamasis skambutis. Atsiliepkite arba atmeskite gaunamąjį skambutį prieš pradėdami naują."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Negalite skambinti, nes skambinimo funkcija išjungta naudojant sistemos ypatybę „ro.telephony.disable-call“."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Negalite skambinti, nes jau dalyvaujate dviejuose skambučiuose. Užbaikite vieną iš skambučių arba sujunkite juos į konferenciją prieš pradėdami naują skambutį."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Negalite skambinti, nes jau dalyvaujate dviejuose skambučiuose. Prieš pradėdami naują skambutį užbaikite vieną iš skambučių arba sujunkite juos į konferenciją."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Norėdami naudoti paslaugą (<xliff:g id="SUPP_SERVICE">%s</xliff:g>), įsitikinkite, kad mobiliojo ryšio duomenys įjungti. Tai galite pakeisti apsilankę mobiliojo ryšio tinklo nustatymuose."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Norėdami naudoti paslaugą (<xliff:g id="SUPP_SERVICE">%s</xliff:g>), įsitikinkite, kad mobiliojo ryšio duomenys ir tarptinklinis duomenų ryšys įjungti. Tai galite pakeisti apsilankę mobiliojo ryšio nustatymuose."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Norėdami naudoti paslaugą (<xliff:g id="SUPP_SERVICE">%1$s</xliff:g>0, įsitikinkite, kad <xliff:g id="SIM_NUMBER">%2$d</xliff:g> SIM kortelės mobiliojo ryšio duomenys įjungti. Tai galite pakeisti apsilankę mobiliojo ryšio tinklo nustatymuose."</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 5fe13bb..3a33f77 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -830,7 +830,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Nevar veikt zvanu, jo jau tiek sastādīts numurs citam izejošajam zvanam."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Nevar veikt zvanu, jo ir neatbildēts ienākošais zvans. Pirms jauna zvana veikšanas atbildiet uz ienākošo zvanu vai noraidiet to."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Nevar veikt zvanu, jo zvanīšana ir atspējota, izmantojot sistēmas rekvizītu ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Nevar veikt zvanu, jo pašlaik jau notiek divi zvani. Pirms jauna zvana veikšanas pārtrauciet vienu no pašreizējiem zvaniem vai apvienojiet tos konferences zvanā."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Nevar veikt zvanu, jo pašlaik jau notiek divi zvani. Pirms jauna zvana veikšanas pārtrauciet vienu no pašreizējiem zvaniem vai apvienojiet tos konferences zvanā."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Lai izmantotu pakalpojumu <xliff:g id="SUPP_SERVICE">%s</xliff:g>, jāieslēdz mobilie dati. Tos var ieslēgt mobilā tīkla iestatījumos."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Lai izmantotu pakalpojumu <xliff:g id="SUPP_SERVICE">%s</xliff:g>, jāieslēdz mobilie dati un datu viesabonēšana. Tos var ieslēgt mobilā tīkla iestatījumos."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Lai izmantotu pakalpojumu <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, jāieslēdz mobilie dati SIM kartei <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. Tos var ieslēgt mobilā tīkla iestatījumos."</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index b8f98df..de8c54c 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Не може да се воспостави повик затоа што веќе се бира друг појдовен повик."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Не може да се воспостави повик затоа што има неодговорен дојдовен повик. Одговорете или одбијте го дојдовниот повик пред воспоставувањето на новиот повик."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Не може да се воспостави повик затоа што повикувањето е оневозможено со системското својство ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Не може да се воспостави повик затоа што два повика веќе се во тек. Исклучете го едниот од повиците или спојте ги во конференциски повик пред да воспоставите нов повик."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Не може да се воспостави повик затоа што веќе се во тек два повика. Исклучете го едниот од повиците или спојте ги во конференциски повик пред да воспоставите нов повик."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"За користење <xliff:g id="SUPP_SERVICE">%s</xliff:g>, уверете се дека мобилниот интернет е вклучен. Тоа може да го промените во поставките за мобилна мрежа."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"За користење <xliff:g id="SUPP_SERVICE">%s</xliff:g>, уверете се дека мобилниот интернет и интернет роамингот се вклучени. Овие може да ги промените во поставките за мобилна мрежа."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"За користење <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, уверете се дека мобилниот интернет е вклучен за SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. Тоа може да го промените во поставките за мобилна мрежа."</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 7963e41..3e76079 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"മറ്റൊരു ഔട്ട്ഗോയിംഗ് കോൾ മുമ്പേ തന്നെ ഡയൽ ചെയ്യുന്നതിനാൽ, ഒരു കോൾ നടത്താനാവില്ല."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"മറുപടി ലഭിക്കാത്ത ഒരു ഇൻകമിംഗ് കോൾ ഉള്ളതിനാൽ, ഒരു കോൾ നടത്താനാവില്ല. ഒരു പുതിയ കോൾ നടത്തുന്നതിന് മുൻപായി ഇൻകമിംഗ് കോളിന് മറുപടി നൽകുക അല്ലെങ്കിൽ നിരസിക്കുക."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"ro.telephony.disable-കോൾ സിസ്റ്റം പ്രോപ്പർട്ടി ഉപയോഗിച്ച് കോൾ ചെയ്യൽ പ്രവർത്തനരഹിതമാക്കിയതിനാൽ ഒരു കോൾ നടത്താനാവില്ല."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"മുമ്പേ രണ്ട് കോളുകൾ പുരോഗതിയിൽ ആയതിനാൽ ഒരു പുതിയ കോൾ നടത്താനാവില്ല. ഒരു പുതിയ കോൾ നടത്താനായി, മുമ്പത്തെ കോളുകളിലൊന്ന് വിച്ഛേദിക്കുകയോ അല്ലെങ്കിൽ അവയെ ഒരു കോൺഫറൻസ് കോളിലേക്ക് ലയിപ്പിക്കുകയോ ചെയ്യുക."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"മുമ്പേ തന്നെ രണ്ട് കോളുകൾ പുരോഗതിയിൽ ആയതിനാൽ പുതിയൊരു കോൾ ചെയ്യാനാകില്ല. പുതിയൊരു കോൾ ചെയ്യുന്നതിന് മുമ്പത്തെ കോളുകളിലൊന്ന് വിച്ഛേദിക്കുകയോ അവയെ ഒരു കോൺഫറൻസ് കോളിലേക്ക് ലയിപ്പിക്കുകയോ ചെയ്യുക."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> എന്നത് ഉപയോഗിക്കാൻ, മൊബൈൽ ഡാറ്റ ഓണാണ് എന്ന് ഉറപ്പാക്കുക. നിങ്ങൾക്ക് ഇത് മൊബൈൽ നെറ്റ്വർക്ക് ക്രമീകരണത്തിൽ മാറ്റാം."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> എന്നത് ഉപയോഗിക്കാൻ, നിങ്ങളുടെ മൊബൈൽ ഡാറ്റയും ഡാറ്റ റോമിംഗും ഓണാണ് എന്ന് ഉറപ്പാക്കുക. നിങ്ങൾക്ക് ഇത് മൊബൈൽ നെറ്റ്വർക്ക് ക്രമീകരണത്തിൽ മാറ്റാം."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g> ഉപയോഗിക്കാൻ, SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g> എന്നതിനായി മൊബൈൽ ഡാറ്റ ഓണാണ് എന്ന് ഉറപ്പാക്കുക. നിങ്ങൾക്ക് ഇത് മൊബൈൽ നെറ്റ്വർക്ക് ക്രമീകരണത്തിൽ മാറ്റാം."</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 48ac8c0..48ba7b9 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Өөр залгасан дугаар руу аль хэдийн залгаж байх үед дуудлага хийх боломжгүй."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Хариулаагүй ирсэн дуудлага байх үед дуудлага хийх боломжгүй. Шинэ дуудлага хийхийн өмнө ирсэн дуудлагад хариулах эсвэл татгалзана уу."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"ro.telephony.disable-call системийн өмчийг ашиглан дуудлагыг цуцалсан бол дуудлага хийх боломжгүй."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Аль хэдийн хоёр дуудлага хийж байгаа үед дуудлага хийх боломжгүй. Шинэ дуудлага хийхийн өмнө аль нэг дуудлагыг цуцлах эсвэл хурал болгон нэгтгэнэ үү."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Аль хэдийн хоёр дуудлага хийж байгаа тул дуудлага хийх боломжгүй байна. Шинэ дуудлага хийхийн өмнө аль нэг дуудлагыг салгах эсвэл тэдгээрийг хурал болгож нэгтгэнэ үү."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"<xliff:g id="SUPP_SERVICE">%s</xliff:g>-г ашиглахын тулд мобайл датаг асаасан эсэхээ шалгана уу. Та үүнийг мобайл сүлжээний тохиргоонд өөрчлөх боломжтой."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"<xliff:g id="SUPP_SERVICE">%s</xliff:g>-г ашиглахын тулд мобайл дата болон дата роуминг асаасан эсэхээ шалгана уу. Та эдгээрийг мобайл сүлжээний тохиргоонд өөрчлөх боломжтой."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g>-г ашиглахын тулд SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g>-д мобайл датаг асаасан эсэхээ шалгана уу. Та үүнийг мобайл сүлжээний тохиргоонд өөрчлөх боломжтой."</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 7c788fa..e09af6f 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"दुसरा आउटगोइंग कॉल आधीच डायल होत असल्यामुळे कॉल करू शकत नाही."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"अनुत्तरित इनकमिंग कॉल असल्यामुळे कॉल करू शकत नाही. नवीन कॉल करण्याआधी इनकमिंग कॉलला उत्तर द्या किंवा तो नाकारा."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"ro.telephony.disable-call सिस्टम प्रॉपर्टी वापरून कॉल करणे बंद केले गेल्यामुळे कॉल करू शकत नाही."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"दोन कॉल आधीच प्रगतीपथावर असल्यामुळे कॉल करू शकत नाही. नवीन कॉल करण्याआधी एक कॉल डिस्कनेक्ट करा किंवा त्यांना कॉन्फरंस कॉलमध्ये विलीन करा."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"दोन कॉल आधीच प्रगतीपथावर असल्यामुळे कॉल करू शकत नाही. नवीन कॉल करण्याआधी एक कॉल डिस्कनेक्ट करा किंवा त्यांना कॉंफरन्स कॉलमध्ये मर्ज करा."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> वापरण्यासाठी, मोबाइल डेटा सुरू केलेला आहे याची खात्री करा. तुम्ही हे मोबाइल नेटवर्क सेटिंग्जमध्ये बदलू शकता."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> वापरण्यासाठी, मोबाइल डेटा आणि डेटा रोमिंग सुरू केलेले आहेत याची खात्री करा. तुम्ही हे मोबाइल नेटवर्क सेटिंग्जमध्ये बदलू शकता."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g> वापरण्यासाठी, सिम <xliff:g id="SIM_NUMBER">%2$d</xliff:g> साठी मोबाइल डेटा सुरू केलेला आहे याची खात्री करा. तुम्ही हे मोबाइल नेटवर्क सेटिंग्जमध्ये बदलू शकता."</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 4ddb2e6..e77bb33 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Tidak dapat membuat panggilan kerana panggilan keluar lain sudah pun mendail."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Tidak dapat membuat panggilan kerana terdapat panggilan masuk yang tidak dijawab. Jawab atau tolak panggilan masuk itu sebelum membuat panggilan baharu."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Tidak dapat membuat panggilan kerana panggilan telah dilumpuhkan menggunakan sifat sistem ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Tidak dapat membuat panggilan kerana sudah terdapat dua panggilan yang sedang berlangsung. Putuskan salah satu panggilan itu atau gabungkan panggilan tersebut menjadi panggilan persidangan sebelum membuat panggilan baharu."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Tidak dapat membuat panggilan kerana sudah terdapat dua panggilan yang sedang berlangsung. Putuskan salah satu panggilan itu atau gabungkan panggilan tersebut menjadi panggilan sidang sebelum membuat panggilan baharu."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Untuk menggunakan <xliff:g id="SUPP_SERVICE">%s</xliff:g>, pastikan data mudah alih dihidupkan. Anda boleh menukar tetapan ini dalam tetapan rangkaian mudah alih."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Untuk menggunakan <xliff:g id="SUPP_SERVICE">%s</xliff:g>, pastikan data mudah alih dan perayauan data dihidupkan. Anda boleh menukar tetapan ini dalam tetapan rangkaian mudah alih."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Untuk menggunakan <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, pastikan data mudah alih dihidupkan bagi SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. Anda boleh menukar tetapan ini dalam tetapan rangkaian mudah alih."</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index f34f564..a7657b2 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"အထွက်ခေါ်ဆိုမှု ပြုလုပ်ထားသဖြင့် ဖုန်းထပ်ခေါ်၍ မရနိုင်ပါ။"</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"မဖြေကြားရသေးသော အဝင်ခေါ်ဆိုမှု ရှိနေသဖြင့် ဖုန်းခေါ်၍ မရနိုင်ပါ။ ဖုန်းခေါ်ဆိုမှုအသစ် မပြုလုပ်မီ ဖုန်းကိုင်ပါ (သို့) ငြင်းပယ်ပါ။"</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"ro.telephony.disable-call စနစ် မူပိုင်ခွင့် အသုံးပြုပြီး ခေါ်ဆိုခြင်းကို ပိတ်ထားသဖြင့် ဖုန်းခေါ်၍ မရနိုင်ပါ။"</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"ဖုန်းခေါ်ဆိုမှုနှစ်ခုကို ပြုလုပ်နေဆဲ ဖြစ်သဖြင့် ဖုန်းခေါ်၍ မရနိုင်ပါ။ ခေါ်ဆိုမှုအသစ် မပြုလုပ်မီ ၎င်းတို့ထဲမှ တစ်ခုကို ဖုန်းချပါ (သို့) အဖွဲ့လိုက် ပြောဆိုခြင်းအဖြစ် ပေါင်းစည်းပါ။"</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"ဖုန်းခေါ်ဆိုမှုနှစ်ခုကို ပြုလုပ်နေသဖြင့် ဖုန်းထပ်ခေါ်၍ မရနိုင်ပါ။ ခေါ်ဆိုမှုအသစ် မပြုလုပ်မီ ၎င်းတို့ထဲမှ တစ်ခုကို ဖုန်းချပါ သို့မဟုတ် အဖွဲ့လိုက် ပြောဆိုခြင်းအဖြစ် ပေါင်းစည်းပါ။"</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> အသုံးပြုရန် မိုဘိုင်းဒေတာကို ဖွင့်ထားကြောင်း သေချာပါစေ။ ဤအရာကို မိုဘိုင်းကွန်ရက် ဆက်တင်များတွင် ပြောင်းနိုင်ပါသည်။"</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> အသုံးပြုရန် မိုဘိုင်းဒေတာနှင့် ကွန်ရက်ပြင်ပဒေတာ အသုံးပြုခြင်းတို့ကို ဖွင့်ထားကြောင်း သေချာပါစေ။ ဤအရာများကို မိုဘိုင်းကွန်ရက် ဆက်တင်များတွင် ပြောင်းနိုင်ပါသည်။"</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g> အသုံးပြုရန် ဆင်းမ်ကတ် <xliff:g id="SIM_NUMBER">%2$d</xliff:g> အတွက် မိုဘိုင်းဒေတာကို ဖွင့်ထားကြောင်း သေချာပါစေ။ ဤအရာကို မိုဘိုင်းကွန်ရက် ဆက်တင်များတွင် ပြောင်းနိုင်ပါသည်။"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a16f582..142d1e1 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Du kan ikke ringe fordi telefonen allerede slår nummeret for et annet utgående anrop."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Du kan ikke ringe fordi du ikke har svart på et innkommende anrop. Svar på eller avvis det innkommende anropet før du ringer på nytt."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Du kan ikke ringe fordi anrop er deaktivert ved hjelp av systemegenskapen ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Du kan ikke ringe fordi to andre anrop allerede pågår. Koble fra ett av anropene eller slå dem sammen i en konferansesamtale, før du ringer på nytt."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Du kan ikke ringe fordi to andre anrop allerede pågår. Koble fra ett av anropene eller slå dem sammen i en konferansesamtale, før du ringer på nytt."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Før du bruker <xliff:g id="SUPP_SERVICE">%s</xliff:g>, må du sørge for at mobildata er slått på. Du kan endre dette i mobilnettverksinnstillingene."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Før du bruker <xliff:g id="SUPP_SERVICE">%s</xliff:g>, må du sørge for at mobildata og data-roaming er slått på. Du kan endre dette i mobilnettverksinnstillingene."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Før du bruker <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, må du sørge for at mobildata er slått på for SIM-kortet <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. Du kan endre dette i mobilnettverksinnstillingene."</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index e6d6abc..eb7d885 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"अर्को बहिर्गमन कल पहिले नै डायल भएका हुनाले कल गर्न सकिँदैन।"</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"जवाफ नदिइएको आगमन कल जारी रहेकाले नयाँ कल गर्न सकिँदैन। कुनै नयाँ कल गर्नुअघि आगमन कलको जवाफ दिनुहोस् वा त्यसलाई अस्वीकार गर्नुहोस्।"</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"ro.telephony.disable-call प्रणालीको गुण प्रयोग गरेर कल गर्ने सुविधा असक्षम पारिएको हुनाले कल गर्न सकिँदैन।"</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"पहिले नै दुईवटा कलहरू जारी रहेकाले कुनै नयाँ कल गर्न सकिँदैन। नयाँ कल गर्नुअघि हाल जारी कलहरूमध्ये कुनै एउटा कल विच्छेद गर्नुहोस् वा ती दुवैलाई सम्मेलन कलमा गाभ्नुहोस्।"</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"पहिले नै दुईवटा कलहरू जारी रहेकाले कुनै नयाँ कल गर्न सकिँदैन। नयाँ कल गर्नुअघि हाल जारी कलहरूमध्ये कुनै एउटा कल डिस्कनेक्ट गर्नुहोस् वा ती दुवैलाई सम्मेलन कलमा मर्ज गर्नुहोस्।"</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> प्रयोग गर्न मोबाइल डेटा सक्रिय गरिएको कुरा सुनिश्चित गर्नुहोस्। तपाईं मोबाइल नेटवर्कका सेटिङहरूमा गई यसलाई बदल्न सक्नुहुन्छ।"</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> प्रयोग गर्न मोबाइल डेटा र डेटा रोमिङ सक्रिय गरिएको कुरा सुनिश्चित गर्नुहोस्। तपाईं मोबाइल नेटवर्कका सेटिङहरूमा गई यी कुराहरू बदल्न सक्नुहुन्छ।"</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g> प्रयोग गर्न SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g> मा मोबाइल डेटा सक्रिय गरिएको कुरा सुनिश्चित गर्नुहोस्। तपाईं मोबाइल नेटवर्कका सेटिङहरूमा गई यसलाई बदल्न सक्नुहुन्छ।"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 49e6828..6ff98c6 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Kan gesprek niet plaatsen omdat er al een uitgaand gesprek is gestart."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Kan gesprek niet plaatsen omdat er een niet-beantwoord inkomend gesprek is. Beantwoord of weiger het inkomende gesprek voordat je een nieuw gesprek plaatst."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Kan gesprek niet plaatsen omdat bellen is uitgeschakeld via de systeemeigenschap ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Kan gesprek niet plaatsen omdat er al twee actieve gesprekken zijn. Verbreek de verbinding in een van de gesprekken of voeg ze samen tot een conferencecall voordat je een nieuw gesprek plaatst."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Kan gesprek niet plaatsen omdat er al 2 actieve gesprekken zijn. Verbreek de verbinding in een van de gesprekken of voeg ze samen tot een conferencecall voordat je een nieuw gesprek plaatst."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Als je <xliff:g id="SUPP_SERVICE">%s</xliff:g> wilt gebruiken, zorg je dat je mobiele data hebt ingeschakeld. Je kunt dit wijzigen via de mobiele netwerkinstellingen."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Als je <xliff:g id="SUPP_SERVICE">%s</xliff:g> wilt gebruiken, zorg je dat je mobiele data en dataroaming hebt ingeschakeld. Je kunt dit wijzigen via de mobiele netwerkinstellingen."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Als je <xliff:g id="SUPP_SERVICE">%1$s</xliff:g> wilt gebruiken, zorg je dat je mobiele data hebt ingeschakeld voor sim <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. Je kunt dit wijzigen via de mobiele netwerkinstellingen."</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 2d72708..5211b8c 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"ପୂର୍ବରୁ ଅନ୍ୟ ଏକ ଆଉଟ୍ଗୋଇଂ କଲ୍ ଡାଏଲ୍ କରାଯାଉଥିବା ଯୋଗୁଁ ଏକ କଲ୍ କରିପାରିବେ ନାହିଁ।"</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"ଗୋଟିଏ ଉତ୍ତର ଦିଆଯାଇନଥିବା ଇନ୍କମିଂ କଲ୍ ଯୋଗୁଁ ଅନ୍ୟ ଏକ କଲ୍ କରିପାରିବେ ନାହିଁ । ଏକ ନୂତନ କଲ୍ କରିବା ପୂର୍ବରୁ ଇନ୍କମିଂ କଲ୍ଟିର ଉତ୍ତର ଦିଅନ୍ତୁ କିମ୍ବା ଏହାକୁ ଅଗ୍ରାହ୍ୟ କରନ୍ତୁ।"</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"ro.telephony.disable-call ସିଷ୍ଟମ୍ ଗୁଣର ପ୍ରୟୋଗ କରି କଲ୍ କରିବାର ସୁବିଧାକୁ ଅକ୍ଷମ କରାଯାଇଥିବା ଯୋଗୁଁ ଏକ କଲ୍ କରାଯାଇପାରିବ ନାହିଁ।"</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"ଏକାସଙ୍ଗେ ଦୁଇଟି କଲ୍ ପ୍ରକ୍ରିୟାରେ ଥିବା ଯୋଗୁଁ ଏକ କଲ୍ କରାଯାଇପାରିବ ନାହିଁ। ଏକ ନୂତନ କଲ୍ କରିବା ପୂର୍ବରୁ ଗୋଟିଏ କଲ୍କୁ ବିଚ୍ଛିନ୍ନ କରନ୍ତୁ କିମ୍ବା ଉଭୟ କଲ୍କୁ ଯୋଡ଼ି ଏକ କନ୍ଫରେନସ୍ କଲ୍ରେ ପରିଣତ କରନ୍ତୁ।"</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"ପୂର୍ବରୁ ଦୁଇଟି କଲ୍ ଚାଲୁଥିବା ଯୋଗୁଁ ଆଉ ଏକ କଲ୍ କରାଯାଇପାରିବ ନାହିଁ। ଏକ ନୂଆ କଲ୍ କରିବା ପୂର୍ବରୁ ଗୋଟିଏ କଲ୍ ବିଚ୍ଛିନ୍ନ କରନ୍ତୁ କିମ୍ବା ସେଗୁଡ଼ିକୁ ଏକ କନଫରେନ୍ସ କଲରେ ମର୍ଜ କରନ୍ତୁ।"</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> ବ୍ୟବହାର କରିବାକୁ, ମୋବାଇଲ୍ ଡାଟା ଚାଲୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ। ଆପଣ ଏହାକୁ ମୋବାଇଲ୍ ନେଟ୍ୱର୍କ ସେଟିଂସ୍ରେ ବଦଳାଇପାରିବେ।"</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> ବ୍ୟବହାର କରିବାକୁ, ମୋବାଇଲ୍ ଡାଟା ଏବଂ ଡାଟା ରୋମିଂ ଚାଲୁ ଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ। ଆପଣ ଏହାକୁ ମୋବାଇଲ୍ ନେଟ୍ୱର୍କ ସେଟିଂସ୍ରେ ବଦଳାଇପାରିବେ।"</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g> ବ୍ୟବହାର କରିବାକୁ, ସିମ୍ <xliff:g id="SIM_NUMBER">%2$d</xliff:g>ରେ ମୋବାଇଲ୍ ଡାଟା ଚାଲୁ ଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ। ଆପଣ ଏହାକୁ ମୋବାଇଲ୍ ନେଟ୍ୱର୍କ ସେଟିଂସ୍ରେ ବଦଳାଇପାରିବେ।"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 1ee792c..a63243f 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"ਕਾਲ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ ਕਿਉਂਕਿ ਇੱਕ ਹੋਰ ਆਊਟਗੋਇੰਗ ਕਾਲ ਪਹਿਲਾਂ ਹੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ।"</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"ਕਾਲ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ ਕਿਉਂਕਿ ਇੱਕ ਜਵਾਬ ਨਾ ਦਿੱਤੀ ਗਈ ਇਨਕਮਿੰਗ ਕਾਲ ਪਹਿਲਾਂ ਤੋਂ ਹੀ ਆ ਰਹੀ ਹੈ। ਨਵੀਂ ਕਾਲ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਇਨਕਮਿੰਗ ਕਾਲ ਦਾ ਜਵਾਬ ਦਿਓ ਜਾਂ ਅਸਵੀਕਾਰ ਕਰੋ।"</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"ਕਾਲ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ ਕਿਉਂਕਿ ਕਾਲਿੰਗ ਨੂੰ ro.telephony.disable-call ਸਿਸਟਮ ਪ੍ਰਾਪਰਟੀ ਵਰਤ ਕੇ ਬੰਦ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ।"</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"ਪਹਿਲਾਂ ਤੋਂ ਦੋ ਕਾਲਾਂ ਚਾਲੂ ਹੋਣ ਕਰਕੇ ਕਾਲ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ। ਨਵੀਂ ਕਾਲ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਇੱਕ ਕਾਲ ਨੂੰ ਡਿਸਕਨੈਕਟ ਕਰੋ ਜਾਂ ਦੋਨੋਂ ਕਾਲਾਂ ਨੂੰ ਮਿਲਾ ਕੇ ਕਾਨਫਰੰਸ ਕਾਲ ਵਿੱਚ ਬਦਲੋ।"</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"ਪਹਿਲਾਂ ਤੋਂ ਦੋ ਕਾਲਾਂ ਚਾਲੂ ਹੋਣ ਕਰਕੇ ਕਾਲ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ। ਨਵੀਂ ਕਾਲ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਇੱਕ ਕਾਲ ਨੂੰ ਡਿਸਕਨੈਕਟ ਕਰੋ ਜਾਂ ਦੋਨੋਂ ਕਾਲਾਂ ਨੂੰ ਮਿਲਾ ਕੇ ਕਾਨਫਰੰਸ ਕਾਲ ਵਿੱਚ ਬਦਲੋ।"</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> ਨੂੰ ਵਰਤਣ ਲਈ, ਪੱਕਾ ਕਰੋ ਕਿ ਮੋਬਾਈਲ ਡਾਟਾ ਚਾਲੂ ਹੋਵੇ। ਤੁਸੀਂ ਇਸਨੂੰ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਬਦਲ ਸਕਦੇ ਹੋ।"</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> ਨੂੰ ਵਰਤਣ ਲਈ, ਪੱਕਾ ਕਰੋ ਕਿ ਮੋਬਾਈਲ ਡਾਟਾ ਅਤੇ ਡਾਟਾ ਰੋਮਿੰਗ ਦੋਨੋਂ ਚਾਲੂ ਹੋਣ। ਤੁਸੀਂ ਇਹਨਾਂ ਨੂੰ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਬਦਲ ਸਕਦੇ ਹੋ।"</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g> ਨੂੰ ਵਰਤਣ ਲਈ, ਪੱਕਾ ਕਰੋ ਕਿ ਸਿਮ <xliff:g id="SIM_NUMBER">%2$d</xliff:g> \'ਤੇ ਮੋਬਾਈਲ ਡਾਟਾ ਚਾਲੂ ਹੋਵੇ। ਤੁਸੀਂ ਇਸਨੂੰ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਬਦਲ ਸਕਦੇ ਹੋ।"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ceb9082..f475f5b 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -833,7 +833,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Nie można nawiązać połączenia, ponieważ inne połączenie jest już nawiązywane."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Nie można nawiązać połączenia, ponieważ masz nieodebrane połączenie przychodzące. Odbierz je lub odrzuć przed nawiązaniem nowego."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Nie można nawiązać połączenia, ponieważ ta funkcja została wyłączona przy użyciu właściwości systemowej ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Nie można nawiązać połączenia, ponieważ trwają już dwa inne połączenia. Zakończ jedno z nich lub scal je w połączenie konferencyjne, aby móc nawiązać nowe połączenie."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Nie można nawiązać połączenia, ponieważ trwają już 2 inne połączenia. Aby nawiązać nowe połączenie, zakończ jedno z nich lub scal je w połączenie konferencyjne."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Aby używać usługi <xliff:g id="SUPP_SERVICE">%s</xliff:g>, włącz mobilną transmisję danych w ustawieniach sieci komórkowej."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Aby używać usługi <xliff:g id="SUPP_SERVICE">%s</xliff:g>, włącz mobilną transmisję danych i roaming danych w ustawieniach sieci komórkowej."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Aby używać usługi <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, włącz mobilną transmisję danych dla karty SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g> w ustawieniach sieci komórkowej."</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index db0799d..bed887f 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Não é possível efetuar uma chamada porque já está a ser efetuada outra chamada."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Não pode efetuar uma chamada porque há uma chamada recebida não atendida. Atenda ou rejeite a chamada recebida antes de efetuar uma nova chamada."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Não pode efetuar uma chamada porque as chamadas foram desativadas através da propriedade de sistema ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Não pode efetuar uma chamada porque já estão em curso duas chamadas. Desligue uma das chamadas ou una-as numa conferência antes de efetuar uma nova chamada."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Não pode efetuar uma chamada porque já estão em curso duas chamadas. Desligue uma das chamadas ou una-as numa conferência antes de efetuar uma nova chamada."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Para utilizar o/a <xliff:g id="SUPP_SERVICE">%s</xliff:g>, certifique-se de que os dados móveis estão ativados. Pode alterar esta definição nas definições de rede móvel."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Para utilizar o/a <xliff:g id="SUPP_SERVICE">%s</xliff:g>, certifique-se de que os dados móveis e o roaming de dados estão ativados. Pode alterar estas definições nas definições de rede móvel."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Para utilizar o/a <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, certifique-se de que os dados móveis estão ativados para o SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. Pode alterar esta definição nas definições de rede móvel."</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 4e639eb..a740453 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Não é possível ligar porque há outra chamada sendo realizada."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Não é possível ligar porque há uma chamada recebida que não foi atendida. Atenda ou rejeite essa chamada antes de fazer outra."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Não é possível ligar porque as chamadas foram desativadas pela propriedade \"ro.telephony.disable-call system\"."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Não é possível ligar porque já há duas chamadas em andamento. Encerre uma das chamadas ou mescle-as em uma conferência antes de fazer outra."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Não é possível ligar porque já há duas chamadas em andamento. Encerre uma das chamadas ou mescle-as em uma conferência antes de fazer outra."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Verifique se os dados móveis estão ativados para usar este serviço: <xliff:g id="SUPP_SERVICE">%s</xliff:g>. Você pode alterar essa opção nas configurações da rede móvel."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Verifique se os dados móveis e o roaming de dados estão ativados para usar este serviço: <xliff:g id="SUPP_SERVICE">%s</xliff:g>. Você pode alterar essa opção nas configurações da rede móvel."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Verifique se os dados móveis estão ativados para o SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g> para usar este serviço: <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>. Você pode alterar essa opção nas configurações da rede móvel."</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 326cc52..1de298c 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -830,7 +830,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Nu se poate iniția un apel când se efectuează deja alt apel."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Nu se poate iniția un apel când primiți un apel la care nu ați răspuns. Răspundeți sau respingeți apelul primit înainte de a iniția un apel nou."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Nu se poate iniția un apel deoarece apelarea a fost dezactivată folosindu-se funcția de sistem ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Nu se poate iniția un apel când există deja două apeluri în desfășurare. Deconectați unul dintre ele sau îmbinați-le într-o conferință înainte de a iniția un apel nou."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Nu se poate iniția un apel când există deja două apeluri în desfășurare. Deconectați unul dintre ele sau îmbinați-le într-o conferință înainte de a iniția un apel nou."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Pentru a folosi <xliff:g id="SUPP_SERVICE">%s</xliff:g>, datele mobile trebuie să fie activate. Puteți modifica acest lucru în setările rețelei mobile."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Pentru a folosi <xliff:g id="SUPP_SERVICE">%s</xliff:g>, datele mobile și roamingul de date trebuie să fie activate. Puteți modifica acest lucru în setările rețelei mobile."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Pentru a folosi <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, datele mobile trebuie să fie activate pentru cardul SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. Puteți modifica acest lucru în setările rețelei mobile."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 4a6ee96..e24f8b2 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -833,7 +833,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Невозможно позвонить, поскольку ещё не завершен другой исходящий вызов."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Невозможно позвонить, поскольку вы не ответили на входящий вызов. Примите или отклоните текущий звонок."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Невозможно позвонить, поскольку вызовы запрещены системным свойством ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Невозможно позвонить, поскольку ещё не завершены два текущих вызова. Чтобы начать звонок, сбросьте один из вызовов или объедините их в конференцию."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Невозможно позвонить, поскольку ещё не завершены два текущих вызова. Сбросьте один из вызовов или объедините их в конференцию."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Для работы этого сервиса (<xliff:g id="SUPP_SERVICE">%s</xliff:g>) необходимо подключение к мобильному Интернету. Этот параметр можно изменить в настройках мобильной сети."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Для работы этого сервиса (<xliff:g id="SUPP_SERVICE">%s</xliff:g>) необходимо подключение к мобильному Интернету и интернет-роумингу. Эти параметры можно изменить в настройках мобильной сети."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Для работы этого сервиса (<xliff:g id="SUPP_SERVICE">%1$s</xliff:g>) необходимо подключение к мобильному Интернету через SIM-карту <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. Этот параметр можно изменить в настройках мобильной сети."</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 7efc245..e559c11 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"තවත් යන ඇමතුමක් දැනටමත් ඩයල් කරමින් පවතින නිසා අැමතුමක් ගැනීමට නොහැකිය."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"පිළිතුරු නොදුන් එන ඇමතුමක් තිබෙන නිසා අැමතුමක් ගැනීමට නොහැකිය. නව ඇමතුමක් ගැනීමට පෙර එන අැමතුමට පිළිතුරු දෙන්න නැතහොත් ප්රතික්ෂේප කරන්න."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"ඇමතුම ro.telephony.disable-call පද්ධති ගුණාංගය භාවිතයෙන් ඇමතුම අබල කර ඇති නිසා ඇමතුමක් ගැනීමට නොහැකිය."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"දැනටමත් ඇමතුම් දෙකක් කෙරෙමින් පවතින නිසා ඇමතුමක් ගැනීමට නොහැකිය. නව ඇමතුමක් ගැනීමට පෙරාතුව ඇමතුම්වලින් එකක් විසන්ධි කරන්න නැතහොත් ඒවා සම්මන්ත්රණයකට ඒකාබද්ධ කරන්න."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"දැනටමත් ඇමතුම් දෙකක් කෙරෙමින් පවතින නිසා ඇමතුමක් ගැනීමට නොහැක. නව ඇමතුමක් ගැනීමට පෙරාතුව ඇමතුම්වලින් එකක් විසන්ධි කරන්න නැතහොත් ඒවා සම්මන්ත්රණයකට ඒකාබද්ධ කරන්න."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> භාවිත කිරීමට, ඔබේ ජංගම දත්ත ක්රියාත්මක කර ඇති බව සහතික කර ගන්න. ඔබට මෙය ජංගම ජාල සැකසීම් තුළ වෙනස් කිරීමට හැකිය."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> භාවිත කිරීමට, ජංගම දත්ත සහ දත්ත රෝමිං ක්රියාත්මක කර ඇති බව සහතික කර ගන්න. ඔබට මේවා ජංගම ජාල සැකසීම් තුළ වෙනස් කිරීමට හැකිය."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g> භාවිත කිරීමට, SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g> සඳහා ජංගම දත්ත ක්රියාත්මක කර ඇති බව සහතික කර ගන්න. ඔබට මෙය ජංගම ජාල සැකසීම් තුළ වෙනස් කිරීමට හැකිය."</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 7f9bc94..c3768ab 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -833,7 +833,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Hovor sa nedá uskutočniť, pretože sa už vytáča iný odchádzajúci hovor."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Hovor sa nedá uskutočniť, pretože máte neprijatý prichádzajúci hovor. Prijmite alebo odmietnite prichádzajúci hovor a až potom uskutočnite nový hovor."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Hovor sa nedá uskutočniť, pretože hovory boli zakázané systémovým príkazom ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Hovor sa nedá uskutočniť, pretože už prebiehajú dva hovory. Odpojte jeden hovor alebo ich zlúčte do konferencie a až potom uskutočnite nový hovor."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Hovor sa nedá uskutočniť, pretože už prebiehajú dva hovory. Odpojte jeden hovor alebo ich zlúčte do konferencie a až potom uskutočnite nový hovor."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Ak chcete používať službu <xliff:g id="SUPP_SERVICE">%s</xliff:g>, skontrolujte, či máte zapnuté mobilné dáta. Môžete to zmeniť v nastaveniach mobilnej siete."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Ak chcete používať službu <xliff:g id="SUPP_SERVICE">%s</xliff:g>, skontrolujte, či máte zapnuté mobilné dáta a dátový roaming. Môžete to zmeniť v nastaveniach mobilnej siete."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Ak chcete používať službu <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, skontrolujte, či máte pre SIM kartu <xliff:g id="SIM_NUMBER">%2$d</xliff:g> zapnuté mobilné dáta. Môžete to zmeniť v nastaveniach mobilnej siete."</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 5feb01d..e15d5f9 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -833,7 +833,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Klica ni mogoče opraviti, ker že poteka vzpostavljanje drugega odhodnega klica."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Klica ni mogoče opraviti, ker imate dohodni klic, na katerega še niste odgovorili. Preden začnete z opravljanjem novega klica, sprejmite ali zavrnite dohodni klic."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Klica ni mogoče opraviti, ker je klicanje onemogočeno zaradi sistemske lastnosti ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Klica ni mogoče opraviti, ker potekata že dva klica. Preden začnete z opravljanjem novega klica, prekinite enega od klicev ali ju združite v konferenčni klic."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Klica ni mogoče opraviti, ker potekata že dva klica. Preden začnete nov klic, prekinite enega od klicev ali ju združite v konferenčni klic."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Če želite uporabiti storitev <xliff:g id="SUPP_SERVICE">%s</xliff:g>, najprej preverite, ali je vklopljen prenos podatkov v mobilnem omrežju. To izbiro lahko spremenite v nastavitvah mobilnega omrežja."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Če želite uporabiti storitev <xliff:g id="SUPP_SERVICE">%s</xliff:g>, najprej preverite, ali sta vklopljena prenos podatkov v mobilnem omrežju in podatkovno gostovanje. Ti izbiri lahko spremenite v nastavitvah mobilnega omrežja."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Če želite uporabiti storitev <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, najprej preverite, ali je prenos podatkov v mobilnem omrežju vklopljen za kartico SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. To izbiro lahko spremenite v nastavitvah mobilnega omrežja."</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 8ea15ab..560fc3e 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Nuk mund të kryhet një telefonatë pasi një telefonatë tjetër dalëse është duke u kryer tashmë."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Nuk mund të kryhet një telefonatë sepse është një telefonatë hyrëse që nuk ka marrë përgjigje. Përgjigju ose refuzoje telefonatën hyrëse para se të kryesh një telefonatë të re."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Nuk mund të kryhet një telefonatë sepse telefonata është çaktivizuar duke përdorur vetinë e sistemit ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Nuk mund të kryhet një telefonatë sepse janë tashmë dy telefonata në vazhdim. Shkëput një nga telefonatat ose shkriji ato në një konferencë para se të kryesh një telefonatë të re."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Nuk mund të kryhet një telefonatë sepse janë tashmë dy telefonata në vazhdim. Shkëput një nga telefonatat ose shkriji ato në një konferencë para se të kryesh një telefonatë të re."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Për të përdorur <xliff:g id="SUPP_SERVICE">%s</xliff:g>, sigurohu që të dhënat celulare janë të aktivizuara. Mund ta ndryshosh këtë te cilësimet e rrjetit celular."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Për të përdorur <xliff:g id="SUPP_SERVICE">%s</xliff:g>, sigurohu që të dhënat celulare dhe roaming për të dhënat janë aktivizuar. Mund ta ndryshosh këtë te cilësimet e rrjetit celular."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Për të përdorur <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, sigurohu që të dhënat celulare janë të aktivizuara për kartën SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. Mund ta ndryshosh këtë te cilësimet e rrjetit celular."</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 43633a7..7b49f43 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -830,7 +830,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Не можете да позовете јер се већ упућује други одлазни позив."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Не можете да позовете јер имате долазни позив на који нисте одговорили. Одговорите на долазни позив или га одбијте пре упућивања новог позива."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Не можете да позовете јер је позивање онемогућено преко својства система ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Не можете да позовете јер су два позива већ у току. Прекините један од позива или их обједините у конференцију да бисте упутили нови позив."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Не можете да позовете јер су два позива већ у току. Прекините један од њих или их обједините у конференцију да бисте упутили нови позив."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Да бисте користили <xliff:g id="SUPP_SERVICE">%s</xliff:g>, уверите се да су укључени мобилни подаци. То можете да промените у подешавањима мобилне мреже."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Да бисте користили <xliff:g id="SUPP_SERVICE">%s</xliff:g>, уверите се да су укључени мобилни подаци и пренос података у ромингу. То можете да промените у подешавањима мобилне мреже."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Да бисте користили <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, уверите се да су за SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g> укључени мобилни подаци. То можете да промените у подешавањима мобилне мреже."</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 4c0570d..65376c9 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Det går inte att ringa ett samtal eftersom ett annat utgående samtal ringer upp."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Det går inte att ringa eftersom det finns ett obesvarat inkommande samtal. Svara eller avvisa det innan du ringer ett nytt samtal."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Det går inte att ringa eftersom uppringning har inaktiverats med systemegenskapen ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Det går inte att ringa eftersom det redan finns två pågående samtal. Koppla bort ett eller slå ihop dem till en konferens innan du ringer ett nytt samtal."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Det går inte att ringa eftersom det redan finns två pågående samtal. Koppla bort ett eller slå ihop dem till en konferens innan du ringer ett nytt samtal."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Använd <xliff:g id="SUPP_SERVICE">%s</xliff:g> genom att säkerställa att mobildata är aktiverat. Det går att ändra i inställningarna för mobilt nätverk."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Använd <xliff:g id="SUPP_SERVICE">%s</xliff:g> genom att säkerställa att mobildata och dataroaming är aktiverat. Det går att ändra i inställningarna för mobilt nätverk."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Använd <xliff:g id="SUPP_SERVICE">%1$s</xliff:g> genom att säkerställa att mobildata är aktiverat för SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. Det går att ändra i inställningarna för mobilt nätverk."</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 83727d0..a451ef5 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Haiwezi kupiga simu kwa sababu tayari unapiga simu nyingine."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Haiwezi kupiga simu kwa sababu kuna simu inayoingia ambayo hujajibu. Jibu au ukatae simu hiyo inayoingia kabla ya kupiga simu mpya."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Haiwezi kupiga simu kwa sababu upigaji simu umezuiwa kupitia kipengele cha mfumo cha ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Haiwezi kupiga simu kwa sababu tayari kuna simu mbili zinazoendelea. Kata mojawapo ya simu hizo au uziunganishe ili ziwe mkutano kabla ya kupiga simu mpya."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Haiwezi kupiga simu kwa sababu tayari kuna simu mbili zinazoendelea. Kata mojawapo ya simu hizo au uziunganishe ili ziwe mkutano kabla ya kupiga simu mpya."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Ili uweze kutumia huduma ya <xliff:g id="SUPP_SERVICE">%s</xliff:g>, hakikisha data ya mtandao wa simu imewashwa. Unaweza kubadilisha hali hii katika mipangilio ya mtandao wa simu."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Ili uweze kutumia huduma ya <xliff:g id="SUPP_SERVICE">%s</xliff:g>, hakikisha vipengele vya data ya mtandao wa simu na matumizi ya mitandao ya ng\'ambo vimewashwa. Unaweza kubadilisha hali hizi kwenye mipangilio ya mtandao wa simu."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Ili uweze kutumia huduma ya <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, hakikisha data ya mtandao wa simu imewashwa katika SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. Unaweza kubadilisha hali hii katika mipangilio ya data ya mtandao wa simu."</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 029c5bd..bb99737 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"ஏற்கனவே ஒரு அழைப்பு டயல் ஆகிக்கொண்டிருப்பதால், இந்த அழைப்பைச் செய்ய முடியாது."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"உள்வரும் அழைப்பிற்கு இன்னும் பதிலளிக்காததால், இந்த அழைப்பைச் செய்ய முடியாது. புதிதாக ஒரு அழைப்பைச் செய்வதற்கு முன்னர், உள்வரும் அழைப்பிற்குப் பதிலளிக்கவும் அல்லது நிராகரிக்கவும்."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"ro.telephony.disable-call எனும் சிஸ்டம் பிராப்பர்ட்டியைப் பயன்படுத்தி அழைப்பதற்கான வசதி முடக்கப்பட்டுள்ளதால், இந்த அழைப்பைச் செய்ய முடியாது."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"இரண்டு அழைப்புகள் ஏற்கனவே செயலில் இருப்பதால், இந்த அழைப்பைச் செய்ய முடியாது. புதிதாக ஒரு அழைப்பைச் செய்வதற்கு முன்னர், ஏதாவது ஒரு அழைப்பைத் துண்டிக்கவும் அல்லது அவற்றை இணைத்து குழு அழைப்பாக மாற்றவும்."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"இரண்டு அழைப்புகள் செயலில் இருப்பதால் தற்போது அழைப்பைச் செய்ய முடியாது. அழைப்பைச் செய்ய வேண்டுமெனில், செயலில் உள்ள அழைப்புகளில் ஏதேனும் ஒன்றைத் துண்டிக்கவும் அல்லது அழைப்பதற்கு முன் அவற்றை இணைத்து குழு அழைப்பாக மாற்றவும்."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"<xliff:g id="SUPP_SERVICE">%s</xliff:g>ஐப் பயன்படுத்த, மொபைல் டேட்டா இயக்கத்தில் இருப்பதை உறுதிப்படுத்திக் கொள்ளவும். இதை மொபைல் நெட்வொர்க் அமைப்புகளில் மாற்றலாம்."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"<xliff:g id="SUPP_SERVICE">%s</xliff:g>ஐப் பயன்படுத்த, மொபைல் டேட்டாவும் டேட்டா ரோமிங்கும் இயக்கத்தில் இருப்பதை உறுதிப்படுத்திக் கொள்ளவும். இவற்றை மொபைல் நெட்வொர்க் அமைப்புகளில் மாற்றலாம்."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g>ஐப் பயன்படுத்த, <xliff:g id="SIM_NUMBER">%2$d</xliff:g> சிம்மிற்கான மொபைல் டேட்டா இயக்கத்தில் இருப்பதை உறுதிப்படுத்திக் கொள்ளவும். இதை மொபைல் நெட்வொர்க் அமைப்புகளில் மாற்றலாம்."</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 59b3503..6353cb4 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"ఇంకొక అవుట్గోయింగ్ కాల్ ఇప్పటికే చేస్తున్నందున మరో కాల్ చేయడం సాధ్యపడదు."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"మాట్లాడాల్సిన ఇన్కమింగ్ కాల్ వస్తున్నందున బయటికి కాల్ చేయడం సాధ్యపడదు. కొత్త కాల్ చేయడం కంటే ముందుగా ఇన్కమింగ్ కాల్కి జవాబివ్వండి లేదా కాల్ నిరాకరించండి."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"ro.telephony.disable-call సిస్టమ్ లక్షణాన్ని ఉపయోగించి కాలింగ్ని నిలిపివేసినందున, ఇప్పుడు కాల్ చేయలేరు."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"ఇప్పటికే రెండు కాల్స్ జరుగుతున్నందున కాల్ చేయడం సాధ్యపడదు. ఆ కాల్స్లో ఒకదానిని డిస్కనెక్ట్ చేయండి లేదా అవి రెండింటినీ కలిపి ఒక కాన్ఫరెన్స్ కాల్గా మార్చి, తర్వాత కొత్త కాల్ చేయండి."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"ఇప్పటికే రెండు కాల్స్ జరుగుతున్నందున కాల్ చేయడం సాధ్యపడదు. ఆ కాల్స్లో ఒకదానిని డిస్కనెక్ట్ చేయండి లేదా అవి రెండింటినీ కలిపి ఒక కాన్ఫరెన్స్ కాల్గా మార్చి, తర్వాత కొత్త కాల్ చేయండి."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"<xliff:g id="SUPP_SERVICE">%s</xliff:g>ని ఉపయోగించడానికి, మొబైల్ డేటాను తప్పకుండా ఆన్ చేసారని నిర్ధారించుకోండి. మీరు దీనిని మొబైల్ నెట్వర్క్ సెట్టింగ్లలో మార్చవచ్చు."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"<xliff:g id="SUPP_SERVICE">%s</xliff:g>ని ఉపయోగించడానికి, మొబైల్ డేటా మరియు డేటా రోమింగ్ని తప్పకుండా ఆన్ చేసారని నిర్ధారించుకోండి. మీరు వీటిని మొబైల్ నెట్వర్క్ సెట్టింగ్లలో మార్చవచ్చు."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g>ని ఉపయోగించడానికి, SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g> కోసం మొబైల్ డేటాను తప్పకుండా ఆన్ చేసారని నిర్ధారించుకోండి. మీరు దీనిని మొబైల్ నెట్వర్క్ సెట్టింగ్లలో మార్చవచ్చు."</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index f2e94dd..f1770e1 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"ไม่สามารถโทรออกได้เนื่องจากมีสายโทรออกอยู่แล้ว"</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"ไม่สามารถโทรออกได้เนื่องจากมีสายเรียกเข้าที่ยังไม่ได้รับ รับหรือปฏิเสธสายเรียกเข้าก่อนโทรออกใหม่"</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"ไม่สามารถโทรออกได้เนื่องจากมีการปิดใช้การโทรโดยใช้คุณสมบัติของระบบ ro.telephony.disable-call"</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"ไม่สามารถโทรออกได้เนื่องจากมีการโทรสองสายกำลังดำเนินการอยู่ ตัดการเชื่อมต่อหนึ่งสายหรือรวมเป็นการประชุมสายก่อนโทรออกใหม่"</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"ไม่สามารถโทรออกได้เนื่องจากมีการโทร 2 สายที่กำลังดำเนินอยู่ โปรดยกเลิกการเชื่อมต่อ 1 สายหรือรวมเป็นการประชุมสายก่อนโทรออกใหม่"</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"หากต้องการใช้ <xliff:g id="SUPP_SERVICE">%s</xliff:g> โปรดเปิดเน็ตมือถือ คุณเปลี่ยนตัวเลือกนี้ได้ในการตั้งค่าเครือข่ายมือถือ"</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"หากต้องการใช้ <xliff:g id="SUPP_SERVICE">%s</xliff:g> โปรดเปิดเน็ตมือถือและการโรมมิ่งข้อมูล คุณเปลี่ยนตัวเลือกเหล่านี้ได้ในการตั้งค่าเครือข่ายมือถือ"</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"หากต้องการใช้ <xliff:g id="SUPP_SERVICE">%1$s</xliff:g> โปรดเปิดเน็ตมือถือสำหรับ SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g> คุณเปลี่ยนตัวเลือกนี้ได้ในการตั้งค่าเครือข่ายมือถือ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 495807b..ad41ee0 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Hindi maaaring tumawag dahil mayroon nang dina-dial na isa pang papalabas na tawag."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Hindi maaaring tumawag dahil mayroong hindi nasagot na papasok na tawag. Sagutin o tanggihan ang papasok na tawag bago gumawa ng bagong pagtawag."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Hindi maaaring tumawag dahil na-disable ang pagtawag gamit ang ro.telephony.disable-call na system property."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Hindi maaaring tumawag dahil mayroon nang dalawang tawag na kasalukuyang nagaganap. Idiskonekta ang isa sa mga tawag o i-merge ang mga ito sa isang kumperensya bago gumawa ng bagong pagtawag."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Hindi puwedeng tumawag dahil mayroon nang dalawang tawag na kasalukuyang nagaganap. Idiskonekta ang isa sa mga tawag o i-merge ang mga ito sa isang conference bago gumawa ng bagong pagtawag."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Para gamitin ang <xliff:g id="SUPP_SERVICE">%s</xliff:g>, tiyaking naka-on ang mobile data. Maaari mo itong baguhin sa mga setting ng mobile network."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Para gamitin ang <xliff:g id="SUPP_SERVICE">%s</xliff:g>, tiyaking naka-on ang mobile data at data roaming. Maaari mong baguhin ang mga ito sa mga setting ng mobile network."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Para gamitin ang <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, tiyaking naka-on ang mobile data para sa SIM na <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. Maaari mo itong baguhin sa mga setting ng mobile network."</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 74bb70b..7c18aa0 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Zaten aranmakta olan bir numara olduğu için arama yapılamıyor."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Cevaplanmamış bir gelen arama olduğu için arama yapılamıyor. Yeni bir arama yapmadan önce gelen aramayı cevaplayın veya reddedin."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Telefon etme ro.telephony.disable-call sistem özelliği kullanılarak devre dışı bırakıldığı için arama yapılamıyor."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Devam eden iki arama olduğu için arama yapılamıyor. Yeni bir arama yapmadan önce aramalardan birini sonlandırın veya iki aramayı bir konferans aramasında birleştirin."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Devam eden iki arama olduğu için arama yapılamıyor. Yeni bir arama yapmadan önce aramalardan birini sonlandırın veya iki aramayı bir konferans aramasında birleştirin."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> hizmetini kullanmak için mobil verinin etkin olduğundan emin olun. Bunu mobil ağ ayarlarından değiştirebilirsiniz."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> hizmetini kullanmak için mobil verinin ve veri dolaşımının etkin olduğundan emin olun. Bunları mobil ağ ayarlarından değiştirebilirsiniz."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g> hizmetini kullanmak üzere, <xliff:g id="SIM_NUMBER">%2$d</xliff:g> numaralı SIM için mobil verinin etkin olduğundan emin olun. Bunu mobil ağ ayarlarından değiştirebilirsiniz."</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 92aa4d3..ef594c4 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -833,7 +833,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Неможливо здійснити виклик, оскільки ви вже телефонуєте на інший номер."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Неможливо здійснити виклик. Прийміть або відхиліть вхідний виклик, перш ніж здійснювати новий."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Неможливо здійснити виклик, оскільки дзвінки вимкнено за допомогою системного параметра ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Неможливо здійснити виклик, оскільки наразі вже тривають два виклики. Припиніть один із викликів або з’єднайте їх у конференцію, перш ніж здійснити новий виклик."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Неможливо зателефонувати, оскільки тривають уже два виклики. Припиніть один із них або об’єднайте їх у конференцію, перш ніж здійснити новий."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Щоб використовувати <xliff:g id="SUPP_SERVICE">%s</xliff:g>, потрібно ввімкнути мобільне передавання даних (у налаштуваннях мобільної мережі)."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Щоб використовувати <xliff:g id="SUPP_SERVICE">%s</xliff:g>, потрібно ввімкнути мобільне передавання й роумінг даних (у налаштуваннях мобільної мережі)."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Щоб використовувати <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, потрібно ввімкнути мобільне передавання даних для SIM-карти <xliff:g id="SIM_NUMBER">%2$d</xliff:g> (у налаштуваннях мобільної мережі)."</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 7a5e676..c14e908 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"کال نہیں کی جا سکتی کیونکہ باہر جانے والی دوسری کال پہلے سے ڈائل کی جا رہی ہے۔"</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"ایک جواب نہ ملنے والی اِن کمنگ کال کی وجہ سے کال نہیں کی جا سکتی۔ نئی کال کرنے کے لیے پہلے اِن کمنگ کال کا جواب دیں یا مسترد کریں۔"</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"ro.telephony.disable-call سسٹم کی خصوصیت کے ذریعے کال کرنے کو غیر فعال کر دیے جانے کی وجہ سے کال نہیں کی جا سکتی۔"</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"پہلے سے دو کالز کے پیش رفت میں ہونے کی وجہ سے کال نہیں کی جا سکتی۔ نئی کال کرنے کے لیے پہلے ان میں سے ایک کو غیر منسلک کریں یا انہیں کانفرنس میں ضم کریں۔"</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"پہلے سے دو کالز کے پیش رفت میں ہونے کی وجہ سے کال نہیں کی جا سکتی۔ نئی کال کرنے کیلئے پہلے ان میں سے ایک کو غیر منسلک کریں یا انہیں کانفرنس میں ضم کریں۔"</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> استعمال کرنے کے لیے، یقینی بنائيں کہ موبائل ڈیٹا آن ہے۔ آپ موبائل یٹ ورک کی ترتیبات میں اسے تبدیل کر سکتے ہیں۔"</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> استعمال کرنے کے لیے، یقینی بنائيں کہ موبائل ڈیٹا اور ڈیٹا رومنگ آن ہیں۔ آپ موبائل نیٹ ورک کی ترتیبات میں انہیں تبدیل کر سکتے ہیں۔"</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g> استعمال کرنے کے لیے، یقینی بنائيں کہ موبائل ڈیٹا SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g> کے لیے آن ہے۔ آپ موبائل نیٹ ورک کی ترتیبات میں اسے تبدیل کر سکتے ہیں۔"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index c86c5ee..228407e 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Telefon qilish imkonsiz, chunki siz allaqachon boshqa raqamga telefon qilmoqdasiz."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Telefon qilish imkonsiz. Telefon qilish uchun avval kiruvchi chaqiruvni qabul qiling yoki rad eting."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Telefon qilish imkonsiz, chunki chaqiruvlar ro.telephony.disable-call tizim parametrida faolsizlantirilgan."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Telefon qilish imkonsiz, chunki ayni paytda ikkita chaqiruv davom etmoqda. Telefon qilish uchun chaqiruvlardan birini tugating yoki ularni konferens-aloqaga birlashtiring."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Telefon qilish imkonsiz, chunki ayni paytda ikkita chaqiruv davom etmoqda. Telefon qilish uchun chaqiruvlardan birini yakunlang yoki ularni konferens-aloqaga birlashtiring."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> imkoniyatlaridan foydalanish uchun mobil internet yoqilgan bo‘lishi lozim. Buning uchun mobil tarmoq sozlamalariga kiring."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"<xliff:g id="SUPP_SERVICE">%s</xliff:g> imkoniyatlaridan foydalanish uchun mobil internet va internet rouming yoqilgan bo‘lishi lozim. Buning uchun mobil tarmoq sozlamalariga kiring."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g> imkoniyatlaridan foydalanish uchun <xliff:g id="SIM_NUMBER">%2$d</xliff:g> raqamida mobil internet yoqilgan bo‘lishi lozim. Buning uchun mobil tarmoq sozlamalariga kiring."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index a6d8d20..f65e77e 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Không thể thực hiện cuộc gọi vì đang gọi đi số khác."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Không thể thực hiện cuộc gọi vì chưa trả lời cuộc gọi đến. Hãy trả lời hoặc từ chối cuộc gọi đến trước khi thực hiện cuộc gọi mới."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Không thể thực hiện cuộc gọi vì tính năng gọi điện đã bị tắt bằng cách sử dụng thuộc tính hệ thống ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Không thể thực hiện cuộc gọi vì có 2 cuộc gọi đang diễn ra. Hãy ngắt kết nối một trong các cuộc gọi hoặc gộp thành cuộc gọi kiểu hội nghị trước khi thực hiện cuộc gọi mới."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Không thể gọi điện vì có 2 cuộc gọi đang diễn ra. Hãy ngắt kết nối 1 trong 2 cuộc gọi hoặc gộp thành 1 cuộc gọi kiểu hội nghị truyền hình trước khi thực hiện cuộc gọi mới."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Để sử dụng <xliff:g id="SUPP_SERVICE">%s</xliff:g>, hãy đảm bảo dữ liệu di động đang bật. Bạn có thể thay đổi tùy chọn cài đặt này trong mục cài đặt mạng di động."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Để sử dụng <xliff:g id="SUPP_SERVICE">%s</xliff:g>, hãy đảm bảo dữ liệu di động và tính năng chuyển vùng dữ liệu đang bật. Bạn có thể thay đổi các tùy chọn này trong mục cài đặt mạng di động."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Để sử dụng <xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, hãy đảm bảo dữ liệu di động cho SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g> đang bật. Bạn có thể thay đổi tùy chọn cài đặt này trong mục cài đặt mạng di động."</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 6bcb0a5..8c413e3 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"由于已在拨打另一个电话，因此无法拨打新电话。"</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"由于有未接来电，因此无法拨打电话。请先接听或拒绝来电，然后才能拨打新电话。"</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"通话功能已经由 ro.telephony.disable-call 系统属性停用，因此无法拨打电话。"</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"由于已有两个正在进行的通话，因此无法拨打电话。请先中断其中一个通话或将两个通话合并到同一个会议中，然后才能拨打新电话。"</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"由于已有两个正在进行的通话，因此无法拨打电话。请先断开其中一个通话的连接或将两个通话合并到同一个会议中，然后才能拨打新电话。"</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"要使用<xliff:g id="SUPP_SERVICE">%s</xliff:g>服务，请确保已开启移动数据。您可以在移动网络设置中进行更改。"</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"要使用<xliff:g id="SUPP_SERVICE">%s</xliff:g>服务，请确保已开启移动数据和数据网络漫游。您可以在移动网路设置中进行更改。"</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"要使用<xliff:g id="SUPP_SERVICE">%1$s</xliff:g>服务，请确保已为 SIM (<xliff:g id="SIM_NUMBER">%2$d</xliff:g>) 开启移动数据。您可以在移动网络设置中进行更改。"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 85cedaa..f33583b 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"系統正在撥打另一通電話，因此無法撥打電話。"</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"由於目前有尚未接聽的來電，因此無法撥打電話。請先接聽或拒絕來電，然後再撥打電話。"</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"通話功能已由 ro.telephony.disable-call 系統屬性停用，因此無法撥打電話。"</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"由於目前已有兩個正在進行的通話，因此無法撥打電話。請先中斷其中一個通話，或將兩個通話合併至相同會議，然後再撥打電話。"</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"目前已有兩個通話正在進行，因此無法撥打電話。請先結束其中一個通話，或將兩個通話合併為一個會議，才撥打電話。"</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"如要使用<xliff:g id="SUPP_SERVICE">%s</xliff:g>，請確保流動數據已開啟。您可以在流動網絡設定中變更此設定。"</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"如要使用<xliff:g id="SUPP_SERVICE">%s</xliff:g>，請確保流動數據和數據漫遊已開啟。您可以在流動網絡設定中變更此設定。"</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"如要使用<xliff:g id="SUPP_SERVICE">%1$s</xliff:g>，請確保 SIM 卡 (<xliff:g id="SIM_NUMBER">%2$d</xliff:g>) 的流動數據已開啟。您可以在流動網絡設定中變更此設定。"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 64a54cd..206ae89 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"你正在撥出其他電話，因此無法再撥號。"</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"你尚未接聽來電，因此無法撥打電話。你必須先決定接聽或拒接來電，才能再撥打電話。"</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"通話功能已透過 ro.telephony.disable-call system 屬性停用，因此無法撥打電話。"</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"你目前有兩場正在進行的通話，因此無法撥打電話。你必須掛斷其中一場通話或將通話合併成會議，才能再撥打電話。"</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"目前有兩場正在進行的通話，因此無法撥打電話。你必須掛斷其中一場通話或將通話合併成會議，才能再撥打電話。"</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"如要使用<xliff:g id="SUPP_SERVICE">%s</xliff:g>，請確認行動數據功能已開啟。你可以前往行動網路設定進行變更。"</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"如要使用<xliff:g id="SUPP_SERVICE">%s</xliff:g>，請確認行動數據功能和漫遊服務已開啟。你可以前往行動網路設定進行變更。"</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"如要使用<xliff:g id="SUPP_SERVICE">%1$s</xliff:g>，請確認 SIM 卡 <xliff:g id="SIM_NUMBER">%2$d</xliff:g> 的行動數據功能已開啟。你可以前往行動網路設定進行變更。"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index bcc1562..5425bb1 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -827,7 +827,7 @@
<string name="callFailed_already_dialing" msgid="7250591188960691086">"Ayikwazi ukubeka ikholi njengoba enye ikholi ephumayo isivele iyadayela."</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"Ayikwazi ukubeka ikholi njengoba kunekholi engenayo engaphenduliwe. Phendula noma nqaba ikholi engenayo ngaphambi kokubeka ikholi entsha."</string>
<string name="callFailed_calling_disabled" msgid="5010992739401206283">"Ayikwazi ukubeka ikholi njengoba ukushaya kukhutshaziwe kusetshenziswa isistimu ye-ro.telephony.disable-call."</string>
- <string name="callFailed_too_many_calls" msgid="5379426826618582180">"Ayikwazi ukubeka ikholi njengoba sekuvele kunamakholi amabili aqhubekayo. Nqamula eyodwa yamakholi noma ahlanganise ngaphambi ngaphambi kokubeka ikholi entsha."</string>
+ <string name="callFailed_too_many_calls" msgid="2761754044990799580">"Awukwazi ukubeka ikholi njengoba kunamakholi amabili aqhubekayo kakade. Nqamula eyodwa yamakholi noma wahlanganisele enkofeni ngaphambi kokubeka ikholi entsha."</string>
<string name="supp_service_over_ut_precautions" msgid="2145018231396701311">"Ukuze usebenzise i-<xliff:g id="SUPP_SERVICE">%s</xliff:g>, qiniseka ukuthi idatha yeselula ivuliwe. Ungashintsha lokhu kuzilungiselelo zenethiwekhi yeselula."</string>
<string name="supp_service_over_ut_precautions_roaming" msgid="670342104569972327">"Ukuze usebenzise i-<xliff:g id="SUPP_SERVICE">%s</xliff:g>, qiniseka ukuthi idatha yeselula kanye nokuzula kuvuliwe. Ungashintsha lokhu kuzilungiselelo zenethiwekhi yeselula."</string>
<string name="supp_service_over_ut_precautions_dual_sim" msgid="5166866975550910474">"Ukuze usebenzise i-<xliff:g id="SUPP_SERVICE">%1$s</xliff:g>, qiniseka ukuthi idatha yeselula ivuliwe ku-SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g>. Ungashintsha lokhu kuzilungiselelo zenethiwekhi yeselula."</string>
diff --git a/res/values/config.xml b/res/values/config.xml
index a296254..9f8cc81 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -317,8 +317,4 @@
<!-- The package names which can request thermal mitigation. -->
<string-array name="thermal_mitigation_allowlisted_packages" translatable="false">
</string-array>
-
- <!-- The package name of the app which hosts the
- {@link TelecomManager#ACTION_SHOW_CALL_SETTINGS} settings screen. -->
- <string name="call_settings_package_name">com.android.phone</string>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2077530..6fda189 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1952,7 +1952,7 @@
<string name="callFailed_calling_disabled">Cannot place a call as calling has been disabled using the ro.telephony.disable-call system property.</string>
<!-- In-call screen: error message shown when the user attempts to place a call, but calling has
been disabled using a debug property. -->
- <string name="callFailed_too_many_calls">Cannot place a call a there are already two calls in progress. Disconnect one of the calls or merge them into a conference prior to placing a new call.</string>
+ <string name="callFailed_too_many_calls">Cannot place a call as there are already two calls in progress. Disconnect one of the calls or merge them into a conference prior to placing a new call.</string>
<!-- Message displayed to the user when they attempt to edit options for a supplementary service
(call waiting, call barring, call forwarding, and caller ID), but they are required to
enable mobile data first. -->
diff --git a/sip/src/com/android/services/telephony/sip/SipEditor.java b/sip/src/com/android/services/telephony/sip/SipEditor.java
index dd475e6..9efe5bf 100644
--- a/sip/src/com/android/services/telephony/sip/SipEditor.java
+++ b/sip/src/com/android/services/telephony/sip/SipEditor.java
@@ -16,7 +16,6 @@
package com.android.services.telephony.sip;
-import android.app.AlertDialog;
import android.app.Dialog;
import android.app.DialogFragment;
import android.content.Intent;
@@ -37,6 +36,8 @@
import android.widget.Button;
import android.widget.Toast;
+import com.android.phone.FrameworksUtils;
+
import java.io.IOException;
import java.lang.reflect.Method;
import java.util.Arrays;
@@ -93,7 +94,7 @@
public Dialog onCreateDialog(Bundle savedInstanceState) {
String message = getArguments().getString(KEY_MESSAGE);
- return new AlertDialog.Builder(getActivity())
+ return FrameworksUtils.makeAlertDialogBuilder(getActivity())
.setTitle(android.R.string.dialog_alert_title)
.setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(message)
diff --git a/sip/src/com/android/services/telephony/sip/SipSettings.java b/sip/src/com/android/services/telephony/sip/SipSettings.java
index 813ba51..5137963 100644
--- a/sip/src/com/android/services/telephony/sip/SipSettings.java
+++ b/sip/src/com/android/services/telephony/sip/SipSettings.java
@@ -17,7 +17,6 @@
package com.android.services.telephony.sip;
import android.app.ActionBar;
-import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
@@ -39,6 +38,7 @@
import android.view.Menu;
import android.view.MenuItem;
+import com.android.phone.FrameworksUtils;
import com.android.phone.R;
import java.io.IOException;
@@ -287,7 +287,7 @@
startSipEditor(profile);
return;
}
- new AlertDialog.Builder(this)
+ FrameworksUtils.makeAlertDialogBuilder(this)
.setTitle(R.string.alert_dialog_close)
.setIconAttribute(android.R.attr.alertDialogIcon)
.setPositiveButton(R.string.close_profile,
diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index ec6ea2b..d249fae 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -220,7 +220,7 @@
if (mImsMgr.isEnhanced4gLteModeSettingEnabledByUser()) {
mImsMgr.setVtSetting((boolean) objValue);
} else {
- AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ AlertDialog.Builder builder = FrameworksUtils.makeAlertDialogBuilder(this);
DialogInterface.OnClickListener networkSettingsClickListener =
new Dialog.OnClickListener() {
@Override
diff --git a/src/com/android/phone/CallForwardEditPreference.java b/src/com/android/phone/CallForwardEditPreference.java
index bf296f9..db1c5b4 100644
--- a/src/com/android/phone/CallForwardEditPreference.java
+++ b/src/com/android/phone/CallForwardEditPreference.java
@@ -427,7 +427,8 @@
default: // not reachable
s = getContext().getText(R.string.disable_cfnrc_forbidden);
}
- AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+ AlertDialog.Builder builder =
+ FrameworksUtils.makeAlertDialogBuilder(getContext());
builder.setNeutralButton(R.string.close_dialog, null);
builder.setTitle(getContext()
.getText(R.string.error_updating_title));
@@ -440,7 +441,8 @@
// Handle the fail-to-enable case.
CharSequence s = getContext()
.getText(R.string.registration_cf_forbidden);
- AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+ AlertDialog.Builder builder =
+ FrameworksUtils.makeAlertDialogBuilder(getContext());
builder.setNeutralButton(R.string.close_dialog, null);
builder.setTitle(getContext()
.getText(R.string.error_updating_title));
diff --git a/src/com/android/phone/CallNotifier.java b/src/com/android/phone/CallNotifier.java
index a8ef220..7f61f78 100644
--- a/src/com/android/phone/CallNotifier.java
+++ b/src/com/android/phone/CallNotifier.java
@@ -276,23 +276,10 @@
private int mState;
// The possible tones we can play.
public static final int TONE_NONE = 0;
- public static final int TONE_CALL_WAITING = 1;
- public static final int TONE_BUSY = 2;
- public static final int TONE_CONGESTION = 3;
- public static final int TONE_CALL_ENDED = 4;
public static final int TONE_VOICE_PRIVACY = 5;
- public static final int TONE_REORDER = 6;
- public static final int TONE_INTERCEPT = 7;
- public static final int TONE_CDMA_DROP = 8;
- public static final int TONE_OUT_OF_SERVICE = 9;
- public static final int TONE_REDIAL = 10;
- public static final int TONE_OTA_CALL_END = 11;
- public static final int TONE_UNOBTAINABLE_NUMBER = 13;
// The tone volume relative to other sounds in the stream
- static final int TONE_RELATIVE_VOLUME_EMERGENCY = 100;
static final int TONE_RELATIVE_VOLUME_HIPRI = 80;
- static final int TONE_RELATIVE_VOLUME_LOPRI = 50;
// Buffer time (in msec) to add on to tone timeout value.
// Needed mainly when the timeout value for a tone is the
@@ -320,70 +307,11 @@
int phoneType = mCM.getFgPhone().getPhoneType();
switch (mToneId) {
- case TONE_CALL_WAITING:
- toneType = ToneGenerator.TONE_SUP_CALL_WAITING;
- toneVolume = TONE_RELATIVE_VOLUME_HIPRI;
- // Call waiting tone is stopped by stopTone() method
- toneLengthMillis = Integer.MAX_VALUE - TONE_TIMEOUT_BUFFER;
- break;
- case TONE_BUSY:
- if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
- toneType = ToneGenerator.TONE_CDMA_NETWORK_BUSY_ONE_SHOT;
- toneVolume = TONE_RELATIVE_VOLUME_LOPRI;
- toneLengthMillis = 1000;
- } else if (phoneType == PhoneConstants.PHONE_TYPE_GSM
- || phoneType == PhoneConstants.PHONE_TYPE_SIP
- || phoneType == PhoneConstants.PHONE_TYPE_IMS
- || phoneType == PhoneConstants.PHONE_TYPE_THIRD_PARTY) {
- toneType = ToneGenerator.TONE_SUP_BUSY;
- toneVolume = TONE_RELATIVE_VOLUME_HIPRI;
- toneLengthMillis = 4000;
- } else {
- throw new IllegalStateException("Unexpected phone type: " + phoneType);
- }
- break;
- case TONE_CONGESTION:
- toneType = ToneGenerator.TONE_SUP_CONGESTION;
- toneVolume = TONE_RELATIVE_VOLUME_HIPRI;
- toneLengthMillis = 4000;
- break;
-
- case TONE_CALL_ENDED:
- toneType = ToneGenerator.TONE_PROP_PROMPT;
- toneVolume = TONE_RELATIVE_VOLUME_HIPRI;
- toneLengthMillis = 200;
- break;
case TONE_VOICE_PRIVACY:
toneType = ToneGenerator.TONE_CDMA_ALERT_NETWORK_LITE;
toneVolume = TONE_RELATIVE_VOLUME_HIPRI;
toneLengthMillis = 5000;
break;
- case TONE_REORDER:
- toneType = ToneGenerator.TONE_CDMA_REORDER;
- toneVolume = TONE_RELATIVE_VOLUME_HIPRI;
- toneLengthMillis = 4000;
- break;
- case TONE_INTERCEPT:
- toneType = ToneGenerator.TONE_CDMA_ABBR_INTERCEPT;
- toneVolume = TONE_RELATIVE_VOLUME_LOPRI;
- toneLengthMillis = 500;
- break;
- case TONE_CDMA_DROP:
- case TONE_OUT_OF_SERVICE:
- toneType = ToneGenerator.TONE_CDMA_CALLDROP_LITE;
- toneVolume = TONE_RELATIVE_VOLUME_LOPRI;
- toneLengthMillis = 375;
- break;
- case TONE_REDIAL:
- toneType = ToneGenerator.TONE_CDMA_ALERT_AUTOREDIAL_LITE;
- toneVolume = TONE_RELATIVE_VOLUME_LOPRI;
- toneLengthMillis = 5000;
- break;
- case TONE_UNOBTAINABLE_NUMBER:
- toneType = ToneGenerator.TONE_SUP_ERROR;
- toneVolume = TONE_RELATIVE_VOLUME_HIPRI;
- toneLengthMillis = 4000;
- break;
default:
throw new IllegalArgumentException("Bad toneId: " + mToneId);
}
diff --git a/src/com/android/phone/CallerInfoCache.java b/src/com/android/phone/CallerInfoCache.java
deleted file mode 100644
index 2707c7c..0000000
--- a/src/com/android/phone/CallerInfoCache.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- * Copyright (C) 2012 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.
- */
-
-package com.android.phone;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.os.AsyncTask;
-import android.os.PowerManager;
-import android.os.SystemProperties;
-import android.provider.ContactsContract.CommonDataKinds.Callable;
-import android.provider.ContactsContract.CommonDataKinds.Phone;
-import android.provider.ContactsContract.Data;
-import android.telephony.PhoneNumberUtils;
-import android.util.Log;
-
-import java.util.HashMap;
-import java.util.Map.Entry;
-
-/**
- * Holds "custom ringtone" and "send to voicemail" information for each contact as a fallback of
- * contacts database. The cached information is refreshed periodically and used when database
- * lookup (via ContentResolver) takes longer time than expected.
- *
- * The data inside this class shouldn't be treated as "primary"; they may not reflect the
- * latest information stored in the original database.
- */
-public class CallerInfoCache {
- private static final String LOG_TAG = CallerInfoCache.class.getSimpleName();
- private static final boolean DBG =
- (PhoneGlobals.DBG_LEVEL >= 1) && (SystemProperties.getInt("ro.debuggable", 0) == 1);
-
- /** This must not be set to true when submitting changes. */
- private static final boolean VDBG = false;
-
- public static final int MESSAGE_UPDATE_CACHE = 0;
-
- // Assuming DATA.DATA1 corresponds to Phone.NUMBER and SipAddress.ADDRESS, we just use
- // Data columns as much as we can. One exception: because normalized numbers won't be used in
- // SIP cases, Phone.NORMALIZED_NUMBER is used as is instead of using Data.
- private static final String[] PROJECTION = new String[] {
- Data.DATA1, // 0
- Phone.NORMALIZED_NUMBER, // 1
- Data.CUSTOM_RINGTONE, // 2
- Data.SEND_TO_VOICEMAIL // 3
- };
-
- private static final int INDEX_NUMBER = 0;
- private static final int INDEX_NORMALIZED_NUMBER = 1;
- private static final int INDEX_CUSTOM_RINGTONE = 2;
- private static final int INDEX_SEND_TO_VOICEMAIL = 3;
-
- private static final String SELECTION = "("
- + "(" + Data.CUSTOM_RINGTONE + " IS NOT NULL OR " + Data.SEND_TO_VOICEMAIL + "=1)"
- + " AND " + Data.DATA1 + " IS NOT NULL)";
-
- public static class CacheEntry {
- public final String customRingtone;
- public final boolean sendToVoicemail;
- public CacheEntry(String customRingtone, boolean shouldSendToVoicemail) {
- this.customRingtone = customRingtone;
- this.sendToVoicemail = shouldSendToVoicemail;
- }
-
- @Override
- public String toString() {
- return "ringtone: " + customRingtone + ", " + sendToVoicemail;
- }
- }
-
- private class CacheAsyncTask extends AsyncTask<Void, Void, Void> {
-
- private PowerManager.WakeLock mWakeLock;
-
- /**
- * Call {@link PowerManager.WakeLock#acquire} and call {@link AsyncTask#execute(Object...)},
- * guaranteeing the lock is held during the asynchronous task.
- */
- public void acquireWakeLockAndExecute() {
- // Prepare a separate partial WakeLock than what PhoneApp has so to avoid
- // unnecessary conflict.
- PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
- mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, LOG_TAG);
- mWakeLock.acquire();
- execute();
- }
-
- @Override
- protected Void doInBackground(Void... params) {
- if (DBG) log("Start refreshing cache.");
- refreshCacheEntry();
- return null;
- }
-
- @Override
- protected void onPostExecute(Void result) {
- if (VDBG) log("CacheAsyncTask#onPostExecute()");
- super.onPostExecute(result);
- releaseWakeLock();
- }
-
- @Override
- protected void onCancelled(Void result) {
- if (VDBG) log("CacheAsyncTask#onCanceled()");
- super.onCancelled(result);
- releaseWakeLock();
- }
-
- private void releaseWakeLock() {
- if (mWakeLock != null && mWakeLock.isHeld()) {
- mWakeLock.release();
- }
- }
- }
-
- private final Context mContext;
-
- /**
- * The mapping from number to CacheEntry.
- *
- * The number will be:
- * - last 7 digits of each "normalized phone number when it is for PSTN phone call, or
- * - a full SIP address for SIP call
- *
- * When cache is being refreshed, this whole object will be replaced with a newer object,
- * instead of updating elements inside the object. "volatile" is used to make
- * {@link #getCacheEntry(String)} access to the newer one every time when the object is
- * being replaced.
- */
- private volatile HashMap<String, CacheEntry> mNumberToEntry;
-
- /**
- * Used to remember if the previous task is finished or not. Should be set to null when done.
- */
- private CacheAsyncTask mCacheAsyncTask;
-
- public static CallerInfoCache init(Context context) {
- if (DBG) log("init()");
- CallerInfoCache cache = new CallerInfoCache(context);
- // The first cache should be available ASAP.
- cache.startAsyncCache();
- return cache;
- }
-
- private CallerInfoCache(Context context) {
- mContext = context;
- mNumberToEntry = new HashMap<String, CacheEntry>();
- }
-
- /* package */ void startAsyncCache() {
- if (DBG) log("startAsyncCache");
-
- if (mCacheAsyncTask != null) {
- Log.w(LOG_TAG, "Previous cache task is remaining.");
- mCacheAsyncTask.cancel(true);
- }
- mCacheAsyncTask = new CacheAsyncTask();
- mCacheAsyncTask.acquireWakeLockAndExecute();
- }
-
- private void refreshCacheEntry() {
- if (VDBG) log("refreshCacheEntry() started");
-
- // There's no way to know which part of the database was updated. Also we don't want
- // to block incoming calls asking for the cache. So this method just does full query
- // and replaces the older cache with newer one. To refrain from blocking incoming calls,
- // it keeps older one as much as it can, and replaces it with newer one inside a very small
- // synchronized block.
-
- Cursor cursor = null;
- try {
- cursor = mContext.getContentResolver().query(Callable.CONTENT_URI,
- PROJECTION, SELECTION, null, null);
- if (cursor != null) {
- // We don't want to block real in-coming call, so prepare a completely fresh
- // cache here again, and replace it with older one.
- final HashMap<String, CacheEntry> newNumberToEntry =
- new HashMap<String, CacheEntry>(cursor.getCount());
-
- while (cursor.moveToNext()) {
- final String number = cursor.getString(INDEX_NUMBER);
- String normalizedNumber = cursor.getString(INDEX_NORMALIZED_NUMBER);
- if (normalizedNumber == null) {
- // There's no guarantee normalized numbers are available every time and
- // it may become null sometimes. Try formatting the original number.
- normalizedNumber = PhoneNumberUtils.normalizeNumber(number);
- }
- final String customRingtone = cursor.getString(INDEX_CUSTOM_RINGTONE);
- final boolean sendToVoicemail = cursor.getInt(INDEX_SEND_TO_VOICEMAIL) == 1;
-
- if (PhoneNumberUtils.isUriNumber(number)) {
- // SIP address case
- putNewEntryWhenAppropriate(
- newNumberToEntry, number, customRingtone, sendToVoicemail);
- } else {
- // PSTN number case
- // Each normalized number may or may not have full content of the number.
- // Contacts database may contain +15001234567 while a dialed number may be
- // just 5001234567. Also we may have inappropriate country
- // code in some cases (e.g. when the location of the device is inconsistent
- // with the device's place). So to avoid confusion we just rely on the last
- // 7 digits here. It may cause some kind of wrong behavior, which is
- // unavoidable anyway in very rare cases..
- final int length = normalizedNumber.length();
- final String key = length > 7
- ? normalizedNumber.substring(length - 7, length)
- : normalizedNumber;
- putNewEntryWhenAppropriate(
- newNumberToEntry, key, customRingtone, sendToVoicemail);
- }
- }
-
- if (VDBG) {
- Log.d(LOG_TAG, "New cache size: " + newNumberToEntry.size());
- for (Entry<String, CacheEntry> entry : newNumberToEntry.entrySet()) {
- Log.d(LOG_TAG, "Number: " + entry.getKey() + " -> " + entry.getValue());
- }
- }
-
- mNumberToEntry = newNumberToEntry;
-
- if (DBG) {
- log("Caching entries are done. Total: " + newNumberToEntry.size());
- }
- } else {
- // Let's just wait for the next refresh..
- //
- // If the cursor became null at that exact moment, probably we don't want to
- // drop old cache. Also the case is fairly rare in usual cases unless acore being
- // killed, so we don't take care much of this case.
- Log.w(LOG_TAG, "cursor is null");
- }
- } finally {
- if (cursor != null) {
- cursor.close();
- }
- }
-
- if (VDBG) log("refreshCacheEntry() ended");
- }
-
- private void putNewEntryWhenAppropriate(HashMap<String, CacheEntry> newNumberToEntry,
- String numberOrSipAddress, String customRingtone, boolean sendToVoicemail) {
- if (newNumberToEntry.containsKey(numberOrSipAddress)) {
- // There may be duplicate entries here and we should prioritize
- // "send-to-voicemail" flag in any case.
- final CacheEntry entry = newNumberToEntry.get(numberOrSipAddress);
- if (!entry.sendToVoicemail && sendToVoicemail) {
- newNumberToEntry.put(numberOrSipAddress,
- new CacheEntry(customRingtone, sendToVoicemail));
- }
- } else {
- newNumberToEntry.put(numberOrSipAddress,
- new CacheEntry(customRingtone, sendToVoicemail));
- }
- }
-
- /**
- * Returns CacheEntry for the given number (PSTN number or SIP address).
- *
- * @param number OK to be unformatted.
- * @return CacheEntry to be used. Maybe null if there's no cache here. Note that this may
- * return null when the cache itself is not ready. BE CAREFUL. (or might be better to throw
- * an exception)
- */
- public CacheEntry getCacheEntry(String number) {
- if (mNumberToEntry == null) {
- // Very unusual state. This implies the cache isn't ready during the request, while
- // it should be prepared on the boot time (i.e. a way before even the first request).
- Log.w(LOG_TAG, "Fallback cache isn't ready.");
- return null;
- }
-
- CacheEntry entry;
- if (PhoneNumberUtils.isUriNumber(number)) {
- if (VDBG) log("Trying to lookup " + number);
-
- entry = mNumberToEntry.get(number);
- } else {
- final String normalizedNumber = PhoneNumberUtils.normalizeNumber(number);
- final int length = normalizedNumber.length();
- final String key =
- (length > 7 ? normalizedNumber.substring(length - 7, length)
- : normalizedNumber);
- if (VDBG) log("Trying to lookup " + key);
-
- entry = mNumberToEntry.get(key);
- }
- if (VDBG) log("Obtained " + entry);
- return entry;
- }
-
- private static void log(String msg) {
- Log.d(LOG_TAG, msg);
- }
-}
diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index a463243..8df411b 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -65,6 +65,7 @@
import com.android.internal.telephony.TelephonyPermissions;
import com.android.internal.telephony.util.ArrayUtils;
import com.android.internal.util.IndentingPrintWriter;
+import com.android.telephony.Rlog;
import java.io.File;
import java.io.FileDescriptor;
@@ -107,10 +108,6 @@
private CarrierServiceConnection[] mServiceConnection;
// Service connection for binding to carrier config app for no SIM config.
private CarrierServiceConnection[] mServiceConnectionForNoSimConfig;
- // Whether we are bound to a service for each phone
- private boolean[] mServiceBound;
- // Whether we are bound to a service for no SIM config
- private boolean[] mServiceBoundForNoSimConfig;
// Whether we have sent config change broadcast for each phone id.
private boolean[] mHasSentConfigChange;
// Whether the broadcast was sent from EVENT_SYSTEM_UNLOCKED, to track rebroadcasts
@@ -311,7 +308,7 @@
final CarrierServiceConnection conn = (CarrierServiceConnection) msg.obj;
// If new service connection has been created, unbind.
if (mServiceConnection[phoneId] != conn || conn.service == null) {
- unbindIfBound(mContext, conn, phoneId);
+ unbindIfBound(mContext, conn);
break;
}
final CarrierIdentifier carrierId = getCarrierIdentifierForPhoneId(phoneId);
@@ -320,7 +317,7 @@
new ResultReceiver(this) {
@Override
public void onReceiveResult(int resultCode, Bundle resultData) {
- unbindIfBound(mContext, conn, phoneId);
+ unbindIfBound(mContext, conn);
removeMessages(EVENT_FETCH_DEFAULT_TIMEOUT,
getMessageToken(phoneId));
// If new service connection has been created, this is stale.
@@ -355,7 +352,7 @@
} catch (RemoteException e) {
loge("Failed to get carrier config from default app: " +
mPlatformCarrierConfigPackage + " err: " + e.toString());
- unbindIfBound(mContext, conn, phoneId);
+ unbindIfBound(mContext, conn);
break; // So we don't set a timeout.
}
sendMessageDelayed(
@@ -375,7 +372,7 @@
if (mServiceConnection[phoneId] != null) {
// If a ResponseReceiver callback is in the queue when this happens, we will
// unbind twice and throw an exception.
- unbindIfBound(mContext, mServiceConnection[phoneId], phoneId);
+ unbindIfBound(mContext, mServiceConnection[phoneId]);
broadcastConfigChangedIntent(phoneId);
}
// Put a stub bundle in place so that the rest of the logic continues smoothly.
@@ -441,7 +438,7 @@
final CarrierServiceConnection conn = (CarrierServiceConnection) msg.obj;
// If new service connection has been created, unbind.
if (mServiceConnection[phoneId] != conn || conn.service == null) {
- unbindIfBound(mContext, conn, phoneId);
+ unbindIfBound(mContext, conn);
break;
}
final CarrierIdentifier carrierId = getCarrierIdentifierForPhoneId(phoneId);
@@ -450,7 +447,7 @@
new ResultReceiver(this) {
@Override
public void onReceiveResult(int resultCode, Bundle resultData) {
- unbindIfBound(mContext, conn, phoneId);
+ unbindIfBound(mContext, conn);
removeMessages(EVENT_FETCH_CARRIER_TIMEOUT,
getMessageToken(phoneId));
// If new service connection has been created, this is stale.
@@ -494,7 +491,7 @@
+ " carrierid: " + carrierId.toString());
} catch (RemoteException e) {
loge("Failed to get carrier config: " + e.toString());
- unbindIfBound(mContext, conn, phoneId);
+ unbindIfBound(mContext, conn);
break; // So we don't set a timeout.
}
sendMessageDelayed(
@@ -515,7 +512,7 @@
if (mServiceConnection[phoneId] != null) {
// If a ResponseReceiver callback is in the queue when this happens, we will
// unbind twice and throw an exception.
- unbindIfBound(mContext, mServiceConnection[phoneId], phoneId);
+ unbindIfBound(mContext, mServiceConnection[phoneId]);
broadcastConfigChangedIntent(phoneId);
}
// Put a stub bundle in place so that the rest of the logic continues smoothly.
@@ -609,8 +606,7 @@
if (mServiceConnectionForNoSimConfig[phoneId] != null) {
// If a ResponseReceiver callback is in the queue when this happens, we will
// unbind twice and throw an exception.
- unbindIfBoundForNoSimConfig(mContext,
- mServiceConnectionForNoSimConfig[phoneId], phoneId);
+ unbindIfBound(mContext, mServiceConnectionForNoSimConfig[phoneId]);
}
broadcastConfigChangedIntent(phoneId, false);
break;
@@ -621,7 +617,7 @@
final CarrierServiceConnection conn = (CarrierServiceConnection) msg.obj;
// If new service connection has been created, unbind.
if (mServiceConnectionForNoSimConfig[phoneId] != conn || conn.service == null) {
- unbindIfBoundForNoSimConfig(mContext, conn, phoneId);
+ unbindIfBound(mContext, conn);
break;
}
@@ -630,7 +626,7 @@
new ResultReceiver(this) {
@Override
public void onReceiveResult(int resultCode, Bundle resultData) {
- unbindIfBoundForNoSimConfig(mContext, conn, phoneId);
+ unbindIfBound(mContext, conn);
// If new service connection has been created, this is stale.
if (mServiceConnectionForNoSimConfig[phoneId] != conn) {
loge("Received response for stale request.");
@@ -662,7 +658,7 @@
} catch (RemoteException e) {
loge("Failed to get no sim carrier config from default app: " +
mPlatformCarrierConfigPackage + " err: " + e.toString());
- unbindIfBoundForNoSimConfig(mContext, conn, phoneId);
+ unbindIfBound(mContext, conn);
break; // So we don't set a timeout.
}
sendMessageDelayed(
@@ -709,11 +705,9 @@
mOverrideConfigs = new PersistableBundle[numPhones];
mNoSimConfig = new PersistableBundle();
mServiceConnection = new CarrierServiceConnection[numPhones];
- mServiceBound = new boolean[numPhones];
mHasSentConfigChange = new boolean[numPhones];
mFromSystemUnlocked = new boolean[numPhones];
mServiceConnectionForNoSimConfig = new CarrierServiceConnection[numPhones];
- mServiceBoundForNoSimConfig = new boolean[numPhones];
logd("CarrierConfigLoader has started");
mSubscriptionInfoUpdater = subscriptionInfoUpdater;
mHandler.sendEmptyMessage(EVENT_CHECK_SYSTEM_UPDATE);
@@ -848,11 +842,7 @@
try {
if (mContext.bindService(carrierService, serviceConnection,
Context.BIND_AUTO_CREATE)) {
- if (eventId == EVENT_CONNECTED_TO_DEFAULT_FOR_NO_SIM_CONFIG) {
- mServiceBoundForNoSimConfig[phoneId] = true;
- } else {
- mServiceBound[phoneId] = true;
- }
+ serviceConnection.isBound = true;
return true;
} else {
return false;
@@ -1064,6 +1054,7 @@
}
String fileName;
+ String iccid = null;
if (isNoSimConfig) {
fileName = getFilenameForNoSimConfig(packageName);
} else {
@@ -1073,7 +1064,7 @@
return null;
}
- final String iccid = getIccIdForPhoneId(phoneId);
+ iccid = getIccIdForPhoneId(phoneId);
final int cid = getSpecificCarrierIdForPhoneId(phoneId);
if (iccid == null) {
loge("Cannot restore config with null iccid.");
@@ -1102,7 +1093,15 @@
} catch (FileNotFoundException e) {
// Missing file is normal occurrence that might occur with a new sim or when restoring
// an override file during boot and should not be treated as an error.
- if (file != null) logd("File not found: " + file.getPath());
+ if (file != null) {
+ if (isNoSimConfig) {
+ logd("File not found: " + file.getPath());
+ } else {
+ String filePath = file.getPath();
+ filePath = getFilePathForLogging(filePath, iccid);
+ logd("File not found : " + filePath);
+ }
+ }
} catch (IOException e) {
loge(e.toString());
}
@@ -1110,6 +1109,22 @@
return restoredBundle;
}
+ /**
+ * This method will mask most part of iccid in the filepath for logging on userbuild
+ */
+ private String getFilePathForLogging(String filePath, String iccid) {
+ // If loggable then return with actual file path
+ if (Rlog.isLoggable(LOG_TAG, Log.VERBOSE)) {
+ return filePath;
+ }
+ String path = filePath;
+ int length = (iccid != null) ? iccid.length() : 0;
+ if (length > 5 && filePath != null) {
+ path = filePath.replace(iccid.substring(5), "***************");
+ }
+ return path;
+ }
+
private PersistableBundle restoreConfigFromXml(String packageName, @NonNull String extraString,
int phoneId) {
return restoreConfigFromXml(packageName, extraString, phoneId, false);
@@ -1369,18 +1384,9 @@
return mOverrideConfigs[phoneId];
}
- private void unbindIfBound(Context context, CarrierServiceConnection conn,
- int phoneId) {
- if (mServiceBound[phoneId]) {
- mServiceBound[phoneId] = false;
- context.unbindService(conn);
- }
- }
-
- private void unbindIfBoundForNoSimConfig(Context context, CarrierServiceConnection conn,
- int phoneId) {
- if (mServiceBoundForNoSimConfig[phoneId]) {
- mServiceBoundForNoSimConfig[phoneId] = false;
+ private void unbindIfBound(Context context, CarrierServiceConnection conn) {
+ if (conn.isBound) {
+ conn.isBound = false;
context.unbindService(conn);
}
}
@@ -1605,11 +1611,15 @@
final String pkgName;
final int eventId;
IBinder service;
+ // If bindService was called and return true which means unbindService
+ // must be called later to release the connection
+ boolean isBound;
CarrierServiceConnection(int phoneId, String pkgName, int eventId) {
this.phoneId = phoneId;
this.pkgName = pkgName;
this.eventId = eventId;
+ this.isBound = false;
}
@Override
diff --git a/src/com/android/phone/CdmaCallWaitingPreference.java b/src/com/android/phone/CdmaCallWaitingPreference.java
index 3713b19..6ff47d2 100644
--- a/src/com/android/phone/CdmaCallWaitingPreference.java
+++ b/src/com/android/phone/CdmaCallWaitingPreference.java
@@ -78,7 +78,7 @@
public void onClick() {
super.onClick();
- AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
+ AlertDialog.Builder builder = FrameworksUtils.makeAlertDialogBuilder(mContext);
builder.setTitle(mContext.getText(R.string.cdma_call_waiting));
builder.setMessage(mContext.getText(R.string.enable_cdma_call_waiting_setting));
builder.setPositiveButton(R.string.enable_cdma_cw, new DialogInterface.OnClickListener() {
diff --git a/src/com/android/phone/ChangeIccPinScreen.java b/src/com/android/phone/ChangeIccPinScreen.java
index 70bf431..5369aa3 100644
--- a/src/com/android/phone/ChangeIccPinScreen.java
+++ b/src/com/android/phone/ChangeIccPinScreen.java
@@ -277,7 +277,7 @@
private AlertDialog mPUKAlert;
private void displayPUKAlert () {
if (mPUKAlert == null) {
- mPUKAlert = new AlertDialog.Builder(this)
+ mPUKAlert = FrameworksUtils.makeAlertDialogBuilder(this)
.setMessage (R.string.puk_requested)
.setCancelable(false)
.show();
diff --git a/src/com/android/phone/FrameworksUtils.java b/src/com/android/phone/FrameworksUtils.java
new file mode 100644
index 0000000..dcf10bd
--- /dev/null
+++ b/src/com/android/phone/FrameworksUtils.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2021 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.
+ */
+
+package com.android.phone;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.res.Configuration;
+
+/**
+ * This class provides utility functions over framework APIs
+ */
+public class FrameworksUtils {
+ /**
+ * Create a new instance of {@link AlertDialog.Builder}.
+ * @param context reference to a Context
+ * @return an instance of AlertDialog.Builder
+ */
+ public static AlertDialog.Builder makeAlertDialogBuilder(Context context) {
+ boolean isDarkTheme = (context.getResources().getConfiguration().uiMode
+ & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;
+ return new AlertDialog.Builder(context, isDarkTheme
+ ? android.R.style.Theme_DeviceDefault_Dialog_Alert : 0);
+ }
+}
diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index fb45f4c..f2641a1 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -567,8 +567,6 @@
Intent intent = new Intent(TelecomManager.ACTION_SHOW_CALL_SETTINGS);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
- intent.setPackage(mContext.getResources().getString(
- R.string.call_settings_package_name));
SubscriptionInfoHelper.addExtrasToIntent(
intent, mSubscriptionManager.getActiveSubscriptionInfo(subId));
builder.setContentIntent(PendingIntent.getActivity(mContext, subId /* requestCode */,
diff --git a/src/com/android/phone/PhoneDisplayMessage.java b/src/com/android/phone/PhoneDisplayMessage.java
index 199fbb8..be7fc7f 100644
--- a/src/com/android/phone/PhoneDisplayMessage.java
+++ b/src/com/android/phone/PhoneDisplayMessage.java
@@ -68,7 +68,7 @@
// displaying system alert dialog on the screen instead of
// using another activity to display the message. This
// places the message at the forefront of the UI.
- sDisplayMessageDialog = new AlertDialog.Builder(context)
+ sDisplayMessageDialog = FrameworksUtils.makeAlertDialogBuilder(context)
.setIcon(android.R.drawable.ic_dialog_info)
.setTitle(title)
.setMessage(msg)
diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index 2535365..23cbaac 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -74,6 +74,7 @@
import com.android.internal.telephony.imsphone.ImsPhone;
import com.android.internal.telephony.imsphone.ImsPhoneCallTracker;
import com.android.internal.telephony.uicc.UiccCard;
+import com.android.internal.telephony.uicc.UiccPort;
import com.android.internal.telephony.uicc.UiccProfile;
import com.android.internal.util.IndentingPrintWriter;
import com.android.phone.settings.SettingsConstants;
@@ -155,7 +156,6 @@
CallManager mCM;
CallNotifier notifier;
- CallerInfoCache callerInfoCache;
NotificationMgr notificationMgr;
TelephonyRcsService mTelephonyRcsService;
public PhoneInterfaceManager phoneMgr;
@@ -242,13 +242,13 @@
// if passed in subType is unknown, retrieve it here.
if (subType == -1) {
- final UiccCard uiccCard = phone.getUiccCard();
- if (uiccCard == null) {
+ final UiccPort uiccPort = phone.getUiccPort();
+ if (uiccPort == null) {
Log.e(LOG_TAG,
- "handleSimLock: uiccCard for phone " + phone.getPhoneId() + " is null");
+ "handleSimLock: uiccPort for phone " + phone.getPhoneId() + " is null");
return;
}
- final UiccProfile uiccProfile = uiccCard.getUiccProfile();
+ final UiccProfile uiccProfile = uiccPort.getUiccProfile();
if (uiccProfile == null) {
Log.e(LOG_TAG,
"handleSimLock: uiccProfile for phone " + phone.getPhoneId() + " is null");
@@ -458,12 +458,6 @@
mKeyguardManager = (KeyguardManager) getSystemService(Context.KEYGUARD_SERVICE);
- // Create the CallerInfoCache singleton, which remembers custom ring tone and
- // send-to-voicemail settings.
- //
- // The asynchronous caching will start just after this call.
- callerInfoCache = CallerInfoCache.init(this);
-
phoneMgr = PhoneInterfaceManager.init(this);
imsRcsController = ImsRcsController.init(this);
@@ -489,8 +483,12 @@
mCM.registerForMmiComplete(mHandler, MMI_COMPLETE, null);
// Initialize cell status using current airplane mode.
- handleAirplaneModeChange(this, Settings.Global.getInt(getContentResolver(),
- Settings.Global.AIRPLANE_MODE_ON, AIRPLANE_OFF));
+ handleAirplaneModeChange(
+ Settings.Global.getInt(
+ getContentResolver(),
+ Settings.Global.AIRPLANE_MODE_ON,
+ AIRPLANE_OFF)
+ == AIRPLANE_ON);
// Register for misc other intent broadcasts.
IntentFilter intentFilter =
@@ -649,20 +647,20 @@
notifier.updateCallNotifierRegistrationsAfterRadioTechnologyChange();
}
- private void handleAirplaneModeChange(Context context, int newMode) {
- int cellState = Settings.Global.getInt(context.getContentResolver(),
- Settings.Global.CELL_ON, PhoneConstants.CELL_ON_FLAG);
- boolean isAirplaneNewlyOn = (newMode == 1);
+ private void handleAirplaneModeChange(boolean isAirplaneNewlyOn) {
+ int cellState =
+ Settings.Global.getInt(
+ getContentResolver(), Settings.Global.CELL_ON, PhoneConstants.CELL_ON_FLAG);
switch (cellState) {
case PhoneConstants.CELL_OFF_FLAG:
// Airplane mode does not affect the cell radio if user
// has turned it off.
break;
case PhoneConstants.CELL_ON_FLAG:
- maybeTurnCellOff(context, isAirplaneNewlyOn);
+ maybeTurnCellOff(isAirplaneNewlyOn);
break;
case PhoneConstants.CELL_OFF_DUE_TO_AIRPLANE_MODE_FLAG:
- maybeTurnCellOn(context, isAirplaneNewlyOn);
+ maybeTurnCellOn(isAirplaneNewlyOn);
break;
}
for (Phone phone : PhoneFactory.getPhones()) {
@@ -673,57 +671,59 @@
/*
* Returns true if the radio must be turned off when entering airplane mode.
*/
- private boolean isCellOffInAirplaneMode(Context context) {
- String airplaneModeRadios = Settings.Global.getString(context.getContentResolver(),
- Settings.Global.AIRPLANE_MODE_RADIOS);
+ private boolean isCellOffInAirplaneMode() {
+ String airplaneModeRadios =
+ Settings.Global.getString(
+ getContentResolver(), Settings.Global.AIRPLANE_MODE_RADIOS);
return airplaneModeRadios == null
|| airplaneModeRadios.contains(Settings.Global.RADIO_CELL);
}
- private void setRadioPowerOff(Context context) {
+ private void setRadioPowerOff() {
Log.i(LOG_TAG, "Turning radio off - airplane");
- Settings.Global.putInt(context.getContentResolver(), Settings.Global.CELL_ON,
- PhoneConstants.CELL_OFF_DUE_TO_AIRPLANE_MODE_FLAG);
- TelephonyProperties.airplane_mode_on(true); // true means int value 1
+ Settings.Global.putInt(
+ getContentResolver(),
+ Settings.Global.CELL_ON,
+ PhoneConstants.CELL_OFF_DUE_TO_AIRPLANE_MODE_FLAG);
Settings.Global.putInt(getContentResolver(), Settings.Global.ENABLE_CELLULAR_ON_BOOT, 0);
+ TelephonyProperties.airplane_mode_on(true); // true means int value 1
PhoneUtils.setRadioPower(false);
}
- private void setRadioPowerOn(Context context) {
+ private void setRadioPowerOn() {
Log.i(LOG_TAG, "Turning radio on - airplane");
- Settings.Global.putInt(context.getContentResolver(), Settings.Global.CELL_ON,
- PhoneConstants.CELL_ON_FLAG);
- Settings.Global.putInt(getContentResolver(), Settings.Global.ENABLE_CELLULAR_ON_BOOT,
- 1);
+ Settings.Global.putInt(
+ getContentResolver(), Settings.Global.CELL_ON, PhoneConstants.CELL_ON_FLAG);
+ Settings.Global.putInt(getContentResolver(), Settings.Global.ENABLE_CELLULAR_ON_BOOT, 1);
TelephonyProperties.airplane_mode_on(false); // false means int value 0
PhoneUtils.setRadioPower(true);
}
- private void maybeTurnCellOff(Context context, boolean isAirplaneNewlyOn) {
+ private void maybeTurnCellOff(boolean isAirplaneNewlyOn) {
if (isAirplaneNewlyOn) {
// If we are trying to turn off the radio, make sure there are no active
// emergency calls. If there are, switch airplane mode back to off.
- TelecomManager tm = (TelecomManager) context.getSystemService(TELECOM_SERVICE);
+ TelecomManager tm = (TelecomManager) getSystemService(TELECOM_SERVICE);
if (tm != null && tm.isInEmergencyCall()) {
// Switch airplane mode back to off.
ConnectivityManager cm =
- (ConnectivityManager) context.getSystemService(CONNECTIVITY_SERVICE);
+ (ConnectivityManager) getSystemService(CONNECTIVITY_SERVICE);
cm.setAirplaneMode(false);
Toast.makeText(this, R.string.radio_off_during_emergency_call, Toast.LENGTH_LONG)
.show();
Log.i(LOG_TAG, "Ignoring airplane mode: emergency call. Turning airplane off");
- } else if (isCellOffInAirplaneMode(context)) {
- setRadioPowerOff(context);
+ } else if (isCellOffInAirplaneMode()) {
+ setRadioPowerOff();
} else {
Log.i(LOG_TAG, "Ignoring airplane mode: settings prevent cell radio power off");
}
}
}
- private void maybeTurnCellOn(Context context, boolean isAirplaneNewlyOn) {
+ private void maybeTurnCellOn(boolean isAirplaneNewlyOn) {
if (!isAirplaneNewlyOn) {
- setRadioPowerOn(context);
+ setRadioPowerOn();
}
}
@@ -735,13 +735,8 @@
public void onReceive(Context context, Intent intent) {
String action = intent.getAction();
if (action.equals(Intent.ACTION_AIRPLANE_MODE_CHANGED)) {
- int airplaneMode = Settings.Global.getInt(getContentResolver(),
- Settings.Global.AIRPLANE_MODE_ON, AIRPLANE_OFF);
- // Treat any non-OFF values as ON.
- if (airplaneMode != AIRPLANE_OFF) {
- airplaneMode = AIRPLANE_ON;
- }
- handleAirplaneModeChange(context, airplaneMode);
+ boolean airplaneMode = intent.getBooleanExtra("state", false);
+ handleAirplaneModeChange(airplaneMode);
} else if (action.equals(TelephonyIntents.ACTION_SIM_STATE_CHANGED)) {
// re-register as it may be a new IccCard
int phoneId = intent.getIntExtra(PhoneConstants.PHONE_KEY,
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index ba797a3..274b301 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -189,6 +189,7 @@
import com.android.internal.telephony.uicc.UiccCard;
import com.android.internal.telephony.uicc.UiccCardApplication;
import com.android.internal.telephony.uicc.UiccController;
+import com.android.internal.telephony.uicc.UiccPort;
import com.android.internal.telephony.uicc.UiccProfile;
import com.android.internal.telephony.uicc.UiccSlot;
import com.android.internal.telephony.util.LocaleUtils;
@@ -341,6 +342,10 @@
private static final int CMD_GET_SLICING_CONFIG = 110;
private static final int EVENT_GET_SLICING_CONFIG_DONE = 111;
private static final int CMD_ERASE_DATA_SHARED_PREFERENCES = 112;
+ private static final int CMD_ENABLE_VONR = 113;
+ private static final int EVENT_ENABLE_VONR_DONE = 114;
+ private static final int CMD_IS_VONR_ENABLED = 115;
+ private static final int EVENT_IS_VONR_ENABLED_DONE = 116;
// Parameters of select command.
private static final int SELECT_COMMAND = 0xA4;
@@ -499,7 +504,7 @@
MainThreadRequest request;
Message onCompleted;
AsyncResult ar;
- UiccCard uiccCard;
+ UiccPort uiccPort;
IccAPDUArgument iccArgument;
final Phone defaultPhone = getDefaultPhone();
@@ -549,15 +554,15 @@
case CMD_TRANSMIT_APDU_LOGICAL_CHANNEL:
request = (MainThreadRequest) msg.obj;
iccArgument = (IccAPDUArgument) request.argument;
- uiccCard = getUiccCardFromRequest(request);
- if (uiccCard == null) {
+ uiccPort = getUiccPortFromRequest(request);
+ if (uiccPort == null) {
loge("iccTransmitApduLogicalChannel: No UICC");
request.result = new IccIoResult(0x6F, 0, (byte[])null);
notifyRequester(request);
} else {
onCompleted = obtainMessage(EVENT_TRANSMIT_APDU_LOGICAL_CHANNEL_DONE,
request);
- uiccCard.iccTransmitApduLogicalChannel(
+ uiccPort.iccTransmitApduLogicalChannel(
iccArgument.channel, iccArgument.cla, iccArgument.command,
iccArgument.p1, iccArgument.p2, iccArgument.p3, iccArgument.data,
onCompleted);
@@ -586,15 +591,15 @@
case CMD_TRANSMIT_APDU_BASIC_CHANNEL:
request = (MainThreadRequest) msg.obj;
iccArgument = (IccAPDUArgument) request.argument;
- uiccCard = getUiccCardFromRequest(request);
- if (uiccCard == null) {
+ uiccPort = getUiccPortFromRequest(request);
+ if (uiccPort == null) {
loge("iccTransmitApduBasicChannel: No UICC");
request.result = new IccIoResult(0x6F, 0, (byte[])null);
notifyRequester(request);
} else {
onCompleted = obtainMessage(EVENT_TRANSMIT_APDU_BASIC_CHANNEL_DONE,
request);
- uiccCard.iccTransmitApduBasicChannel(
+ uiccPort.iccTransmitApduBasicChannel(
iccArgument.cla, iccArgument.command, iccArgument.p1, iccArgument.p2,
iccArgument.p3, iccArgument.data, onCompleted);
}
@@ -622,15 +627,15 @@
case CMD_EXCHANGE_SIM_IO:
request = (MainThreadRequest) msg.obj;
iccArgument = (IccAPDUArgument) request.argument;
- uiccCard = getUiccCardFromRequest(request);
- if (uiccCard == null) {
+ uiccPort = getUiccPortFromRequest(request);
+ if (uiccPort == null) {
loge("iccExchangeSimIO: No UICC");
request.result = new IccIoResult(0x6F, 0, (byte[])null);
notifyRequester(request);
} else {
onCompleted = obtainMessage(EVENT_EXCHANGE_SIM_IO_DONE,
request);
- uiccCard.iccExchangeSimIO(iccArgument.cla, /* fileID */
+ uiccPort.iccExchangeSimIO(iccArgument.cla, /* fileID */
iccArgument.command, iccArgument.p1, iccArgument.p2, iccArgument.p3,
iccArgument.data, onCompleted);
}
@@ -649,14 +654,14 @@
case CMD_SEND_ENVELOPE:
request = (MainThreadRequest) msg.obj;
- uiccCard = getUiccCardFromRequest(request);
- if (uiccCard == null) {
+ uiccPort = getUiccPortFromRequest(request);
+ if (uiccPort == null) {
loge("sendEnvelopeWithStatus: No UICC");
request.result = new IccIoResult(0x6F, 0, (byte[])null);
notifyRequester(request);
} else {
onCompleted = obtainMessage(EVENT_SEND_ENVELOPE_DONE, request);
- uiccCard.sendEnvelopeWithStatus((String)request.argument, onCompleted);
+ uiccPort.sendEnvelopeWithStatus((String)request.argument, onCompleted);
}
break;
@@ -681,16 +686,16 @@
case CMD_OPEN_CHANNEL:
request = (MainThreadRequest) msg.obj;
- uiccCard = getUiccCardFromRequest(request);
+ uiccPort = getUiccPortFromRequest(request);
Pair<String, Integer> openChannelArgs = (Pair<String, Integer>) request.argument;
- if (uiccCard == null) {
+ if (uiccPort == null) {
loge("iccOpenLogicalChannel: No UICC");
request.result = new IccOpenLogicalChannelResponse(-1,
IccOpenLogicalChannelResponse.STATUS_MISSING_RESOURCE, null);
notifyRequester(request);
} else {
onCompleted = obtainMessage(EVENT_OPEN_CHANNEL_DONE, request);
- uiccCard.iccOpenLogicalChannel(openChannelArgs.first,
+ uiccPort.iccOpenLogicalChannel(openChannelArgs.first,
openChannelArgs.second, onCompleted);
}
break;
@@ -738,14 +743,14 @@
case CMD_CLOSE_CHANNEL:
request = (MainThreadRequest) msg.obj;
- uiccCard = getUiccCardFromRequest(request);
- if (uiccCard == null) {
+ uiccPort = getUiccPortFromRequest(request);
+ if (uiccPort == null) {
loge("iccCloseLogicalChannel: No UICC");
request.result = false;
notifyRequester(request);
} else {
onCompleted = obtainMessage(EVENT_CLOSE_CHANNEL_DONE, request);
- uiccCard.iccCloseLogicalChannel((Integer) request.argument, onCompleted);
+ uiccPort.iccCloseLogicalChannel((Integer) request.argument, onCompleted);
}
break;
@@ -834,7 +839,7 @@
} else {
// request.result must be set to something non-null
// for the calling thread to unblock
- if (request.result != null) {
+ if (ar.result != null) {
request.result = ar.result;
} else {
request.result = false;
@@ -851,6 +856,46 @@
notifyRequester(request);
break;
+ case CMD_IS_VONR_ENABLED: {
+ request = (MainThreadRequest) msg.obj;
+ onCompleted = obtainMessage(EVENT_IS_VONR_ENABLED_DONE,
+ request);
+ Phone phone = getPhoneFromRequest(request);
+ if (phone != null) {
+ phone.isVoNrEnabled(onCompleted, request.workSource);
+ } else {
+ loge("isVoNrEnabled: No phone object");
+ request.result = false;
+ notifyRequester(request);
+ }
+ break;
+ }
+
+ case EVENT_IS_VONR_ENABLED_DONE:
+ ar = (AsyncResult) msg.obj;
+ request = (MainThreadRequest) ar.userObj;
+ if (ar.exception == null && ar.result != null) {
+ request.result = ar.result;
+ } else {
+ // request.result must be set to something non-null
+ // for the calling thread to unblock
+ if (ar.result != null) {
+ request.result = ar.result;
+ } else {
+ request.result = false;
+ }
+ if (ar.result == null) {
+ loge("isVoNrEnabled: Empty response");
+ } else if (ar.exception instanceof CommandException) {
+ loge("isVoNrEnabled: CommandException: "
+ + ar.exception);
+ } else {
+ loge("isVoNrEnabled: Unknown exception");
+ }
+ }
+ notifyRequester(request);
+ break;
+
case CMD_ENABLE_NR_DUAL_CONNECTIVITY: {
request = (MainThreadRequest) msg.obj;
onCompleted = obtainMessage(EVENT_ENABLE_NR_DUAL_CONNECTIVITY_DONE, request);
@@ -899,6 +944,49 @@
break;
}
+ case CMD_ENABLE_VONR: {
+ request = (MainThreadRequest) msg.obj;
+ onCompleted = obtainMessage(EVENT_ENABLE_VONR_DONE, request);
+ Phone phone = getPhoneFromRequest(request);
+ if (phone != null) {
+ phone.setVoNrEnabled((boolean) request.argument, onCompleted,
+ request.workSource);
+ } else {
+ loge("setVoNrEnabled: No phone object");
+ request.result =
+ TelephonyManager.ENABLE_VONR_RADIO_NOT_AVAILABLE;
+ notifyRequester(request);
+ }
+ break;
+ }
+
+ case EVENT_ENABLE_VONR_DONE: {
+ ar = (AsyncResult) msg.obj;
+ request = (MainThreadRequest) ar.userObj;
+ if (ar.exception == null) {
+ request.result = TelephonyManager.ENABLE_VONR_SUCCESS;
+ } else {
+ request.result = TelephonyManager.ENABLE_VONR_RADIO_ERROR;
+ if (ar.exception instanceof CommandException) {
+ CommandException.Error error =
+ ((CommandException) (ar.exception)).getCommandError();
+ if (error == CommandException.Error.RADIO_NOT_AVAILABLE) {
+ request.result = TelephonyManager.ENABLE_VONR_RADIO_NOT_AVAILABLE;
+ } else if (error == CommandException.Error.REQUEST_NOT_SUPPORTED) {
+ request.result = TelephonyManager.ENABLE_VONR_REQUEST_NOT_SUPPORTED;
+ } else {
+ request.result = TelephonyManager.ENABLE_VONR_RADIO_ERROR;
+ }
+ loge("setVoNrEnabled" + ": CommandException: "
+ + ar.exception);
+ } else {
+ loge("setVoNrEnabled" + ": Unknown exception");
+ }
+ }
+ notifyRequester(request);
+ break;
+ }
+
case CMD_GET_ALLOWED_NETWORK_TYPES_BITMASK:
request = (MainThreadRequest) msg.obj;
onCompleted = obtainMessage(EVENT_GET_ALLOWED_NETWORK_TYPES_BITMASK_DONE,
@@ -1056,7 +1144,7 @@
request.argument).first;
request.phone.setCallForwardingOption(
callForwardingInfoToSet.isEnabled()
- ? CommandsInterface.CF_ACTION_ENABLE
+ ? CommandsInterface.CF_ACTION_REGISTRATION
: CommandsInterface.CF_ACTION_DISABLE,
callForwardingInfoToSet.getReason(),
callForwardingInfoToSet.getNumber(),
@@ -1374,16 +1462,16 @@
case CMD_GET_FORBIDDEN_PLMNS:
request = (MainThreadRequest) msg.obj;
- uiccCard = getUiccCardFromRequest(request);
- if (uiccCard == null) {
- loge("getForbiddenPlmns() UiccCard is null");
+ uiccPort = getUiccPortFromRequest(request);
+ if (uiccPort == null) {
+ loge("getForbiddenPlmns() UiccPort is null");
request.result = new IllegalArgumentException(
- "getForbiddenPlmns() UiccCard is null");
+ "getForbiddenPlmns() UiccPort is null");
notifyRequester(request);
break;
}
Integer appType = (Integer) request.argument;
- UiccCardApplication uiccApp = uiccCard.getApplicationByType(appType);
+ UiccCardApplication uiccApp = uiccPort.getApplicationByType(appType);
if (uiccApp == null) {
loge("getForbiddenPlmns() no app with specified type -- "
+ appType);
@@ -1679,9 +1767,9 @@
break;
case CMD_SET_FORBIDDEN_PLMNS:
request = (MainThreadRequest) msg.obj;
- uiccCard = getUiccCardFromRequest(request);
- if (uiccCard == null) {
- loge("setForbiddenPlmns: UiccCard is null");
+ uiccPort = getUiccPortFromRequest(request);
+ if (uiccPort == null) {
+ loge("setForbiddenPlmns: UiccPort is null");
request.result = -1;
notifyRequester(request);
break;
@@ -1690,7 +1778,7 @@
(Pair<Integer, List<String>>) request.argument;
appType = setFplmnsArgs.first;
List<String> fplmns = setFplmnsArgs.second;
- uiccApp = uiccCard.getApplicationByType(appType);
+ uiccApp = uiccPort.getApplicationByType(appType);
if (uiccApp == null) {
loge("setForbiddenPlmns: no app with specified type -- " + appType);
request.result = -1;
@@ -1888,7 +1976,7 @@
(Pair<Integer, SignalStrengthUpdateRequest>) request.argument;
onCompleted = obtainMessage(EVENT_SET_SIGNAL_STRENGTH_UPDATE_REQUEST_DONE,
request);
- phone.getServiceStateTracker().setSignalStrengthUpdateRequest(
+ phone.getSignalStrengthController().setSignalStrengthUpdateRequest(
request.subId, pair.first /*callingUid*/,
pair.second /*request*/, onCompleted);
break;
@@ -1916,7 +2004,7 @@
(Pair<Integer, SignalStrengthUpdateRequest>) request.argument;
onCompleted = obtainMessage(EVENT_CLEAR_SIGNAL_STRENGTH_UPDATE_REQUEST_DONE,
request);
- phone.getServiceStateTracker().clearSignalStrengthUpdateRequest(
+ phone.getSignalStrengthController().clearSignalStrengthUpdateRequest(
request.subId, pair.first /*callingUid*/,
pair.second /*request*/, onCompleted);
break;
@@ -1968,7 +2056,8 @@
case CMD_PREPARE_UNATTENDED_REBOOT:
request = (MainThreadRequest) msg.obj;
request.result =
- UiccController.getInstance().getPinStorage().prepareUnattendedReboot();
+ UiccController.getInstance().getPinStorage()
+ .prepareUnattendedReboot(request.workSource);
notifyRequester(request);
break;
@@ -2208,10 +2297,10 @@
? getDefaultPhone() : getPhone(subId);
}
- private UiccCard getUiccCardFromRequest(MainThreadRequest request) {
+ private UiccPort getUiccPortFromRequest(MainThreadRequest request) {
Phone phone = getPhoneFromRequest(request);
return phone == null ? null :
- UiccController.getInstance().getUiccCard(phone.getPhoneId());
+ UiccController.getInstance().getUiccPort(phone.getPhoneId());
}
// returns phone associated with the subId.
@@ -2947,6 +3036,14 @@
@SuppressWarnings("unchecked")
public List<NeighboringCellInfo> getNeighboringCellInfo(String callingPackage,
String callingFeatureId) {
+ try {
+ mApp.getSystemService(AppOpsManager.class)
+ .checkPackage(Binder.getCallingUid(), callingPackage);
+ } catch (SecurityException e) {
+ EventLog.writeEvent(0x534e4554, "190619791", Binder.getCallingUid());
+ throw e;
+ }
+
final int targetSdk = TelephonyPermissions.getTargetSdk(mApp, callingPackage);
if (targetSdk >= android.os.Build.VERSION_CODES.Q) {
throw new SecurityException(
@@ -3126,7 +3223,12 @@
String tac = null;
if (phone != null) {
String imei = phone.getImei();
- tac = imei == null ? null : imei.substring(0, TYPE_ALLOCATION_CODE_LENGTH);
+ try {
+ tac = imei == null ? null : imei.substring(0, TYPE_ALLOCATION_CODE_LENGTH);
+ } catch (IndexOutOfBoundsException e) {
+ Log.e(LOG_TAG, "IMEI length shorter than upper index.");
+ return null;
+ }
}
return tac;
}
@@ -3165,7 +3267,13 @@
String manufacturerCode = null;
if (phone != null) {
String meid = phone.getMeid();
- manufacturerCode = meid == null ? null : meid.substring(0, MANUFACTURER_CODE_LENGTH);
+ try {
+ manufacturerCode =
+ meid == null ? null : meid.substring(0, MANUFACTURER_CODE_LENGTH);
+ } catch (IndexOutOfBoundsException e) {
+ Log.e(LOG_TAG, "MEID length shorter than upper index.");
+ return null;
+ }
}
return manufacturerCode;
}
@@ -6718,14 +6826,14 @@
loge("getCarrierPrivilegeStatus: Invalid subId");
return TelephonyManager.CARRIER_PRIVILEGE_STATUS_NO_ACCESS;
}
- UiccCard card = UiccController.getInstance().getUiccCard(phone.getPhoneId());
- if (card == null) {
+ UiccPort port = UiccController.getInstance().getUiccPort(phone.getPhoneId());
+ if (port == null) {
loge("getCarrierPrivilegeStatus: No UICC");
return TelephonyManager.CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED;
}
return getCarrierPrivilegeStatusFromCarrierConfigRules(
- card.getCarrierPrivilegeStatusForCurrentTransaction(
+ port.getCarrierPrivilegeStatusForCurrentTransaction(
phone.getContext().getPackageManager()), Binder.getCallingUid(), phone);
}
@@ -6756,13 +6864,13 @@
}
int phoneId = SubscriptionManager.getPhoneId(subId);
- UiccCard card = UiccController.getInstance().getUiccCard(phoneId);
- if (card == null) {
+ UiccPort port = UiccController.getInstance().getUiccPort(phoneId);
+ if (port == null) {
loge("checkCarrierPrivilegesForPackage: No UICC on subId " + subId);
return TelephonyManager.CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED;
}
return getCarrierPrivilegeStatusFromCarrierConfigRules(
- card.getCarrierPrivilegeStatus(mApp.getPackageManager(), pkgName),
+ port.getCarrierPrivilegeStatus(mApp.getPackageManager(), pkgName),
getPhone(phoneId), pkgName);
}
@@ -6773,14 +6881,14 @@
return TelephonyManager.CARRIER_PRIVILEGE_STATUS_NO_ACCESS;
int result = TelephonyManager.CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED;
for (int i = 0; i < TelephonyManager.getDefault().getPhoneCount(); i++) {
- UiccCard card = UiccController.getInstance().getUiccCard(i);
- if (card == null) {
+ UiccPort port = UiccController.getInstance().getUiccPort(i);
+ if (port == null) {
// No UICC in that slot.
continue;
}
result = getCarrierPrivilegeStatusFromCarrierConfigRules(
- card.getCarrierPrivilegeStatus(mApp.getPackageManager(), pkgName),
+ port.getCarrierPrivilegeStatus(mApp.getPackageManager(), pkgName),
getPhone(i), pkgName);
if (result == TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {
break;
@@ -6797,12 +6905,12 @@
loge("phoneId " + phoneId + " is not valid.");
return null;
}
- UiccCard card = UiccController.getInstance().getUiccCard(phoneId);
- if (card == null) {
+ UiccPort port = UiccController.getInstance().getUiccPort(phoneId);
+ if (port == null) {
loge("getCarrierPackageNamesForIntentAndPhone: No UICC");
return null ;
}
- return card.getCarrierPackageNamesForIntent(mApp.getPackageManager(), intent);
+ return port.getCarrierPackageNamesForIntent(mApp.getPackageManager(), intent);
}
@Override
@@ -6811,10 +6919,10 @@
PackageManager pm = mApp.getPackageManager();
List<String> privilegedPackages = new ArrayList<>();
List<PackageInfo> packages = null;
- UiccCard card = UiccController.getInstance().getUiccCard(phoneId);
+ UiccPort port = UiccController.getInstance().getUiccPort(phoneId);
// has UICC in that slot.
- if (card != null) {
- if (card.hasCarrierPrivilegeRules()) {
+ if (port != null) {
+ if (port.hasCarrierPrivilegeRules()) {
if (packages == null) {
// Only check packages in user 0 for now
packages = pm.getInstalledPackagesAsUser(
@@ -6826,7 +6934,9 @@
for (int p = packages.size() - 1; p >= 0; p--) {
PackageInfo pkgInfo = packages.get(p);
if (pkgInfo != null && pkgInfo.packageName != null
- && card.getCarrierPrivilegeStatus(pkgInfo)
+ && getCarrierPrivilegeStatusFromCarrierConfigRules(
+ port.getCarrierPrivilegeStatus(pkgInfo),
+ getPhone(phoneId), pkgInfo.packageName)
== TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {
privilegedPackages.add(pkgInfo.packageName);
}
@@ -6855,11 +6965,11 @@
private String getIccId(int subId) {
final Phone phone = getPhone(subId);
- UiccCard card = phone == null ? null : phone.getUiccCard();
- if (card == null) {
+ UiccPort port = phone == null ? null : phone.getUiccPort();
+ if (port == null) {
return null;
}
- String iccId = card.getIccId();
+ String iccId = port.getIccId();
if (TextUtils.isEmpty(iccId)) {
return null;
}
@@ -7516,16 +7626,6 @@
}
@Override
- public int getSubIdForPhoneAccount(PhoneAccount phoneAccount) {
- final long identity = Binder.clearCallingIdentity();
- try {
- return PhoneUtils.getSubIdForPhoneAccount(phoneAccount);
- } finally {
- Binder.restoreCallingIdentity(identity);
- }
- }
-
- @Override
public int getSubIdForPhoneAccountHandle(
PhoneAccountHandle phoneAccountHandle, String callingPackage, String callingFeatureId) {
if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(mApp, getDefaultSubscription(),
@@ -8037,7 +8137,7 @@
}
String aid = null;
try {
- aid = UiccController.getInstance().getUiccCard(phone.getPhoneId())
+ aid = UiccController.getInstance().getUiccPort(phone.getPhoneId())
.getApplicationByType(appType).getAid();
} catch (Exception e) {
Log.e(LOG_TAG, "Not getting aid. Exception ex=" + e);
@@ -8205,6 +8305,53 @@
}
/**
+ * Enable or disable Voice over NR (VoNR)
+ * @param subId the subscription ID that this action applies to.
+ * @param enabled enable or disable VoNR.
+ * @return operation result.
+ */
+ @Override
+ public int setVoNrEnabled(int subId, boolean enabled) {
+ enforceModifyPermission();
+ final Phone phone = getPhone(subId);
+
+ final long identity = Binder.clearCallingIdentity();
+ if (phone == null) {
+ loge("setVoNrEnabled fails with no phone object for subId: " + subId);
+ return TelephonyManager.ENABLE_VONR_RADIO_NOT_AVAILABLE;
+ }
+
+ WorkSource workSource = getWorkSource(Binder.getCallingUid());
+ try {
+ int result = (int) sendRequest(CMD_ENABLE_VONR, enabled, subId,
+ workSource);
+ if (DBG) log("setVoNrEnabled result: " + result);
+ return result;
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+ }
+
+ /**
+ * Is voice over NR enabled
+ * @return true if VoNR is enabled else false
+ */
+ @Override
+ public boolean isVoNrEnabled(int subId) {
+ enforceReadPrivilegedPermission("isVoNrEnabled");
+ WorkSource workSource = getWorkSource(Binder.getCallingUid());
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ boolean isEnabled = (boolean) sendRequest(CMD_IS_VONR_ENABLED,
+ null, subId, workSource);
+ if (DBG) log("isVoNrEnabled: " + isEnabled);
+ return isEnabled;
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+ }
+
+ /**
* Action set from carrier signalling broadcast receivers to start/stop reporting the default
* network status based on which carrier apps could apply actions accordingly,
* enable/disable default url handler for example.
@@ -8567,6 +8714,22 @@
return isAllowed;
}
+ private boolean haveCarrierPrivilegeAccess(UiccCard card, String callingPackage) {
+ // TODO once MEP API refactoring CL is merged, loop port list from UiccCardInfo,
+ // and if find the matching UiccPort by UiccController.getUiccPortForSlot(slot, portIdx)
+ // Update each UiccPort object based on privilege access
+ UiccPort[] uiccPorts = card.getUiccPortList();
+ for (UiccPort port : uiccPorts) {
+ UiccProfile profile = port.getUiccProfile();
+ if (profile == null ||
+ profile.getCarrierPrivilegeStatus(mApp.getPackageManager(), callingPackage)
+ != TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {
+ return false;
+ }
+ }
+ return true;
+ }
+
@Override
public List<UiccCardInfo> getUiccCardsInfo(String callingPackage) {
// Verify that tha callingPackage belongs to the calling UID
@@ -8600,14 +8763,15 @@
// For an inactive eUICC, the UiccCard will be null even though the UiccCardInfo
// is available
UiccCard card = uiccController.getUiccCardForSlot(cardInfo.getSlotIndex());
- if (card == null || card.getUiccProfile() == null) {
- // assume no access if the card or profile is unavailable
+ // TODO remove card.getUiccPortList().length once MEP API refactoring CL is merged
+ // Get UiccPortInfo from CardInfo and process further based on each UiccPort
+ if (card == null || card.getUiccPortList().length == 0) {
+ // assume no access if the card or ports are unavailable
filteredInfos.add(cardInfo.getUnprivileged());
continue;
}
- UiccProfile profile = card.getUiccProfile();
- if (profile.getCarrierPrivilegeStatus(mApp.getPackageManager(), callingPackage)
- == TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {
+
+ if (haveCarrierPrivilegeAccess(card, callingPackage)) {
filteredInfos.add(cardInfo);
} else {
filteredInfos.add(cardInfo.getUnprivileged());
@@ -8728,11 +8892,11 @@
if (phone == null) {
return;
}
- UiccCard uiccCard = phone.getUiccCard();
- if (uiccCard == null) {
+ UiccPort uiccPort = phone.getUiccPort();
+ if (uiccPort == null) {
return;
}
- UiccProfile uiccProfile = uiccCard.getUiccProfile();
+ UiccProfile uiccProfile = uiccPort.getUiccProfile();
if (uiccProfile == null) {
return;
}
@@ -9239,11 +9403,11 @@
}
final long identity = Binder.clearCallingIdentity();
try {
- UiccCard uiccCard = phone.getUiccCard();
- if (uiccCard == null) {
+ UiccPort uiccPort = phone.getUiccPort();
+ if (uiccPort == null) {
return false;
}
- UiccProfile uiccProfile = uiccCard.getUiccProfile();
+ UiccProfile uiccProfile = uiccPort.getUiccProfile();
if (uiccProfile == null) {
return false;
}
@@ -10752,11 +10916,12 @@
@Override
@TelephonyManager.PrepareUnattendedRebootResult
public int prepareForUnattendedReboot() {
+ WorkSource workSource = getWorkSource(Binder.getCallingUid());
enforceRebootPermission();
final long identity = Binder.clearCallingIdentity();
try {
- return (int) sendRequest(CMD_PREPARE_UNATTENDED_REBOOT, null);
+ return (int) sendRequest(CMD_PREPARE_UNATTENDED_REBOOT, null, workSource);
} finally {
Binder.restoreCallingIdentity(identity);
}
diff --git a/src/com/android/phone/PhoneUtils.java b/src/com/android/phone/PhoneUtils.java
index c520063..35cfdd3 100644
--- a/src/com/android/phone/PhoneUtils.java
+++ b/src/com/android/phone/PhoneUtils.java
@@ -468,7 +468,8 @@
};
// build the dialog
- final AlertDialog newDialog = new AlertDialog.Builder(contextThemeWrapper)
+ final AlertDialog newDialog =
+ FrameworksUtils.makeAlertDialogBuilder(contextThemeWrapper)
.setMessage(text)
.setView(dialogView)
.setPositiveButton(R.string.send_button, mUSSDDialogListener)
diff --git a/src/com/android/phone/RcsProvisioningMonitor.java b/src/com/android/phone/RcsProvisioningMonitor.java
index 23c4c5a..6d2bd6f 100644
--- a/src/com/android/phone/RcsProvisioningMonitor.java
+++ b/src/com/android/phone/RcsProvisioningMonitor.java
@@ -75,6 +75,10 @@
private static final int EVENT_RESET = 8;
private static final int EVENT_FEATURE_ENABLED_OVERRIDE = 9;
+ // indicate that the carrier single registration capable is initial value as
+ // carrier config is not ready yet.
+ private static final int MASK_CAP_CARRIER_INIT = 0xF000;
+
private final PhoneGlobals mPhone;
private final Handler mHandler;
// Cache the RCS provsioning info and related sub id
@@ -220,7 +224,19 @@
}
void setSingleRegistrationCapability(int singleRegistrationCapability) {
- mSingleRegistrationCapability = singleRegistrationCapability;
+ if (mSingleRegistrationCapability != singleRegistrationCapability) {
+ mSingleRegistrationCapability = singleRegistrationCapability;
+ notifyDma();
+ }
+ }
+
+ void notifyDma() {
+ // notify only if capable value has been updated when carrier config ready.
+ if ((mSingleRegistrationCapability & MASK_CAP_CARRIER_INIT) != MASK_CAP_CARRIER_INIT) {
+ logi("notify default messaging app for sub:" + mSubId + " with capability:"
+ + mSingleRegistrationCapability);
+ notifyDmaForSub(mSubId, mSingleRegistrationCapability);
+ }
}
int getSingleRegistrationCapability() {
@@ -675,7 +691,7 @@
logv("new default messaging application " + mDmaPackageName);
mRcsProvisioningInfos.forEach((k, v) -> {
- notifyDmaForSub(k, v.getSingleRegistrationCapability());
+ v.notifyDma();
byte[] cachedConfig = v.getConfig();
//clear old callbacks
@@ -715,17 +731,20 @@
return b.getBoolean(CarrierConfigManager.KEY_USE_ACS_FOR_RCS_BOOL);
}
- private boolean isSingleRegistrationRequiredByCarrier(int subId) {
+ private int getSingleRegistrationRequiredByCarrier(int subId) {
Boolean enabledByOverride = mCarrierSingleRegistrationEnabledOverride.get(subId);
if (enabledByOverride != null) {
- return enabledByOverride;
+ return enabledByOverride ? ProvisioningManager.STATUS_CAPABLE
+ : ProvisioningManager.STATUS_CARRIER_NOT_CAPABLE;
}
PersistableBundle b = mCarrierConfigManager.getConfigForSubId(subId);
- if (b == null) {
- return false;
+ if (!CarrierConfigManager.isConfigForIdentifiedCarrier(b)) {
+ return MASK_CAP_CARRIER_INIT;
}
- return b.getBoolean(CarrierConfigManager.Ims.KEY_IMS_SINGLE_REGISTRATION_REQUIRED_BOOL);
+ return b.getBoolean(CarrierConfigManager.Ims.KEY_IMS_SINGLE_REGISTRATION_REQUIRED_BOOL)
+ ? ProvisioningManager.STATUS_CAPABLE
+ : ProvisioningManager.STATUS_CARRIER_NOT_CAPABLE;
}
private int getSingleRegistrationCapableValue(int subId) {
@@ -735,10 +754,9 @@
: mPhone.getPackageManager().hasSystemFeature(
PackageManager.FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION);
- int value = (isSingleRegistrationEnabledOnDevice ? 0
- : ProvisioningManager.STATUS_DEVICE_NOT_CAPABLE) | (
- isSingleRegistrationRequiredByCarrier(subId) ? 0
- : ProvisioningManager.STATUS_CARRIER_NOT_CAPABLE);
+ int value = (isSingleRegistrationEnabledOnDevice ? ProvisioningManager.STATUS_CAPABLE
+ : ProvisioningManager.STATUS_DEVICE_NOT_CAPABLE)
+ | getSingleRegistrationRequiredByCarrier(subId);
logv("SingleRegistrationCapableValue : " + value);
return value;
}
@@ -746,11 +764,8 @@
private void onCarrierConfigChange() {
logv("onCarrierConfigChange");
mRcsProvisioningInfos.forEach((subId, info) -> {
- int value = getSingleRegistrationCapableValue(subId);
- if (value != info.getSingleRegistrationCapability()) {
- info.setSingleRegistrationCapability(value);
- notifyDmaForSub(subId, value);
- }
+ info.setSingleRegistrationCapability(
+ getSingleRegistrationCapableValue(subId));
});
}
@@ -765,9 +780,8 @@
byte[] data = loadConfigForSub(i);
int capability = getSingleRegistrationCapableValue(i);
logv("new info is created for sub : " + i + ", single registration capability :"
- + capability + ", rcs config : " + data);
+ + capability + ", rcs config : " + Arrays.toString(data));
mRcsProvisioningInfos.put(i, new RcsProvisioningInfo(i, capability, data));
- notifyDmaForSub(i, capability);
}
}
@@ -783,6 +797,10 @@
logv("onConfigReceived, subId:" + subId + ", config:"
+ config + ", isCompressed:" + isCompressed);
RcsProvisioningInfo info = mRcsProvisioningInfos.get(subId);
+ if (info == null) {
+ logd("sub[" + subId + "] has been removed");
+ return;
+ }
info.setConfig(isCompressed ? RcsConfig.decompressGzip(config) : config);
updateConfigForSub(subId, config, isCompressed);
}
@@ -852,6 +870,10 @@
}
}
+ private static void logi(String msg) {
+ Rlog.i(TAG, msg);
+ }
+
private static void logd(String msg) {
Rlog.d(TAG, msg);
}
diff --git a/src/com/android/phone/ServiceStateProvider.java b/src/com/android/phone/ServiceStateProvider.java
index 56786f9..6f5fcf5 100644
--- a/src/com/android/phone/ServiceStateProvider.java
+++ b/src/com/android/phone/ServiceStateProvider.java
@@ -28,6 +28,9 @@
import static android.provider.Telephony.ServiceStateTable.getUriForSubscriptionIdAndField;
import android.Manifest;
+import android.app.compat.CompatChanges;
+import android.compat.annotation.ChangeId;
+import android.compat.annotation.EnabledAfter;
import android.content.ContentProvider;
import android.content.ContentValues;
import android.content.Context;
@@ -230,6 +233,15 @@
*/
public static final String OPERATOR_ALPHA_SHORT_RAW = "operator_alpha_short_raw";
+ /**
+ * If the change Id is enabled, location permission is required to access location sensitive
+ * columns in the ServiceStateTable.
+ */
+ @ChangeId
+ @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.R)
+ @VisibleForTesting
+ /* package */ static final long ENFORCE_LOCATION_PERMISSION_CHECK = 191911306;
+
private final HashMap<Integer, ServiceState> mServiceStates = new HashMap<>();
@VisibleForTesting
@@ -398,7 +410,8 @@
return null;
}
- // TODO(b/182384053): replace targetSdk check with CompatChanges#isChangeEnabled
+ final boolean enforceLocationPermission =
+ CompatChanges.isChangeEnabled(ENFORCE_LOCATION_PERMISSION_CHECK);
final boolean targetingAtLeastS = TelephonyPermissions.getTargetSdk(getContext(),
getCallingPackage()) >= Build.VERSION_CODES.S;
final boolean canReadPrivilegedPhoneState = getContext().checkCallingOrSelfPermission(
@@ -406,7 +419,7 @@
final String[] availableColumns;
final ServiceState ss;
- if (targetingAtLeastS && !canReadPrivilegedPhoneState) {
+ if (enforceLocationPermission && targetingAtLeastS && !canReadPrivilegedPhoneState) {
// targetSdkVersion S+ without read privileged phone state permission can only
// access public columns which have no location sensitive info.
availableColumns = PUBLIC_COLUMNS;
@@ -415,9 +428,9 @@
availableColumns = ALL_COLUMNS;
final boolean hasLocationPermission = hasLocationPermission();
- if (hasLocationPermission) {
+ if (!enforceLocationPermission || hasLocationPermission) {
// No matter the targetSdkVersion, return unredacted ServiceState if caller does
- // have location permission.
+ // have location permission or location permission enforcement is not introduced
ss = unredactedServiceState;
} else {
// The caller has targetSdkVersion S+ but no location permission. It explicitly
diff --git a/src/com/android/phone/SimPhonebookProvider.java b/src/com/android/phone/SimPhonebookProvider.java
index b921398..8952865 100644
--- a/src/com/android/phone/SimPhonebookProvider.java
+++ b/src/com/android/phone/SimPhonebookProvider.java
@@ -16,8 +16,8 @@
package com.android.phone;
-import static com.android.internal.telephony.IccProvider.STR_NEW_TAG;
import static com.android.internal.telephony.IccProvider.STR_NEW_NUMBER;
+import static com.android.internal.telephony.IccProvider.STR_NEW_TAG;
import android.Manifest;
import android.annotation.TestApi;
@@ -43,7 +43,7 @@
import android.telephony.TelephonyFrameworkInitializer;
import android.telephony.TelephonyManager;
import android.util.ArraySet;
-import android.util.Pair;
+import android.util.SparseArray;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -55,10 +55,10 @@
import com.google.common.base.Joiner;
import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.util.concurrent.MoreExecutors;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.List;
@@ -97,6 +97,8 @@
private static final String TAG = "SimPhonebookProvider";
private static final Set<String> ELEMENTARY_FILES_COLUMNS_SET =
ImmutableSet.copyOf(ELEMENTARY_FILES_ALL_COLUMNS);
+ private static final Set<String> SIM_RECORDS_COLUMNS_SET =
+ ImmutableSet.copyOf(SIM_RECORDS_ALL_COLUMNS);
private static final Set<String> SIM_RECORDS_WRITABLE_COLUMNS = ImmutableSet.of(
SimRecords.NAME, SimRecords.PHONE_NUMBER
);
@@ -305,8 +307,10 @@
MatrixCursor result = new MatrixCursor(projection);
try {
- addEfToCursor(
- result, getActiveSubscriptionInfo(args.subscriptionId), args.efType);
+ SubscriptionInfo info = getActiveSubscriptionInfo(args.subscriptionId);
+ if (info != null) {
+ addEfToCursor(result, info, args.efType);
+ }
} catch (RemoteException e) {
// Return an empty cursor. If service to access it is throwing remote
// exceptions then it's basically the same as not having a SIM.
@@ -329,19 +333,25 @@
if (recordsSize == null || getRecordCount(recordsSize) == 0) {
return;
}
+ int efid = efIdForEfType(efType);
+ // Have to load the existing records to get the size because there may be more than one
+ // phonebook set in which case the total capacity is the sum of the capacity of EF_ADN for
+ // all the phonebook sets whereas the recordsSize is just the size for a single EF.
+ List<AdnRecord> existingRecords = mIccPhoneBookSupplier.get()
+ .getAdnRecordsInEfForSubscriber(subscriptionInfo.getSubscriptionId(), efid);
+ if (existingRecords == null) {
+ existingRecords = ImmutableList.of();
+ }
MatrixCursor.RowBuilder row = result.newRow()
.add(ElementaryFiles.SLOT_INDEX, subscriptionInfo.getSimSlotIndex())
.add(ElementaryFiles.SUBSCRIPTION_ID, subscriptionInfo.getSubscriptionId())
.add(ElementaryFiles.EF_TYPE, efType)
- .add(ElementaryFiles.MAX_RECORDS, getRecordCount(recordsSize))
+ .add(ElementaryFiles.MAX_RECORDS, existingRecords.size())
.add(ElementaryFiles.NAME_MAX_LENGTH,
AdnRecord.getMaxAlphaTagBytes(getRecordSize(recordsSize)))
.add(ElementaryFiles.PHONE_NUMBER_MAX_LENGTH,
AdnRecord.getMaxPhoneNumberDigits());
if (result.getColumnIndex(ElementaryFiles.RECORD_COUNT) != -1) {
- int efid = efIdForEfType(efType);
- List<AdnRecord> existingRecords = mIccPhoneBookSupplier.get()
- .getAdnRecordsInEfForSubscriber(subscriptionInfo.getSubscriptionId(), efid);
int nonEmptyCount = 0;
for (AdnRecord record : existingRecords) {
if (!record.isEmpty()) {
@@ -353,6 +363,7 @@
}
private Cursor querySimRecords(PhonebookArgs args, String[] projection) {
+ validateProjection(SIM_RECORDS_COLUMNS_SET, projection);
validateSubscriptionAndEf(args);
if (projection == null) {
projection = SIM_RECORDS_ALL_COLUMNS;
@@ -363,39 +374,46 @@
return new MatrixCursor(projection, 0);
}
MatrixCursor result = new MatrixCursor(projection, records.size());
- List<Pair<AdnRecord, MatrixCursor.RowBuilder>> rowBuilders = new ArrayList<>(
- records.size());
- for (AdnRecord record : records) {
+ SparseArray<MatrixCursor.RowBuilder> rowBuilders = new SparseArray<>(records.size());
+ for (int i = 0; i < records.size(); i++) {
+ AdnRecord record = records.get(i);
if (!record.isEmpty()) {
- rowBuilders.add(Pair.create(record, result.newRow()));
+ rowBuilders.put(i, result.newRow());
}
}
// This is kind of ugly but avoids looking up columns in an inner loop.
for (String column : projection) {
switch (column) {
case SimRecords.SUBSCRIPTION_ID:
- for (Pair<AdnRecord, MatrixCursor.RowBuilder> row : rowBuilders) {
- row.second.add(args.subscriptionId);
+ for (int i = 0; i < rowBuilders.size(); i++) {
+ rowBuilders.valueAt(i).add(args.subscriptionId);
}
break;
case SimRecords.ELEMENTARY_FILE_TYPE:
- for (Pair<AdnRecord, MatrixCursor.RowBuilder> row : rowBuilders) {
- row.second.add(args.efType);
+ for (int i = 0; i < rowBuilders.size(); i++) {
+ rowBuilders.valueAt(i).add(args.efType);
}
break;
case SimRecords.RECORD_NUMBER:
- for (Pair<AdnRecord, MatrixCursor.RowBuilder> row : rowBuilders) {
- row.second.add(row.first.getRecId());
+ for (int i = 0; i < rowBuilders.size(); i++) {
+ int index = rowBuilders.keyAt(i);
+ MatrixCursor.RowBuilder rowBuilder = rowBuilders.valueAt(i);
+ // See b/201685690. The logical record number, i.e. the 1-based index in the
+ // list, is used the rather than AdnRecord.getRecId() because getRecId is
+ // not offset when a single logical EF is made up of multiple physical EFs.
+ rowBuilder.add(index + 1);
}
break;
case SimRecords.NAME:
- for (Pair<AdnRecord, MatrixCursor.RowBuilder> row : rowBuilders) {
- row.second.add(row.first.getAlphaTag());
+ for (int i = 0; i < rowBuilders.size(); i++) {
+ AdnRecord record = records.get(rowBuilders.keyAt(i));
+ rowBuilders.valueAt(i).add(record.getAlphaTag());
}
break;
case SimRecords.PHONE_NUMBER:
- for (Pair<AdnRecord, MatrixCursor.RowBuilder> row : rowBuilders) {
- row.second.add(row.first.getNumber());
+ for (int i = 0; i < rowBuilders.size(); i++) {
+ AdnRecord record = records.get(rowBuilders.keyAt(i));
+ rowBuilders.valueAt(i).add(record.getNumber());
}
break;
default:
@@ -407,6 +425,7 @@
}
private Cursor querySimRecordsItem(PhonebookArgs args, String[] projection) {
+ validateProjection(SIM_RECORDS_COLUMNS_SET, projection);
if (projection == null) {
projection = SIM_RECORDS_ALL_COLUMNS;
}
@@ -734,6 +753,7 @@
}
}
+ @Nullable
private SubscriptionInfo getActiveSubscriptionInfo(int subId) {
// Getting the SubscriptionInfo requires READ_PHONE_STATE.
CallingIdentity identity = clearCallingIdentity();
@@ -758,20 +778,9 @@
if (records == null || args.recordNumber > records.size()) {
return null;
}
- AdnRecord result = records.get(args.recordNumber - 1);
- // This should be true but the service could have a different implementation.
- if (result.getRecId() == args.recordNumber) {
- return result;
- }
- for (AdnRecord record : records) {
- if (record.getRecId() == args.recordNumber) {
- return result;
- }
- }
- return null;
+ return records.get(args.recordNumber - 1);
}
-
private int[] getRecordsSizeForEf(PhonebookArgs args) {
try {
return mIccPhoneBookSupplier.get().getAdnRecordsSizeForSubscriber(
diff --git a/src/com/android/phone/SpecialCharSequenceMgr.java b/src/com/android/phone/SpecialCharSequenceMgr.java
index 674449e..3bf0e1a 100644
--- a/src/com/android/phone/SpecialCharSequenceMgr.java
+++ b/src/com/android/phone/SpecialCharSequenceMgr.java
@@ -264,7 +264,7 @@
}
return isMMIHandled;
} else {
- AlertDialog dialog = new AlertDialog.Builder(context)
+ AlertDialog dialog = FrameworksUtils.makeAlertDialogBuilder(context)
.setMessage(R.string.pin_puk_system_user_only)
.setPositiveButton(R.string.ok, null)
.setCancelable(true).create();
@@ -294,7 +294,7 @@
int labelId = TelephonyCapabilities.getDeviceIdLabel(phone);
String deviceId = phone.getDeviceId();
- AlertDialog alert = new AlertDialog.Builder(context)
+ AlertDialog alert = FrameworksUtils.makeAlertDialogBuilder(context)
.setTitle(labelId)
.setMessage(deviceId)
.setPositiveButton(R.string.ok, null)
diff --git a/src/com/android/phone/SubscriptionInfoHelper.java b/src/com/android/phone/SubscriptionInfoHelper.java
index 7c373e0..14faebc 100644
--- a/src/com/android/phone/SubscriptionInfoHelper.java
+++ b/src/com/android/phone/SubscriptionInfoHelper.java
@@ -91,7 +91,8 @@
intent.putExtra(SubscriptionInfoHelper.SUB_ID_EXTRA, subscription.getSubscriptionId());
intent.putExtra(
- SubscriptionInfoHelper.SUB_LABEL_EXTRA, subscription.getDisplayName().toString());
+ SubscriptionInfoHelper.SUB_LABEL_EXTRA, subscription.getDisplayName() == null ? null
+ : subscription.getDisplayName().toString());
}
/**
diff --git a/src/com/android/phone/TimeConsumingPreferenceActivity.java b/src/com/android/phone/TimeConsumingPreferenceActivity.java
index 8c5ae6d..caef176 100644
--- a/src/com/android/phone/TimeConsumingPreferenceActivity.java
+++ b/src/com/android/phone/TimeConsumingPreferenceActivity.java
@@ -84,7 +84,7 @@
|| id == FDN_CHECK_FAILURE || id == STK_CC_SS_TO_DIAL_ERROR
|| id == STK_CC_SS_TO_USSD_ERROR || id == STK_CC_SS_TO_SS_ERROR
|| id == STK_CC_SS_TO_DIAL_VIDEO_ERROR) {
- AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ AlertDialog.Builder builder = FrameworksUtils.makeAlertDialogBuilder(this);
int msgId;
int titleId = R.string.error_updating_title;
diff --git a/src/com/android/phone/euicc/EuiccPrivilegedActionUiDispatcherActivity.java b/src/com/android/phone/euicc/EuiccPrivilegedActionUiDispatcherActivity.java
index 389795b..53640f2 100644
--- a/src/com/android/phone/euicc/EuiccPrivilegedActionUiDispatcherActivity.java
+++ b/src/com/android/phone/euicc/EuiccPrivilegedActionUiDispatcherActivity.java
@@ -35,6 +35,10 @@
@Nullable
protected Intent getEuiccUiIntent() {
String action = getIntent().getAction();
+ if (action == null) {
+ Log.w(TAG, "No action is specified in the intent");
+ return null;
+ }
Intent intent = new Intent();
// Propagate the extras from the original Intent.
diff --git a/src/com/android/phone/euicc/EuiccPublicActionUiDispatcherActivity.java b/src/com/android/phone/euicc/EuiccPublicActionUiDispatcherActivity.java
index 64a40b9..cbee45a 100644
--- a/src/com/android/phone/euicc/EuiccPublicActionUiDispatcherActivity.java
+++ b/src/com/android/phone/euicc/EuiccPublicActionUiDispatcherActivity.java
@@ -34,6 +34,10 @@
@Nullable
protected Intent getEuiccUiIntent() {
String action = getIntent().getAction();
+ if (action == null) {
+ Log.w(TAG, "No action is specified in the intent");
+ return null;
+ }
Intent intent = new Intent();
// Propagate the extras from the original Intent.
diff --git a/src/com/android/phone/euicc/EuiccUiDispatcherActivity.java b/src/com/android/phone/euicc/EuiccUiDispatcherActivity.java
index f24e7d6..804611f 100644
--- a/src/com/android/phone/euicc/EuiccUiDispatcherActivity.java
+++ b/src/com/android/phone/euicc/EuiccUiDispatcherActivity.java
@@ -134,6 +134,10 @@
@Nullable
protected Intent getEuiccUiIntent() {
String action = getIntent().getAction();
+ if (action == null) {
+ Log.w(TAG, "No action is specified in the intent");
+ return null;
+ }
Intent intent = new Intent();
intent.putExtras(getIntent());
diff --git a/src/com/android/phone/settings/PhoneAccountSettingsFragment.java b/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
index 224a1f9..6bc71dc 100644
--- a/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
+++ b/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
@@ -78,6 +78,9 @@
new SubscriptionManager.OnSubscriptionsChangedListener() {
@Override
public void onSubscriptionsChanged() {
+ if (getActivity() == null) {
+ return;
+ }
updateAccounts();
}
};
diff --git a/src/com/android/phone/settings/RadioInfo.java b/src/com/android/phone/settings/RadioInfo.java
index b1ab413..d4c926e 100644
--- a/src/com/android/phone/settings/RadioInfo.java
+++ b/src/com/android/phone/settings/RadioInfo.java
@@ -673,6 +673,12 @@
mPreferredNetworkType.setSelection(mPreferredNetworkTypeResult, true);
mPreferredNetworkType.setOnItemSelectedListener(mPreferredNetworkHandler);
+ new Thread(() -> {
+ int networkType = (int) mTelephonyManager.getPreferredNetworkTypeBitmask();
+ updatePreferredNetworkType(
+ RadioAccessFamily.getNetworkTypeFromRaf(networkType));
+ }).start();
+
// set phone index
mSelectPhoneIndex.setSelection(mSelectedPhoneIndex, true);
mSelectPhoneIndex.setOnItemSelectedListener(mSelectPhoneIndexHandler);
diff --git a/src/com/android/services/telephony/DisconnectCauseUtil.java b/src/com/android/services/telephony/DisconnectCauseUtil.java
index 9c89e9e..9321e1e 100644
--- a/src/com/android/services/telephony/DisconnectCauseUtil.java
+++ b/src/com/android/services/telephony/DisconnectCauseUtil.java
@@ -787,12 +787,12 @@
default:
break;
}
- return resourceId == null ? "" : context.getResources().getText(resourceId);
+ return resourceId == null ? "" : context.getResources().getString(resourceId);
}
private static boolean isRadioOffForThermalMitigation(int phoneId) {
Phone phone = PhoneFactory.getPhone(phoneId);
- return phone.isRadioOffForThermalMitigation();
+ return phone == null ? false : phone.isRadioOffForThermalMitigation();
}
/**
diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
old mode 100755
new mode 100644
index 53e923e..18a40cf
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -2707,6 +2707,10 @@
capabilities = changeBitmask(capabilities, CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL,
isLocalVideoSupported);
+ capabilities = changeBitmask(capabilities, CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT,
+ (mOriginalConnectionCapabilities & Capability.SUPPORTS_RTT_REMOTE)
+ == Capability.SUPPORTS_RTT_REMOTE);
+
return capabilities;
}
diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index 7a0d8c2..55456f6 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -65,6 +65,7 @@
import com.android.internal.telephony.imsphone.ImsExternalCallTracker;
import com.android.internal.telephony.imsphone.ImsPhone;
import com.android.internal.telephony.imsphone.ImsPhoneConnection;
+import com.android.phone.FrameworksUtils;
import com.android.phone.MMIDialogActivity;
import com.android.phone.PhoneUtils;
import com.android.phone.R;
@@ -498,7 +499,8 @@
IntentFilter intentFilter = new IntentFilter(
TelecomManager.ACTION_TTY_PREFERRED_MODE_CHANGED);
- registerReceiver(mTtyBroadcastReceiver, intentFilter);
+ registerReceiver(mTtyBroadcastReceiver, intentFilter,
+ android.Manifest.permission.MODIFY_PHONE_STATE, null);
}
@Override
@@ -1199,9 +1201,9 @@
return connection;
}
- com.android.internal.telephony.Connection originalConnection =
- call.getState() == Call.State.WAITING ?
- call.getLatestConnection() : call.getEarliestConnection();
+ // If there are multiple Connections tracked in a call, grab the latest, since it is most
+ // likely to be the incoming call.
+ com.android.internal.telephony.Connection originalConnection = call.getLatestConnection();
if (isOriginalConnectionKnown(originalConnection)) {
Log.i(this, "onCreateIncomingConnection, original connection already registered");
return Connection.createCanceledConnection();
@@ -2459,7 +2461,7 @@
if (showDialog) {
Log.d(this, "Creating UT Data enable dialog");
String message = SuppServicesUiUtil.makeMessage(context, suppKey, phone);
- AlertDialog.Builder builder = new AlertDialog.Builder(context);
+ AlertDialog.Builder builder = FrameworksUtils.makeAlertDialogBuilder(context);
DialogInterface.OnClickListener networkSettingsClickListener =
new Dialog.OnClickListener() {
@Override
diff --git a/testapps/TestRcsApp/TestApp/res/values-as/strings.xml b/testapps/TestRcsApp/TestApp/res/values-as/strings.xml
new file mode 100644
index 0000000..2fac78c
--- /dev/null
+++ b/testapps/TestRcsApp/TestApp/res/values-as/strings.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="1411081210960307023">"RcsClient"</string>
+ <string name="provisioning_test" msgid="1035549386706009246">"প্ৰ’ভিজনিং পৰীক্ষা"</string>
+ <string name="delegate_test" msgid="8212368545489779643">"অধিকাৰ প্ৰদান কৰাৰ পৰীক্ষা"</string>
+ <string name="uce_test" msgid="6466919844953883038">"UCE পৰীক্ষা"</string>
+ <string name="gba_test" msgid="8786745991279224003">"GBA পৰীক্ষা"</string>
+ <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
+ <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
+ <string name="result" msgid="435222369457564619">"ফলাফল:"</string>
+ <string name="callback_result" msgid="7162990408241244749">"কলবেকৰ ফলাফল:"</string>
+ <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
+ <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
+ <string name="uce_description" msgid="1117661457446955869">"সন্ধানৰ সামৰ্থ্যত নম্বৰটো দিয়ক আৰু বহুকেইটা থাকিলে \',\'ৰ দ্বাৰা পৃথক কৰক।"</string>
+ <string name="number" msgid="9096578126043995890">"সংখ্যা:"</string>
+ <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
+ <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
+ <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
+ <string name="start_chat" msgid="96121236227112396">"চাট আৰম্ভ কৰক"</string>
+ <string name="to" msgid="1156781884609653284">"প্ৰতি:"</string>
+ <string name="chat_message" msgid="3945528453939746046">"চাট বার্তা"</string>
+ <string name="send" msgid="8797467615003240434">"পঠিয়াওক"</string>
+ <string name="ok" msgid="2206671077510386729">"ঠিক আছে"</string>
+ <string name="session_succeeded" msgid="4692992136758212220">"ছেশ্বন আৰম্ভ কৰাত সফল হৈছে"</string>
+ <string name="session_failed" msgid="4524986240102190509">"ছেশ্বন আৰম্ভ কৰাত বিফল হৈছে"</string>
+ <string name="session_not_ready" msgid="4612635394279901948">"ছেশ্বন সাজু নহয়"</string>
+ <string name="organization" msgid="913518283470119113">"সংস্থা:"</string>
+ <string name="uicc_type" msgid="5584433205228698588">"UICCৰ ধৰণ:"</string>
+ <string name="protocol" msgid="8626139294022821930">"প্ৰট’কল:"</string>
+ <string name="tls_cs" msgid="5410567052979996834">"TLS চাইফাৰ ছুইট:"</string>
+ <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
+ <string name="standalone_pager" msgid="1351341861641131423">"ষ্টেণ্ডএল’ন পেজাৰ"</string>
+ <string name="standalone_large" msgid="336170805696694543">"ষ্টেণ্ডএল’ন ডাঙৰ"</string>
+ <string name="standalone_deferred" msgid="4906576900729108844">"ষ্টেণ্ডএল’ন স্থগিত ৰখা হৈছে"</string>
+ <string name="standalone_pager_large" msgid="5662294171123433547">"ষ্টেণ্ডএল’ন ডাঙৰ পেজাৰ"</string>
+ <string name="chat" msgid="5500583808773151982">"চাট"</string>
+ <string name="file_transfer" msgid="5522080545470609737">"ফাইল স্থানান্তৰণ"</string>
+ <string name="geolocation_sms" msgid="4463328438708195479">"জিঅ’লোকেশ্বনৰ এছএমএছ"</string>
+ <string name="chatbot_session" msgid="5639314220589146717">"চাটব’ট ছেশ্বন"</string>
+ <string name="chatbot_standalone" msgid="8159185526765238041">"ষ্টেণ্ডএল’ন চাটব’ট"</string>
+ <string name="chatbot_version" msgid="2431939061806512544">"চাটব’টৰ সংস্কৰণ"</string>
+ <string name="provisioning_done" msgid="204618840179891984">"প্ৰ’ভিজনিং সম্পন্ন হৈছে"</string>
+ <string name="registration_done" msgid="492878616836655421">"পঞ্জীয়ন সম্পন্ন হৈছে"</string>
+ <string-array name="organization">
+ <item msgid="9074061482474975772">"একো নাই"</item>
+ <item msgid="7841117287115880098">"3GPP"</item>
+ <item msgid="5871357530951196401">"3GPP2"</item>
+ <item msgid="4979706772323445701">"OMA"</item>
+ <item msgid="1202873556413702218">"GSMA"</item>
+ <item msgid="2237392451840970059">"স্থানীয়"</item>
+ </string-array>
+ <string-array name="protocol">
+ <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
+ <item msgid="6305648228108532104">"MBMS"</item>
+ <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
+ <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
+ <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
+ <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
+ <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
+ <item msgid="7444251498958422990">"TLS_BROWSER"</item>
+ </string-array>
+ <string-array name="uicc_type">
+ <item msgid="5878327014492655902">"অজ্ঞাত"</item>
+ <item msgid="1715684709703792003">"ছিম"</item>
+ <item msgid="4592543026990143036">"USIM"</item>
+ <item msgid="8763183137100323328">"RSIM"</item>
+ <item msgid="3778400020205644807">"CSIM"</item>
+ <item msgid="3774607711141191499">"ISIM"</item>
+ </string-array>
+</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-be/strings.xml b/testapps/TestRcsApp/TestApp/res/values-be/strings.xml
new file mode 100644
index 0000000..5196cf4
--- /dev/null
+++ b/testapps/TestRcsApp/TestApp/res/values-be/strings.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="1411081210960307023">"RcsClient"</string>
+ <string name="provisioning_test" msgid="1035549386706009246">"Тэст ініцыялізацыі"</string>
+ <string name="delegate_test" msgid="8212368545489779643">"Дэлегаванне тэста"</string>
+ <string name="uce_test" msgid="6466919844953883038">"Тэст UCE"</string>
+ <string name="gba_test" msgid="8786745991279224003">"Тэст GBA"</string>
+ <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
+ <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
+ <string name="result" msgid="435222369457564619">"Вынік:"</string>
+ <string name="callback_result" msgid="7162990408241244749">"Вынік зваротнага выкліку"</string>
+ <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
+ <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
+ <string name="uce_description" msgid="1117661457446955869">"Увядзіце нумар для запыту магчымасці. Калі нумароў некалькі, раздзяліце іх коскамі."</string>
+ <string name="number" msgid="9096578126043995890">"Нумар:"</string>
+ <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
+ <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
+ <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
+ <string name="start_chat" msgid="96121236227112396">"Пачаць чат"</string>
+ <string name="to" msgid="1156781884609653284">"Каму:"</string>
+ <string name="chat_message" msgid="3945528453939746046">"Паведамленне чата"</string>
+ <string name="send" msgid="8797467615003240434">"Адправіць"</string>
+ <string name="ok" msgid="2206671077510386729">"ОК"</string>
+ <string name="session_succeeded" msgid="4692992136758212220">"Ініцыялізацыя сеанса выканана"</string>
+ <string name="session_failed" msgid="4524986240102190509">"Збой ініцыялізацыі сеанса"</string>
+ <string name="session_not_ready" msgid="4612635394279901948">"Сеанс не гатовы"</string>
+ <string name="organization" msgid="913518283470119113">"Арганізацыя:"</string>
+ <string name="uicc_type" msgid="5584433205228698588">"Тып UICC:"</string>
+ <string name="protocol" msgid="8626139294022821930">"Пратакол:"</string>
+ <string name="tls_cs" msgid="5410567052979996834">"Набор шыфраў TLS:"</string>
+ <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
+ <string name="standalone_pager" msgid="1351341861641131423">"Аўтаномны пэйджар"</string>
+ <string name="standalone_large" msgid="336170805696694543">"Аўтаномны вялікі"</string>
+ <string name="standalone_deferred" msgid="4906576900729108844">"Аўтаномны адкладзены"</string>
+ <string name="standalone_pager_large" msgid="5662294171123433547">"Аўтаномны вялікі пэйджар"</string>
+ <string name="chat" msgid="5500583808773151982">"Чат"</string>
+ <string name="file_transfer" msgid="5522080545470609737">"Перадача файлаў"</string>
+ <string name="geolocation_sms" msgid="4463328438708195479">"SMS геалакацыі"</string>
+ <string name="chatbot_session" msgid="5639314220589146717">"Сеанс чат-бота"</string>
+ <string name="chatbot_standalone" msgid="8159185526765238041">"Аўтаномны чат-бот"</string>
+ <string name="chatbot_version" msgid="2431939061806512544">"Версія чат-бота"</string>
+ <string name="provisioning_done" msgid="204618840179891984">"Ініцыялізацыя выканана"</string>
+ <string name="registration_done" msgid="492878616836655421">"Рэгістрацыя выканана"</string>
+ <string-array name="organization">
+ <item msgid="9074061482474975772">"НЯМА"</item>
+ <item msgid="7841117287115880098">"3GPP"</item>
+ <item msgid="5871357530951196401">"3GPP2"</item>
+ <item msgid="4979706772323445701">"OMA"</item>
+ <item msgid="1202873556413702218">"GSMA"</item>
+ <item msgid="2237392451840970059">"МЯСЦОВАЯ СЕТКА"</item>
+ </string-array>
+ <string-array name="protocol">
+ <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
+ <item msgid="6305648228108532104">"MBMS"</item>
+ <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
+ <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
+ <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
+ <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
+ <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
+ <item msgid="7444251498958422990">"TLS_BROWSER"</item>
+ </string-array>
+ <string-array name="uicc_type">
+ <item msgid="5878327014492655902">"НЕВЯДОМА"</item>
+ <item msgid="1715684709703792003">"SIM"</item>
+ <item msgid="4592543026990143036">"USIM"</item>
+ <item msgid="8763183137100323328">"RSIM"</item>
+ <item msgid="3778400020205644807">"CSIM"</item>
+ <item msgid="3774607711141191499">"ISIM"</item>
+ </string-array>
+</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-bs/strings.xml b/testapps/TestRcsApp/TestApp/res/values-bs/strings.xml
new file mode 100644
index 0000000..8787d26
--- /dev/null
+++ b/testapps/TestRcsApp/TestApp/res/values-bs/strings.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="1411081210960307023">"RcsClient"</string>
+ <string name="provisioning_test" msgid="1035549386706009246">"Test za dodjeljivanje"</string>
+ <string name="delegate_test" msgid="8212368545489779643">"Test ovlaštenika"</string>
+ <string name="uce_test" msgid="6466919844953883038">"Test UCE"</string>
+ <string name="gba_test" msgid="8786745991279224003">"Test GBA"</string>
+ <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
+ <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
+ <string name="result" msgid="435222369457564619">"Rezultat:"</string>
+ <string name="callback_result" msgid="7162990408241244749">"Rezultat povratnog poziva:"</string>
+ <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
+ <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
+ <string name="uce_description" msgid="1117661457446955869">"Unesite broj da pošaljte upit o kapacitetu te upite razdvojite \",\" ako ih ima više."</string>
+ <string name="number" msgid="9096578126043995890">"Broj:"</string>
+ <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
+ <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
+ <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
+ <string name="start_chat" msgid="96121236227112396">"Započni chat"</string>
+ <string name="to" msgid="1156781884609653284">"Za:"</string>
+ <string name="chat_message" msgid="3945528453939746046">"Poruka chata"</string>
+ <string name="send" msgid="8797467615003240434">"Pošalji"</string>
+ <string name="ok" msgid="2206671077510386729">"Uredu"</string>
+ <string name="session_succeeded" msgid="4692992136758212220">"Pokretanje sesije je uspjelo"</string>
+ <string name="session_failed" msgid="4524986240102190509">"Pokretanje sesije nije uspjelo"</string>
+ <string name="session_not_ready" msgid="4612635394279901948">"Sesija nije spremna"</string>
+ <string name="organization" msgid="913518283470119113">"Organizacija:"</string>
+ <string name="uicc_type" msgid="5584433205228698588">"Vrsta UICC:"</string>
+ <string name="protocol" msgid="8626139294022821930">"Protokol:"</string>
+ <string name="tls_cs" msgid="5410567052979996834">"Paket TLS Cipher:"</string>
+ <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
+ <string name="standalone_pager" msgid="1351341861641131423">"Samostalni pejdžer"</string>
+ <string name="standalone_large" msgid="336170805696694543">"Samostalno veliko"</string>
+ <string name="standalone_deferred" msgid="4906576900729108844">"Samostalno odgođeno"</string>
+ <string name="standalone_pager_large" msgid="5662294171123433547">"Samostalni veliki pejdžer"</string>
+ <string name="chat" msgid="5500583808773151982">"Chat"</string>
+ <string name="file_transfer" msgid="5522080545470609737">"Prijenos fajlova"</string>
+ <string name="geolocation_sms" msgid="4463328438708195479">"SMS za geolokaciju"</string>
+ <string name="chatbot_session" msgid="5639314220589146717">"Sesija bota za chat"</string>
+ <string name="chatbot_standalone" msgid="8159185526765238041">"Samostalni bot za chat"</string>
+ <string name="chatbot_version" msgid="2431939061806512544">"Vezija bota za chat"</string>
+ <string name="provisioning_done" msgid="204618840179891984">"Dodjeljivanje je završeno"</string>
+ <string name="registration_done" msgid="492878616836655421">"Registracija je završena"</string>
+ <string-array name="organization">
+ <item msgid="9074061482474975772">"NEMA"</item>
+ <item msgid="7841117287115880098">"3GPP"</item>
+ <item msgid="5871357530951196401">"3GPP2"</item>
+ <item msgid="4979706772323445701">"OMA"</item>
+ <item msgid="1202873556413702218">"GSMA"</item>
+ <item msgid="2237392451840970059">"LOKALNO"</item>
+ </string-array>
+ <string-array name="protocol">
+ <item msgid="7955884038486794595">"CERTIFIKAT_PRETPLATNIKA"</item>
+ <item msgid="6305648228108532104">"MBMS"</item>
+ <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
+ <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
+ <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
+ <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
+ <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
+ <item msgid="7444251498958422990">"TLS_BROWSER"</item>
+ </string-array>
+ <string-array name="uicc_type">
+ <item msgid="5878327014492655902">"NEPOZNATO"</item>
+ <item msgid="1715684709703792003">"SIM"</item>
+ <item msgid="4592543026990143036">"USIM"</item>
+ <item msgid="8763183137100323328">"RSIM"</item>
+ <item msgid="3778400020205644807">"CSIM"</item>
+ <item msgid="3774607711141191499">"ISIM"</item>
+ </string-array>
+</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-en-rAU/strings.xml b/testapps/TestRcsApp/TestApp/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..bec17d3
--- /dev/null
+++ b/testapps/TestRcsApp/TestApp/res/values-en-rAU/strings.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="1411081210960307023">"Rcs client"</string>
+ <string name="provisioning_test" msgid="1035549386706009246">"Provisioning test"</string>
+ <string name="delegate_test" msgid="8212368545489779643">"Delegate test"</string>
+ <string name="uce_test" msgid="6466919844953883038">"UCE test"</string>
+ <string name="gba_test" msgid="8786745991279224003">"GBA test"</string>
+ <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
+ <string name="db_client" msgid="5131401341721936367">"DB client"</string>
+ <string name="result" msgid="435222369457564619">"Result:"</string>
+ <string name="callback_result" msgid="7162990408241244749">"Callback result:"</string>
+ <string name="initialize_delegate" msgid="1772072838514674246">"initialiseSipDelegate"</string>
+ <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
+ <string name="uce_description" msgid="1117661457446955869">"Enter the number to query capability and separate by \',\' if multiple ones."</string>
+ <string name="number" msgid="9096578126043995890">"Number:"</string>
+ <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
+ <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
+ <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
+ <string name="start_chat" msgid="96121236227112396">"Start chat"</string>
+ <string name="to" msgid="1156781884609653284">"To:"</string>
+ <string name="chat_message" msgid="3945528453939746046">"Chat message"</string>
+ <string name="send" msgid="8797467615003240434">"Send"</string>
+ <string name="ok" msgid="2206671077510386729">"OK"</string>
+ <string name="session_succeeded" msgid="4692992136758212220">"Session init succeeded"</string>
+ <string name="session_failed" msgid="4524986240102190509">"Session init failed"</string>
+ <string name="session_not_ready" msgid="4612635394279901948">"Session not ready"</string>
+ <string name="organization" msgid="913518283470119113">"Organisation:"</string>
+ <string name="uicc_type" msgid="5584433205228698588">"UICC type:"</string>
+ <string name="protocol" msgid="8626139294022821930">"Protocol:"</string>
+ <string name="tls_cs" msgid="5410567052979996834">"TLS cipher suite:"</string>
+ <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
+ <string name="standalone_pager" msgid="1351341861641131423">"Standalone pager"</string>
+ <string name="standalone_large" msgid="336170805696694543">"Standalone large"</string>
+ <string name="standalone_deferred" msgid="4906576900729108844">"Standalone deferred"</string>
+ <string name="standalone_pager_large" msgid="5662294171123433547">"Standalone large pager"</string>
+ <string name="chat" msgid="5500583808773151982">"Chat"</string>
+ <string name="file_transfer" msgid="5522080545470609737">"File transfer"</string>
+ <string name="geolocation_sms" msgid="4463328438708195479">"Geolocation SMS"</string>
+ <string name="chatbot_session" msgid="5639314220589146717">"Chatbot session"</string>
+ <string name="chatbot_standalone" msgid="8159185526765238041">"Chatbot standalone"</string>
+ <string name="chatbot_version" msgid="2431939061806512544">"Chatbot version"</string>
+ <string name="provisioning_done" msgid="204618840179891984">"Provisioning done"</string>
+ <string name="registration_done" msgid="492878616836655421">"Registration done"</string>
+ <string-array name="organization">
+ <item msgid="9074061482474975772">"NONE"</item>
+ <item msgid="7841117287115880098">"3GPP"</item>
+ <item msgid="5871357530951196401">"3GPP2"</item>
+ <item msgid="4979706772323445701">"OMA"</item>
+ <item msgid="1202873556413702218">"GSMA"</item>
+ <item msgid="2237392451840970059">"LOCAL"</item>
+ </string-array>
+ <string-array name="protocol">
+ <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
+ <item msgid="6305648228108532104">"MBMS"</item>
+ <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
+ <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
+ <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
+ <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
+ <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
+ <item msgid="7444251498958422990">"TLS_BROWSER"</item>
+ </string-array>
+ <string-array name="uicc_type">
+ <item msgid="5878327014492655902">"UNKNOWN"</item>
+ <item msgid="1715684709703792003">"SIM"</item>
+ <item msgid="4592543026990143036">"USIM"</item>
+ <item msgid="8763183137100323328">"RSIM"</item>
+ <item msgid="3778400020205644807">"CSIM"</item>
+ <item msgid="3774607711141191499">"ISIM"</item>
+ </string-array>
+</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-en-rCA/strings.xml b/testapps/TestRcsApp/TestApp/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000..bec17d3
--- /dev/null
+++ b/testapps/TestRcsApp/TestApp/res/values-en-rCA/strings.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="1411081210960307023">"Rcs client"</string>
+ <string name="provisioning_test" msgid="1035549386706009246">"Provisioning test"</string>
+ <string name="delegate_test" msgid="8212368545489779643">"Delegate test"</string>
+ <string name="uce_test" msgid="6466919844953883038">"UCE test"</string>
+ <string name="gba_test" msgid="8786745991279224003">"GBA test"</string>
+ <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
+ <string name="db_client" msgid="5131401341721936367">"DB client"</string>
+ <string name="result" msgid="435222369457564619">"Result:"</string>
+ <string name="callback_result" msgid="7162990408241244749">"Callback result:"</string>
+ <string name="initialize_delegate" msgid="1772072838514674246">"initialiseSipDelegate"</string>
+ <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
+ <string name="uce_description" msgid="1117661457446955869">"Enter the number to query capability and separate by \',\' if multiple ones."</string>
+ <string name="number" msgid="9096578126043995890">"Number:"</string>
+ <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
+ <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
+ <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
+ <string name="start_chat" msgid="96121236227112396">"Start chat"</string>
+ <string name="to" msgid="1156781884609653284">"To:"</string>
+ <string name="chat_message" msgid="3945528453939746046">"Chat message"</string>
+ <string name="send" msgid="8797467615003240434">"Send"</string>
+ <string name="ok" msgid="2206671077510386729">"OK"</string>
+ <string name="session_succeeded" msgid="4692992136758212220">"Session init succeeded"</string>
+ <string name="session_failed" msgid="4524986240102190509">"Session init failed"</string>
+ <string name="session_not_ready" msgid="4612635394279901948">"Session not ready"</string>
+ <string name="organization" msgid="913518283470119113">"Organisation:"</string>
+ <string name="uicc_type" msgid="5584433205228698588">"UICC type:"</string>
+ <string name="protocol" msgid="8626139294022821930">"Protocol:"</string>
+ <string name="tls_cs" msgid="5410567052979996834">"TLS cipher suite:"</string>
+ <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
+ <string name="standalone_pager" msgid="1351341861641131423">"Standalone pager"</string>
+ <string name="standalone_large" msgid="336170805696694543">"Standalone large"</string>
+ <string name="standalone_deferred" msgid="4906576900729108844">"Standalone deferred"</string>
+ <string name="standalone_pager_large" msgid="5662294171123433547">"Standalone large pager"</string>
+ <string name="chat" msgid="5500583808773151982">"Chat"</string>
+ <string name="file_transfer" msgid="5522080545470609737">"File transfer"</string>
+ <string name="geolocation_sms" msgid="4463328438708195479">"Geolocation SMS"</string>
+ <string name="chatbot_session" msgid="5639314220589146717">"Chatbot session"</string>
+ <string name="chatbot_standalone" msgid="8159185526765238041">"Chatbot standalone"</string>
+ <string name="chatbot_version" msgid="2431939061806512544">"Chatbot version"</string>
+ <string name="provisioning_done" msgid="204618840179891984">"Provisioning done"</string>
+ <string name="registration_done" msgid="492878616836655421">"Registration done"</string>
+ <string-array name="organization">
+ <item msgid="9074061482474975772">"NONE"</item>
+ <item msgid="7841117287115880098">"3GPP"</item>
+ <item msgid="5871357530951196401">"3GPP2"</item>
+ <item msgid="4979706772323445701">"OMA"</item>
+ <item msgid="1202873556413702218">"GSMA"</item>
+ <item msgid="2237392451840970059">"LOCAL"</item>
+ </string-array>
+ <string-array name="protocol">
+ <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
+ <item msgid="6305648228108532104">"MBMS"</item>
+ <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
+ <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
+ <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
+ <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
+ <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
+ <item msgid="7444251498958422990">"TLS_BROWSER"</item>
+ </string-array>
+ <string-array name="uicc_type">
+ <item msgid="5878327014492655902">"UNKNOWN"</item>
+ <item msgid="1715684709703792003">"SIM"</item>
+ <item msgid="4592543026990143036">"USIM"</item>
+ <item msgid="8763183137100323328">"RSIM"</item>
+ <item msgid="3778400020205644807">"CSIM"</item>
+ <item msgid="3774607711141191499">"ISIM"</item>
+ </string-array>
+</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-en-rGB/strings.xml b/testapps/TestRcsApp/TestApp/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..bec17d3
--- /dev/null
+++ b/testapps/TestRcsApp/TestApp/res/values-en-rGB/strings.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="1411081210960307023">"Rcs client"</string>
+ <string name="provisioning_test" msgid="1035549386706009246">"Provisioning test"</string>
+ <string name="delegate_test" msgid="8212368545489779643">"Delegate test"</string>
+ <string name="uce_test" msgid="6466919844953883038">"UCE test"</string>
+ <string name="gba_test" msgid="8786745991279224003">"GBA test"</string>
+ <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
+ <string name="db_client" msgid="5131401341721936367">"DB client"</string>
+ <string name="result" msgid="435222369457564619">"Result:"</string>
+ <string name="callback_result" msgid="7162990408241244749">"Callback result:"</string>
+ <string name="initialize_delegate" msgid="1772072838514674246">"initialiseSipDelegate"</string>
+ <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
+ <string name="uce_description" msgid="1117661457446955869">"Enter the number to query capability and separate by \',\' if multiple ones."</string>
+ <string name="number" msgid="9096578126043995890">"Number:"</string>
+ <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
+ <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
+ <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
+ <string name="start_chat" msgid="96121236227112396">"Start chat"</string>
+ <string name="to" msgid="1156781884609653284">"To:"</string>
+ <string name="chat_message" msgid="3945528453939746046">"Chat message"</string>
+ <string name="send" msgid="8797467615003240434">"Send"</string>
+ <string name="ok" msgid="2206671077510386729">"OK"</string>
+ <string name="session_succeeded" msgid="4692992136758212220">"Session init succeeded"</string>
+ <string name="session_failed" msgid="4524986240102190509">"Session init failed"</string>
+ <string name="session_not_ready" msgid="4612635394279901948">"Session not ready"</string>
+ <string name="organization" msgid="913518283470119113">"Organisation:"</string>
+ <string name="uicc_type" msgid="5584433205228698588">"UICC type:"</string>
+ <string name="protocol" msgid="8626139294022821930">"Protocol:"</string>
+ <string name="tls_cs" msgid="5410567052979996834">"TLS cipher suite:"</string>
+ <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
+ <string name="standalone_pager" msgid="1351341861641131423">"Standalone pager"</string>
+ <string name="standalone_large" msgid="336170805696694543">"Standalone large"</string>
+ <string name="standalone_deferred" msgid="4906576900729108844">"Standalone deferred"</string>
+ <string name="standalone_pager_large" msgid="5662294171123433547">"Standalone large pager"</string>
+ <string name="chat" msgid="5500583808773151982">"Chat"</string>
+ <string name="file_transfer" msgid="5522080545470609737">"File transfer"</string>
+ <string name="geolocation_sms" msgid="4463328438708195479">"Geolocation SMS"</string>
+ <string name="chatbot_session" msgid="5639314220589146717">"Chatbot session"</string>
+ <string name="chatbot_standalone" msgid="8159185526765238041">"Chatbot standalone"</string>
+ <string name="chatbot_version" msgid="2431939061806512544">"Chatbot version"</string>
+ <string name="provisioning_done" msgid="204618840179891984">"Provisioning done"</string>
+ <string name="registration_done" msgid="492878616836655421">"Registration done"</string>
+ <string-array name="organization">
+ <item msgid="9074061482474975772">"NONE"</item>
+ <item msgid="7841117287115880098">"3GPP"</item>
+ <item msgid="5871357530951196401">"3GPP2"</item>
+ <item msgid="4979706772323445701">"OMA"</item>
+ <item msgid="1202873556413702218">"GSMA"</item>
+ <item msgid="2237392451840970059">"LOCAL"</item>
+ </string-array>
+ <string-array name="protocol">
+ <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
+ <item msgid="6305648228108532104">"MBMS"</item>
+ <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
+ <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
+ <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
+ <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
+ <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
+ <item msgid="7444251498958422990">"TLS_BROWSER"</item>
+ </string-array>
+ <string-array name="uicc_type">
+ <item msgid="5878327014492655902">"UNKNOWN"</item>
+ <item msgid="1715684709703792003">"SIM"</item>
+ <item msgid="4592543026990143036">"USIM"</item>
+ <item msgid="8763183137100323328">"RSIM"</item>
+ <item msgid="3778400020205644807">"CSIM"</item>
+ <item msgid="3774607711141191499">"ISIM"</item>
+ </string-array>
+</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-en-rIN/strings.xml b/testapps/TestRcsApp/TestApp/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..bec17d3
--- /dev/null
+++ b/testapps/TestRcsApp/TestApp/res/values-en-rIN/strings.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="1411081210960307023">"Rcs client"</string>
+ <string name="provisioning_test" msgid="1035549386706009246">"Provisioning test"</string>
+ <string name="delegate_test" msgid="8212368545489779643">"Delegate test"</string>
+ <string name="uce_test" msgid="6466919844953883038">"UCE test"</string>
+ <string name="gba_test" msgid="8786745991279224003">"GBA test"</string>
+ <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
+ <string name="db_client" msgid="5131401341721936367">"DB client"</string>
+ <string name="result" msgid="435222369457564619">"Result:"</string>
+ <string name="callback_result" msgid="7162990408241244749">"Callback result:"</string>
+ <string name="initialize_delegate" msgid="1772072838514674246">"initialiseSipDelegate"</string>
+ <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
+ <string name="uce_description" msgid="1117661457446955869">"Enter the number to query capability and separate by \',\' if multiple ones."</string>
+ <string name="number" msgid="9096578126043995890">"Number:"</string>
+ <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
+ <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
+ <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
+ <string name="start_chat" msgid="96121236227112396">"Start chat"</string>
+ <string name="to" msgid="1156781884609653284">"To:"</string>
+ <string name="chat_message" msgid="3945528453939746046">"Chat message"</string>
+ <string name="send" msgid="8797467615003240434">"Send"</string>
+ <string name="ok" msgid="2206671077510386729">"OK"</string>
+ <string name="session_succeeded" msgid="4692992136758212220">"Session init succeeded"</string>
+ <string name="session_failed" msgid="4524986240102190509">"Session init failed"</string>
+ <string name="session_not_ready" msgid="4612635394279901948">"Session not ready"</string>
+ <string name="organization" msgid="913518283470119113">"Organisation:"</string>
+ <string name="uicc_type" msgid="5584433205228698588">"UICC type:"</string>
+ <string name="protocol" msgid="8626139294022821930">"Protocol:"</string>
+ <string name="tls_cs" msgid="5410567052979996834">"TLS cipher suite:"</string>
+ <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
+ <string name="standalone_pager" msgid="1351341861641131423">"Standalone pager"</string>
+ <string name="standalone_large" msgid="336170805696694543">"Standalone large"</string>
+ <string name="standalone_deferred" msgid="4906576900729108844">"Standalone deferred"</string>
+ <string name="standalone_pager_large" msgid="5662294171123433547">"Standalone large pager"</string>
+ <string name="chat" msgid="5500583808773151982">"Chat"</string>
+ <string name="file_transfer" msgid="5522080545470609737">"File transfer"</string>
+ <string name="geolocation_sms" msgid="4463328438708195479">"Geolocation SMS"</string>
+ <string name="chatbot_session" msgid="5639314220589146717">"Chatbot session"</string>
+ <string name="chatbot_standalone" msgid="8159185526765238041">"Chatbot standalone"</string>
+ <string name="chatbot_version" msgid="2431939061806512544">"Chatbot version"</string>
+ <string name="provisioning_done" msgid="204618840179891984">"Provisioning done"</string>
+ <string name="registration_done" msgid="492878616836655421">"Registration done"</string>
+ <string-array name="organization">
+ <item msgid="9074061482474975772">"NONE"</item>
+ <item msgid="7841117287115880098">"3GPP"</item>
+ <item msgid="5871357530951196401">"3GPP2"</item>
+ <item msgid="4979706772323445701">"OMA"</item>
+ <item msgid="1202873556413702218">"GSMA"</item>
+ <item msgid="2237392451840970059">"LOCAL"</item>
+ </string-array>
+ <string-array name="protocol">
+ <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
+ <item msgid="6305648228108532104">"MBMS"</item>
+ <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
+ <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
+ <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
+ <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
+ <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
+ <item msgid="7444251498958422990">"TLS_BROWSER"</item>
+ </string-array>
+ <string-array name="uicc_type">
+ <item msgid="5878327014492655902">"UNKNOWN"</item>
+ <item msgid="1715684709703792003">"SIM"</item>
+ <item msgid="4592543026990143036">"USIM"</item>
+ <item msgid="8763183137100323328">"RSIM"</item>
+ <item msgid="3778400020205644807">"CSIM"</item>
+ <item msgid="3774607711141191499">"ISIM"</item>
+ </string-array>
+</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-en-rXC/strings.xml b/testapps/TestRcsApp/TestApp/res/values-en-rXC/strings.xml
new file mode 100644
index 0000000..ef9b6cb
--- /dev/null
+++ b/testapps/TestRcsApp/TestApp/res/values-en-rXC/strings.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="1411081210960307023">"RcsClient"</string>
+ <string name="provisioning_test" msgid="1035549386706009246">"Provisioning Test"</string>
+ <string name="delegate_test" msgid="8212368545489779643">"Delegate Test"</string>
+ <string name="uce_test" msgid="6466919844953883038">"UCE Test"</string>
+ <string name="gba_test" msgid="8786745991279224003">"GBA Test"</string>
+ <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
+ <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
+ <string name="result" msgid="435222369457564619">"Result:"</string>
+ <string name="callback_result" msgid="7162990408241244749">"Callback Result:"</string>
+ <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
+ <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
+ <string name="uce_description" msgid="1117661457446955869">"Enter the number to query capability and separate by \',\' if multiple ones."</string>
+ <string name="number" msgid="9096578126043995890">"Number:"</string>
+ <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
+ <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
+ <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
+ <string name="start_chat" msgid="96121236227112396">"Start Chat"</string>
+ <string name="to" msgid="1156781884609653284">"To:"</string>
+ <string name="chat_message" msgid="3945528453939746046">"Chat Message"</string>
+ <string name="send" msgid="8797467615003240434">"Send"</string>
+ <string name="ok" msgid="2206671077510386729">"OK"</string>
+ <string name="session_succeeded" msgid="4692992136758212220">"Session init succeeded"</string>
+ <string name="session_failed" msgid="4524986240102190509">"Session init failed"</string>
+ <string name="session_not_ready" msgid="4612635394279901948">"Session not ready"</string>
+ <string name="organization" msgid="913518283470119113">"Organization:"</string>
+ <string name="uicc_type" msgid="5584433205228698588">"UICC Type:"</string>
+ <string name="protocol" msgid="8626139294022821930">"Protocol:"</string>
+ <string name="tls_cs" msgid="5410567052979996834">"TLS Cipher Suite:"</string>
+ <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
+ <string name="standalone_pager" msgid="1351341861641131423">"Standalone Pager"</string>
+ <string name="standalone_large" msgid="336170805696694543">"Standalone Large"</string>
+ <string name="standalone_deferred" msgid="4906576900729108844">"Standalone Deferred"</string>
+ <string name="standalone_pager_large" msgid="5662294171123433547">"Standalone Large Pager"</string>
+ <string name="chat" msgid="5500583808773151982">"Chat"</string>
+ <string name="file_transfer" msgid="5522080545470609737">"File Transfer"</string>
+ <string name="geolocation_sms" msgid="4463328438708195479">"Geolocation SMS"</string>
+ <string name="chatbot_session" msgid="5639314220589146717">"Chatbot Session"</string>
+ <string name="chatbot_standalone" msgid="8159185526765238041">"Chatbot Standalone"</string>
+ <string name="chatbot_version" msgid="2431939061806512544">"Chatbot Version"</string>
+ <string name="provisioning_done" msgid="204618840179891984">"Provisioning Done"</string>
+ <string name="registration_done" msgid="492878616836655421">"Registration Done"</string>
+ <string-array name="organization">
+ <item msgid="9074061482474975772">"NONE"</item>
+ <item msgid="7841117287115880098">"3GPP"</item>
+ <item msgid="5871357530951196401">"3GPP2"</item>
+ <item msgid="4979706772323445701">"OMA"</item>
+ <item msgid="1202873556413702218">"GSMA"</item>
+ <item msgid="2237392451840970059">"LOCAL"</item>
+ </string-array>
+ <string-array name="protocol">
+ <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
+ <item msgid="6305648228108532104">"MBMS"</item>
+ <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
+ <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
+ <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
+ <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
+ <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
+ <item msgid="7444251498958422990">"TLS_BROWSER"</item>
+ </string-array>
+ <string-array name="uicc_type">
+ <item msgid="5878327014492655902">"UNKNOWN"</item>
+ <item msgid="1715684709703792003">"SIM"</item>
+ <item msgid="4592543026990143036">"USIM"</item>
+ <item msgid="8763183137100323328">"RSIM"</item>
+ <item msgid="3778400020205644807">"CSIM"</item>
+ <item msgid="3774607711141191499">"ISIM"</item>
+ </string-array>
+</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-gu/strings.xml b/testapps/TestRcsApp/TestApp/res/values-gu/strings.xml
new file mode 100644
index 0000000..4842877
--- /dev/null
+++ b/testapps/TestRcsApp/TestApp/res/values-gu/strings.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="1411081210960307023">"RcsClient"</string>
+ <string name="provisioning_test" msgid="1035549386706009246">"જોગવાઈનું પરીક્ષણ"</string>
+ <string name="delegate_test" msgid="8212368545489779643">"અધિકાર સોંપવાનું પરીક્ષણ"</string>
+ <string name="uce_test" msgid="6466919844953883038">"UCE પરીક્ષણ"</string>
+ <string name="gba_test" msgid="8786745991279224003">"GBA પરીક્ષણ"</string>
+ <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
+ <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
+ <string name="result" msgid="435222369457564619">"પરિણામ:"</string>
+ <string name="callback_result" msgid="7162990408241244749">"કૉલબૅકનું પરિણામ:"</string>
+ <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
+ <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
+ <string name="uce_description" msgid="1117661457446955869">"ક્વેરીની ક્ષમતામાં નંબર દાખલ કરો અને એક કરતાં વધુ હોય તો વડે \',\' જુદાં પાડો."</string>
+ <string name="number" msgid="9096578126043995890">"નંબર:"</string>
+ <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
+ <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
+ <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
+ <string name="start_chat" msgid="96121236227112396">"ચૅટ શરૂ કરો"</string>
+ <string name="to" msgid="1156781884609653284">"પ્રતિ:"</string>
+ <string name="chat_message" msgid="3945528453939746046">"ચૅટ સંદેશ"</string>
+ <string name="send" msgid="8797467615003240434">"મોકલો"</string>
+ <string name="ok" msgid="2206671077510386729">"ઓકે"</string>
+ <string name="session_succeeded" msgid="4692992136758212220">"સત્ર શરૂ કરવાનું સફળ થયું"</string>
+ <string name="session_failed" msgid="4524986240102190509">"સત્ર શરૂ કરવાનું નિષ્ફળ રહ્યું"</string>
+ <string name="session_not_ready" msgid="4612635394279901948">"સત્ર તૈયાર નથી"</string>
+ <string name="organization" msgid="913518283470119113">"સંસ્થા:"</string>
+ <string name="uicc_type" msgid="5584433205228698588">"UICCનો પ્રકાર:"</string>
+ <string name="protocol" msgid="8626139294022821930">"પ્રોટોકૉલ:"</string>
+ <string name="tls_cs" msgid="5410567052979996834">"TLS સાઇફર સ્યૂટ:"</string>
+ <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
+ <string name="standalone_pager" msgid="1351341861641131423">"સ્ટેન્ડઅલોન પેજર"</string>
+ <string name="standalone_large" msgid="336170805696694543">"સ્ટેન્ડઅલોન મોટું"</string>
+ <string name="standalone_deferred" msgid="4906576900729108844">"સ્ટેન્ડઅલોન સ્થગિત થયું"</string>
+ <string name="standalone_pager_large" msgid="5662294171123433547">"સ્ટેન્ડઅલોન મોટું પેજર"</string>
+ <string name="chat" msgid="5500583808773151982">"ચૅટ"</string>
+ <string name="file_transfer" msgid="5522080545470609737">"ફાઇલ ટ્રાન્સફર"</string>
+ <string name="geolocation_sms" msgid="4463328438708195479">"ભૌગોલિક સ્થાન SMS"</string>
+ <string name="chatbot_session" msgid="5639314220589146717">"ચૅટબૉટ સત્ર"</string>
+ <string name="chatbot_standalone" msgid="8159185526765238041">"ચૅટબૉટ સ્ટેન્ડઅલોન"</string>
+ <string name="chatbot_version" msgid="2431939061806512544">"ચૅટબૉટ વર્ઝન"</string>
+ <string name="provisioning_done" msgid="204618840179891984">"જોગવાઈ કરી"</string>
+ <string name="registration_done" msgid="492878616836655421">"રજિસ્ટ્રેશન થઈ ગયું"</string>
+ <string-array name="organization">
+ <item msgid="9074061482474975772">"કોઈ નહીં"</item>
+ <item msgid="7841117287115880098">"3GPP"</item>
+ <item msgid="5871357530951196401">"3GPP2"</item>
+ <item msgid="4979706772323445701">"OMA"</item>
+ <item msgid="1202873556413702218">"GSMA"</item>
+ <item msgid="2237392451840970059">"સ્થાનિક"</item>
+ </string-array>
+ <string-array name="protocol">
+ <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
+ <item msgid="6305648228108532104">"MBMS"</item>
+ <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
+ <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
+ <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
+ <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
+ <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
+ <item msgid="7444251498958422990">"TLS_BROWSER"</item>
+ </string-array>
+ <string-array name="uicc_type">
+ <item msgid="5878327014492655902">"અજાણ"</item>
+ <item msgid="1715684709703792003">"SIM"</item>
+ <item msgid="4592543026990143036">"USIM"</item>
+ <item msgid="8763183137100323328">"RSIM"</item>
+ <item msgid="3778400020205644807">"CSIM"</item>
+ <item msgid="3774607711141191499">"ISIM"</item>
+ </string-array>
+</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-ko/strings.xml b/testapps/TestRcsApp/TestApp/res/values-ko/strings.xml
new file mode 100644
index 0000000..38f1bd5
--- /dev/null
+++ b/testapps/TestRcsApp/TestApp/res/values-ko/strings.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="1411081210960307023">"RcsClient"</string>
+ <string name="provisioning_test" msgid="1035549386706009246">"프로비저닝 테스트"</string>
+ <string name="delegate_test" msgid="8212368545489779643">"테스트 위임"</string>
+ <string name="uce_test" msgid="6466919844953883038">"UCE 테스트"</string>
+ <string name="gba_test" msgid="8786745991279224003">"GBA 테스트"</string>
+ <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
+ <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
+ <string name="result" msgid="435222369457564619">"결과:"</string>
+ <string name="callback_result" msgid="7162990408241244749">"콜백 결과:"</string>
+ <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
+ <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
+ <string name="uce_description" msgid="1117661457446955869">"기능을 쿼리할 숫자를 입력하고, 여러 개일 경우 \',\' 기호로 구분하세요."</string>
+ <string name="number" msgid="9096578126043995890">"번호:"</string>
+ <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
+ <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
+ <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
+ <string name="start_chat" msgid="96121236227112396">"채팅 시작"</string>
+ <string name="to" msgid="1156781884609653284">"대상:"</string>
+ <string name="chat_message" msgid="3945528453939746046">"채팅 메시지"</string>
+ <string name="send" msgid="8797467615003240434">"보내기"</string>
+ <string name="ok" msgid="2206671077510386729">"확인"</string>
+ <string name="session_succeeded" msgid="4692992136758212220">"세션 초기화 성공"</string>
+ <string name="session_failed" msgid="4524986240102190509">"세션 초기화 실패"</string>
+ <string name="session_not_ready" msgid="4612635394279901948">"세션이 준비되지 않음"</string>
+ <string name="organization" msgid="913518283470119113">"조직:"</string>
+ <string name="uicc_type" msgid="5584433205228698588">"UICC 유형:"</string>
+ <string name="protocol" msgid="8626139294022821930">"프로토콜:"</string>
+ <string name="tls_cs" msgid="5410567052979996834">"TLS 암호화 스위트:"</string>
+ <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
+ <string name="standalone_pager" msgid="1351341861641131423">"독립형 페이저"</string>
+ <string name="standalone_large" msgid="336170805696694543">"독립형 대형"</string>
+ <string name="standalone_deferred" msgid="4906576900729108844">"독립형 지연됨"</string>
+ <string name="standalone_pager_large" msgid="5662294171123433547">"독립형 대형 페이저"</string>
+ <string name="chat" msgid="5500583808773151982">"채팅"</string>
+ <string name="file_transfer" msgid="5522080545470609737">"파일 전송"</string>
+ <string name="geolocation_sms" msgid="4463328438708195479">"위치정보 SMS"</string>
+ <string name="chatbot_session" msgid="5639314220589146717">"챗봇 세션"</string>
+ <string name="chatbot_standalone" msgid="8159185526765238041">"독립형 챗봇"</string>
+ <string name="chatbot_version" msgid="2431939061806512544">"챗봇 버전"</string>
+ <string name="provisioning_done" msgid="204618840179891984">"프로비저닝 완료"</string>
+ <string name="registration_done" msgid="492878616836655421">"등록 완료"</string>
+ <string-array name="organization">
+ <item msgid="9074061482474975772">"없음"</item>
+ <item msgid="7841117287115880098">"3GPP"</item>
+ <item msgid="5871357530951196401">"3GPP2"</item>
+ <item msgid="4979706772323445701">"OMA"</item>
+ <item msgid="1202873556413702218">"GSMA"</item>
+ <item msgid="2237392451840970059">"로컬"</item>
+ </string-array>
+ <string-array name="protocol">
+ <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
+ <item msgid="6305648228108532104">"MBMS"</item>
+ <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
+ <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
+ <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
+ <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
+ <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
+ <item msgid="7444251498958422990">"TLS_BROWSER"</item>
+ </string-array>
+ <string-array name="uicc_type">
+ <item msgid="5878327014492655902">"알 수 없음"</item>
+ <item msgid="1715684709703792003">"SIM"</item>
+ <item msgid="4592543026990143036">"USIM"</item>
+ <item msgid="8763183137100323328">"RSIM"</item>
+ <item msgid="3778400020205644807">"CSIM"</item>
+ <item msgid="3774607711141191499">"ISIM"</item>
+ </string-array>
+</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-lo/strings.xml b/testapps/TestRcsApp/TestApp/res/values-lo/strings.xml
new file mode 100644
index 0000000..6050bad
--- /dev/null
+++ b/testapps/TestRcsApp/TestApp/res/values-lo/strings.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="1411081210960307023">"RcsClient"</string>
+ <string name="provisioning_test" msgid="1035549386706009246">"Provisioning Test"</string>
+ <string name="delegate_test" msgid="8212368545489779643">"ທົດສອບຕົວແທນ"</string>
+ <string name="uce_test" msgid="6466919844953883038">"ທົດສອບ UCE"</string>
+ <string name="gba_test" msgid="8786745991279224003">"GBA Test"</string>
+ <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
+ <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
+ <string name="result" msgid="435222369457564619">"ຜົນໄດ້ຮັບ:"</string>
+ <string name="callback_result" msgid="7162990408241244749">"ຜົນການໂທກັບ:"</string>
+ <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
+ <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
+ <string name="uce_description" msgid="1117661457446955869">"ປ້ອນໝາຍເລກໃສ່ຄຳຊອກຫາ ແລະ ຂັ້ນດ້ວຍ \',\' ຖ້າມີຫຼາຍກວ່າໜຶ່ງ."</string>
+ <string name="number" msgid="9096578126043995890">"ໝາຍເລກ:"</string>
+ <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
+ <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
+ <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
+ <string name="start_chat" msgid="96121236227112396">"ເລີ່ມການສົນທະນາ"</string>
+ <string name="to" msgid="1156781884609653284">"ຫາ:"</string>
+ <string name="chat_message" msgid="3945528453939746046">"ຂໍ້ຄວາມສົນທະນາ"</string>
+ <string name="send" msgid="8797467615003240434">"ສົ່ງ"</string>
+ <string name="ok" msgid="2206671077510386729">"ຕົກລົງ"</string>
+ <string name="session_succeeded" msgid="4692992136758212220">"ເລີ່ມເຊດຊັນສຳເລັດ"</string>
+ <string name="session_failed" msgid="4524986240102190509">"ເລີ່ມເຊດຊັນຜິດພາດ"</string>
+ <string name="session_not_ready" msgid="4612635394279901948">"ເຊດຊັນບໍ່ທັນພ້ອມ"</string>
+ <string name="organization" msgid="913518283470119113">"ອົງການ:"</string>
+ <string name="uicc_type" msgid="5584433205228698588">"ປະເພດ UICC:"</string>
+ <string name="protocol" msgid="8626139294022821930">"ໂປຣໂຕຄໍ:"</string>
+ <string name="tls_cs" msgid="5410567052979996834">"ຊຸດ TLS Cipher:"</string>
+ <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
+ <string name="standalone_pager" msgid="1351341861641131423">"Standalone Pager"</string>
+ <string name="standalone_large" msgid="336170805696694543">"Standalone Large"</string>
+ <string name="standalone_deferred" msgid="4906576900729108844">"Standalone Deferred"</string>
+ <string name="standalone_pager_large" msgid="5662294171123433547">"Standalone Large Pager"</string>
+ <string name="chat" msgid="5500583808773151982">"ສົນທະນາ"</string>
+ <string name="file_transfer" msgid="5522080545470609737">"ການໂອນໄຟລ໌"</string>
+ <string name="geolocation_sms" msgid="4463328438708195479">"ທີ່ຕັ້ງພູມສາດ SMS"</string>
+ <string name="chatbot_session" msgid="5639314220589146717">"ເຊດຊັນ Chatbot"</string>
+ <string name="chatbot_standalone" msgid="8159185526765238041">"Chatbot ແບບດ່ຽວ"</string>
+ <string name="chatbot_version" msgid="2431939061806512544">"ເວີຊັນ Chatbot"</string>
+ <string name="provisioning_done" msgid="204618840179891984">"Provisioning Done"</string>
+ <string name="registration_done" msgid="492878616836655421">"Registration Done"</string>
+ <string-array name="organization">
+ <item msgid="9074061482474975772">"ບໍ່ມີ"</item>
+ <item msgid="7841117287115880098">"3GPP"</item>
+ <item msgid="5871357530951196401">"3GPP2"</item>
+ <item msgid="4979706772323445701">"OMA"</item>
+ <item msgid="1202873556413702218">"GSMA"</item>
+ <item msgid="2237392451840970059">"ພາຍໃນ"</item>
+ </string-array>
+ <string-array name="protocol">
+ <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
+ <item msgid="6305648228108532104">"MBMS"</item>
+ <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
+ <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
+ <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
+ <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
+ <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
+ <item msgid="7444251498958422990">"TLS_BROWSER"</item>
+ </string-array>
+ <string-array name="uicc_type">
+ <item msgid="5878327014492655902">"ບໍ່ຮູ້ຈັກ"</item>
+ <item msgid="1715684709703792003">"SIM"</item>
+ <item msgid="4592543026990143036">"USIM"</item>
+ <item msgid="8763183137100323328">"RSIM"</item>
+ <item msgid="3778400020205644807">"CSIM"</item>
+ <item msgid="3774607711141191499">"ISIM"</item>
+ </string-array>
+</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-ml/strings.xml b/testapps/TestRcsApp/TestApp/res/values-ml/strings.xml
new file mode 100644
index 0000000..00d9a4e
--- /dev/null
+++ b/testapps/TestRcsApp/TestApp/res/values-ml/strings.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="1411081210960307023">"RcsClient"</string>
+ <string name="provisioning_test" msgid="1035549386706009246">"പ്രൊവിഷനിംഗ് ടെസ്റ്റ്"</string>
+ <string name="delegate_test" msgid="8212368545489779643">"ഡെലിഗേറ്റ് ടെസ്റ്റ്"</string>
+ <string name="uce_test" msgid="6466919844953883038">"UCE ടെസ്റ്റ്"</string>
+ <string name="gba_test" msgid="8786745991279224003">"GBA ടെസ്റ്റ്"</string>
+ <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
+ <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
+ <string name="result" msgid="435222369457564619">"ഫലം:"</string>
+ <string name="callback_result" msgid="7162990408241244749">"തിരികെ വിളിക്കൽ ഫലം:"</string>
+ <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
+ <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
+ <string name="uce_description" msgid="1117661457446955869">"ചോദ്യത്തിന്റെ കാര്യക്ഷമത എന്നതിലേക്ക് നമ്പർ നൽകുക, ഒന്നിലധികം ഉണ്ടെങ്കിൽ അവയെ \',\' ഉപയോഗിച്ച് വേർതിരിക്കുക."</string>
+ <string name="number" msgid="9096578126043995890">"നമ്പർ:"</string>
+ <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
+ <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
+ <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
+ <string name="start_chat" msgid="96121236227112396">"ചാറ്റ് ആരംഭിക്കുക"</string>
+ <string name="to" msgid="1156781884609653284">"സ്വീകർത്താവ്:"</string>
+ <string name="chat_message" msgid="3945528453939746046">"Chat സന്ദേശം"</string>
+ <string name="send" msgid="8797467615003240434">"അയയ്ക്കുക"</string>
+ <string name="ok" msgid="2206671077510386729">"ശരി"</string>
+ <string name="session_succeeded" msgid="4692992136758212220">"സെഷൻ ആരംഭിച്ചു"</string>
+ <string name="session_failed" msgid="4524986240102190509">"സെഷൻ ആരംഭിക്കാനായില്ല"</string>
+ <string name="session_not_ready" msgid="4612635394279901948">"സെഷൻ തയ്യാറല്ല"</string>
+ <string name="organization" msgid="913518283470119113">"ഓർഗനൈസേഷൻ:"</string>
+ <string name="uicc_type" msgid="5584433205228698588">"UICC തരം:"</string>
+ <string name="protocol" msgid="8626139294022821930">"പ്രോട്ടോക്കോൾ:"</string>
+ <string name="tls_cs" msgid="5410567052979996834">"TLS Cipher Suite:"</string>
+ <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
+ <string name="standalone_pager" msgid="1351341861641131423">"സ്റ്റാൻഡ്എലോൺ പേജർ"</string>
+ <string name="standalone_large" msgid="336170805696694543">"സ്റ്റാൻഡ്എലോൺ ലാർജ്"</string>
+ <string name="standalone_deferred" msgid="4906576900729108844">"സ്റ്റാൻഡ്എലോൺ ഡെഫേഡ്"</string>
+ <string name="standalone_pager_large" msgid="5662294171123433547">"സ്റ്റാൻഡ്എലോൺ ലാർജ് പേജർ"</string>
+ <string name="chat" msgid="5500583808773151982">"Chat"</string>
+ <string name="file_transfer" msgid="5522080545470609737">"ഫയൽ കൈമാറൽ"</string>
+ <string name="geolocation_sms" msgid="4463328438708195479">"ജിയോലൊക്കേഷൻ SMS"</string>
+ <string name="chatbot_session" msgid="5639314220589146717">"ചാറ്റ്ബോട്ട് സെഷൻ"</string>
+ <string name="chatbot_standalone" msgid="8159185526765238041">"ചാറ്റ്ബോട്ട് സ്റ്റാൻഡ്എലോൺ"</string>
+ <string name="chatbot_version" msgid="2431939061806512544">"ചാറ്റ്ബോട്ട് പതിപ്പ്"</string>
+ <string name="provisioning_done" msgid="204618840179891984">"പ്രൊവിഷനിംഗ് പൂർത്തിയായി"</string>
+ <string name="registration_done" msgid="492878616836655421">"രജിസ്ട്രേഷൻ പൂർത്തിയായി"</string>
+ <string-array name="organization">
+ <item msgid="9074061482474975772">"ഒന്നുമില്ല"</item>
+ <item msgid="7841117287115880098">"3GPP"</item>
+ <item msgid="5871357530951196401">"3GPP2"</item>
+ <item msgid="4979706772323445701">"OMA"</item>
+ <item msgid="1202873556413702218">"GSMA"</item>
+ <item msgid="2237392451840970059">"LOCAL"</item>
+ </string-array>
+ <string-array name="protocol">
+ <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
+ <item msgid="6305648228108532104">"MBMS"</item>
+ <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
+ <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
+ <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
+ <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
+ <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
+ <item msgid="7444251498958422990">"TLS_BROWSER"</item>
+ </string-array>
+ <string-array name="uicc_type">
+ <item msgid="5878327014492655902">"UNKNOWN"</item>
+ <item msgid="1715684709703792003">"സിം"</item>
+ <item msgid="4592543026990143036">"USIM"</item>
+ <item msgid="8763183137100323328">"RSIM"</item>
+ <item msgid="3778400020205644807">"CSIM"</item>
+ <item msgid="3774607711141191499">"ISIM"</item>
+ </string-array>
+</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-ms/strings.xml b/testapps/TestRcsApp/TestApp/res/values-ms/strings.xml
new file mode 100644
index 0000000..758b2bd
--- /dev/null
+++ b/testapps/TestRcsApp/TestApp/res/values-ms/strings.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="1411081210960307023">"RcsClient"</string>
+ <string name="provisioning_test" msgid="1035549386706009246">"Ujian Peruntukan"</string>
+ <string name="delegate_test" msgid="8212368545489779643">"Tugaskan Ujian"</string>
+ <string name="uce_test" msgid="6466919844953883038">"Ujian UCE"</string>
+ <string name="gba_test" msgid="8786745991279224003">"Ujian GBA"</string>
+ <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
+ <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
+ <string name="result" msgid="435222369457564619">"Hasil:"</string>
+ <string name="callback_result" msgid="7162990408241244749">"Hasil Panggil Balik:"</string>
+ <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
+ <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
+ <string name="uce_description" msgid="1117661457446955869">"Masukkan nombor untuk bertanya keupayaan dan pisahkan dengan \',\' jika terdapat berbilang nombor."</string>
+ <string name="number" msgid="9096578126043995890">"Nombor:"</string>
+ <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
+ <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
+ <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
+ <string name="start_chat" msgid="96121236227112396">"Mulakan Sembang"</string>
+ <string name="to" msgid="1156781884609653284">"Kepada:"</string>
+ <string name="chat_message" msgid="3945528453939746046">"Mesej Sembang"</string>
+ <string name="send" msgid="8797467615003240434">"Hantar"</string>
+ <string name="ok" msgid="2206671077510386729">"OK"</string>
+ <string name="session_succeeded" msgid="4692992136758212220">"Pemulaan sesi berjaya"</string>
+ <string name="session_failed" msgid="4524986240102190509">"Pemulaan sesi gagal"</string>
+ <string name="session_not_ready" msgid="4612635394279901948">"Sesi belum sedia"</string>
+ <string name="organization" msgid="913518283470119113">"Organisasi:"</string>
+ <string name="uicc_type" msgid="5584433205228698588">"Jenis UICC:"</string>
+ <string name="protocol" msgid="8626139294022821930">"Protokol:"</string>
+ <string name="tls_cs" msgid="5410567052979996834">"Set Sifer TLS:"</string>
+ <string name="naf" msgid="7620247915001854662">"URI NAF:"</string>
+ <string name="standalone_pager" msgid="1351341861641131423">"Alat Kelui Kendiri"</string>
+ <string name="standalone_large" msgid="336170805696694543">"Apl Kendiri Besar"</string>
+ <string name="standalone_deferred" msgid="4906576900729108844">"Apl Kendiri Ditunda"</string>
+ <string name="standalone_pager_large" msgid="5662294171123433547">"Alat Kelui Kendiri Besar"</string>
+ <string name="chat" msgid="5500583808773151982">"Sembang"</string>
+ <string name="file_transfer" msgid="5522080545470609737">"Pemindahan Fail"</string>
+ <string name="geolocation_sms" msgid="4463328438708195479">"SMS Geolokasi"</string>
+ <string name="chatbot_session" msgid="5639314220589146717">"Sesi Chatbot"</string>
+ <string name="chatbot_standalone" msgid="8159185526765238041">"Apl Kendiri Chatbot"</string>
+ <string name="chatbot_version" msgid="2431939061806512544">"Versi Chatbot"</string>
+ <string name="provisioning_done" msgid="204618840179891984">"Peruntukan Selesai"</string>
+ <string name="registration_done" msgid="492878616836655421">"Pendaftaran Selesai"</string>
+ <string-array name="organization">
+ <item msgid="9074061482474975772">"TIADA"</item>
+ <item msgid="7841117287115880098">"3GPP"</item>
+ <item msgid="5871357530951196401">"3GPP2"</item>
+ <item msgid="4979706772323445701">"OMA"</item>
+ <item msgid="1202873556413702218">"GSMA"</item>
+ <item msgid="2237392451840970059">"SETEMPAT"</item>
+ </string-array>
+ <string-array name="protocol">
+ <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
+ <item msgid="6305648228108532104">"MBMS"</item>
+ <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
+ <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
+ <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
+ <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
+ <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
+ <item msgid="7444251498958422990">"TLS_BROWSER"</item>
+ </string-array>
+ <string-array name="uicc_type">
+ <item msgid="5878327014492655902">"TIDAK DIKETAHUI"</item>
+ <item msgid="1715684709703792003">"SIM"</item>
+ <item msgid="4592543026990143036">"USIM"</item>
+ <item msgid="8763183137100323328">"RSIM"</item>
+ <item msgid="3778400020205644807">"CSIM"</item>
+ <item msgid="3774607711141191499">"ISIM"</item>
+ </string-array>
+</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-ne/strings.xml b/testapps/TestRcsApp/TestApp/res/values-ne/strings.xml
new file mode 100644
index 0000000..51cf376
--- /dev/null
+++ b/testapps/TestRcsApp/TestApp/res/values-ne/strings.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="1411081210960307023">"RcsClient"</string>
+ <string name="provisioning_test" msgid="1035549386706009246">"प्रबन्ध मिलाउने परीक्षण"</string>
+ <string name="delegate_test" msgid="8212368545489779643">"परीक्षण गर्ने जिम्मा दिनुहोस्"</string>
+ <string name="uce_test" msgid="6466919844953883038">"UCE परीक्षण"</string>
+ <string name="gba_test" msgid="8786745991279224003">"GBA परीक्षण"</string>
+ <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
+ <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
+ <string name="result" msgid="435222369457564619">"परिणाम:"</string>
+ <string name="callback_result" msgid="7162990408241244749">"कलब्याकसम्बन्धी परिणाम:"</string>
+ <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
+ <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
+ <string name="uce_description" msgid="1117661457446955869">"क्वेरी क्यापाबिलिटीको नम्बर हाल्नुहोस्। एकभन्दा बढी नम्बर छन् भने \',\' ले छुट्याउनुहोस्।"</string>
+ <string name="number" msgid="9096578126043995890">"नम्बर:"</string>
+ <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
+ <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
+ <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
+ <string name="start_chat" msgid="96121236227112396">"च्याट गर्नुहोस्"</string>
+ <string name="to" msgid="1156781884609653284">"प्रापक:"</string>
+ <string name="chat_message" msgid="3945528453939746046">"च्याट म्यासेज"</string>
+ <string name="send" msgid="8797467615003240434">"पठाउनुहोस्"</string>
+ <string name="ok" msgid="2206671077510386729">"ठिक छ"</string>
+ <string name="session_succeeded" msgid="4692992136758212220">"सत्र सफलतापूर्वक सुरु गरियो"</string>
+ <string name="session_failed" msgid="4524986240102190509">"सत्र सुरु गर्न सकिएन"</string>
+ <string name="session_not_ready" msgid="4612635394279901948">"सत्र तयार छैन"</string>
+ <string name="organization" msgid="913518283470119113">"सङ्गठन:"</string>
+ <string name="uicc_type" msgid="5584433205228698588">"UICC को प्रकार:"</string>
+ <string name="protocol" msgid="8626139294022821930">"प्रोटोकोल:"</string>
+ <string name="tls_cs" msgid="5410567052979996834">"TLS Cipher Suite:"</string>
+ <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
+ <string name="standalone_pager" msgid="1351341861641131423">"स्ट्यान्डअलोन पेजर"</string>
+ <string name="standalone_large" msgid="336170805696694543">"स्ट्यान्डअलोन ठुलो"</string>
+ <string name="standalone_deferred" msgid="4906576900729108844">"स्ट्यान्डअलोन विलम्बित गरिएको"</string>
+ <string name="standalone_pager_large" msgid="5662294171123433547">"स्ट्यान्डअलोन ठुलो पेजर"</string>
+ <string name="chat" msgid="5500583808773151982">"Chat"</string>
+ <string name="file_transfer" msgid="5522080545470609737">"फाइल स्थानान्तरण"</string>
+ <string name="geolocation_sms" msgid="4463328438708195479">"भूस्थानसम्बन्धी SMS"</string>
+ <string name="chatbot_session" msgid="5639314220589146717">"च्याटबटसँगको सत्र"</string>
+ <string name="chatbot_standalone" msgid="8159185526765238041">"च्याटबट स्ट्यान्डअलोन"</string>
+ <string name="chatbot_version" msgid="2431939061806512544">"च्याटबटको संस्करण"</string>
+ <string name="provisioning_done" msgid="204618840179891984">"प्रबन्ध मिलाउने कार्य पूरा भयो"</string>
+ <string name="registration_done" msgid="492878616836655421">"दर्ता गर्ने कार्य पूरा भयो"</string>
+ <string-array name="organization">
+ <item msgid="9074061482474975772">"कुनै पनि होइन"</item>
+ <item msgid="7841117287115880098">"3GPP"</item>
+ <item msgid="5871357530951196401">"3GPP2"</item>
+ <item msgid="4979706772323445701">"OMA"</item>
+ <item msgid="1202873556413702218">"GSMA"</item>
+ <item msgid="2237392451840970059">"स्थानीय"</item>
+ </string-array>
+ <string-array name="protocol">
+ <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
+ <item msgid="6305648228108532104">"MBMS"</item>
+ <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
+ <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
+ <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
+ <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
+ <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
+ <item msgid="7444251498958422990">"TLS_BROWSER"</item>
+ </string-array>
+ <string-array name="uicc_type">
+ <item msgid="5878327014492655902">"अज्ञात"</item>
+ <item msgid="1715684709703792003">"SIM"</item>
+ <item msgid="4592543026990143036">"USIM"</item>
+ <item msgid="8763183137100323328">"RSIM"</item>
+ <item msgid="3778400020205644807">"CSIM"</item>
+ <item msgid="3774607711141191499">"ISIM"</item>
+ </string-array>
+</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-or/strings.xml b/testapps/TestRcsApp/TestApp/res/values-or/strings.xml
new file mode 100644
index 0000000..5c9491b
--- /dev/null
+++ b/testapps/TestRcsApp/TestApp/res/values-or/strings.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="1411081210960307023">"RcsClient"</string>
+ <string name="provisioning_test" msgid="1035549386706009246">"ପ୍ରୋଭିଜନିଂ ଟେଷ୍ଟ"</string>
+ <string name="delegate_test" msgid="8212368545489779643">"ଟେଷ୍ଟ ଡେଲିଗେଟ୍ କରନ୍ତୁ"</string>
+ <string name="uce_test" msgid="6466919844953883038">"UCE ଟେଷ୍ଟ"</string>
+ <string name="gba_test" msgid="8786745991279224003">"GBA ଟେଷ୍ଟ"</string>
+ <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
+ <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
+ <string name="result" msgid="435222369457564619">"ଫଳାଫଳ:"</string>
+ <string name="callback_result" msgid="7162990408241244749">"କଲବ୍ୟାକ୍ ଫଳାଫଳ:"</string>
+ <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
+ <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
+ <string name="uce_description" msgid="1117661457446955869">"ସାମର୍ଥ୍ୟ ପାଇଁ କ୍ୱେରୀ କରିବାକୁ ନମ୍ବର ଲେଖନ୍ତୁ ଏବଂ ଯଦି ଏକାଧିକ ନମ୍ବର ଅଛି ତେବେ \',\' ଦ୍ୱାରା ଅଲଗା କରନ୍ତୁ।"</string>
+ <string name="number" msgid="9096578126043995890">"ନମ୍ବର:"</string>
+ <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
+ <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
+ <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
+ <string name="start_chat" msgid="96121236227112396">"ଚାଟ୍ ଆରମ୍ଭ କରନ୍ତୁ"</string>
+ <string name="to" msgid="1156781884609653284">"ପ୍ରାପ୍ତେଷୁ:"</string>
+ <string name="chat_message" msgid="3945528453939746046">"ଚାଟ୍ ମେସେଜ୍"</string>
+ <string name="send" msgid="8797467615003240434">"ପଠାନ୍ତୁ"</string>
+ <string name="ok" msgid="2206671077510386729">"ଠିକ୍ ଅଛି"</string>
+ <string name="session_succeeded" msgid="4692992136758212220">"ସେସନ୍ ଆରମ୍ଭ ସଫଳ ହୋଇଛି"</string>
+ <string name="session_failed" msgid="4524986240102190509">"ସେସନ୍ ଆରମ୍ଭ ବିଫଳ ହୋଇଛି"</string>
+ <string name="session_not_ready" msgid="4612635394279901948">"ସେସନ୍ ପ୍ରସ୍ତୁତ ନୁହେଁ"</string>
+ <string name="organization" msgid="913518283470119113">"ସଂସ୍ଥା:"</string>
+ <string name="uicc_type" msgid="5584433205228698588">"UICC ପ୍ରକାର:"</string>
+ <string name="protocol" msgid="8626139294022821930">"ପ୍ରୋଟୋକଲ୍:"</string>
+ <string name="tls_cs" msgid="5410567052979996834">"TLS ସାଇଫର୍ ସୁଟ୍:"</string>
+ <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
+ <string name="standalone_pager" msgid="1351341861641131423">"ଷ୍ଟାଣ୍ଡଏଲୋନ୍ ପେଜର୍"</string>
+ <string name="standalone_large" msgid="336170805696694543">"ଷ୍ଟାଣ୍ଡଏଲୋନ୍ ବଡ଼"</string>
+ <string name="standalone_deferred" msgid="4906576900729108844">"ଷ୍ଟାଣ୍ଡଏଲୋନ୍ ସ୍ଥଗିତ ହୋଇଛି"</string>
+ <string name="standalone_pager_large" msgid="5662294171123433547">"ଷ୍ଟାଣ୍ଡଏଲୋନ୍ ବଡ଼ ପେଜର୍"</string>
+ <string name="chat" msgid="5500583808773151982">"ଚାଟ୍"</string>
+ <string name="file_transfer" msgid="5522080545470609737">"ଫାଇଲ୍ ଟ୍ରାନ୍ସଫର୍"</string>
+ <string name="geolocation_sms" msgid="4463328438708195479">"ଜିଓଲୋକେସନ୍ SMS"</string>
+ <string name="chatbot_session" msgid="5639314220589146717">"ଚାଟବଟ୍ ସେସନ୍"</string>
+ <string name="chatbot_standalone" msgid="8159185526765238041">"ଚାଟବଟ୍ ଷ୍ଟାଣ୍ଡଏଲୋନ୍"</string>
+ <string name="chatbot_version" msgid="2431939061806512544">"ଚାଟବଟ୍ ସଂସ୍କରଣ"</string>
+ <string name="provisioning_done" msgid="204618840179891984">"ପ୍ରୋଭିଜନିଂ ହୋଇଗଲା"</string>
+ <string name="registration_done" msgid="492878616836655421">"ପଞ୍ଜିକରଣ ହୋଇଗଲା"</string>
+ <string-array name="organization">
+ <item msgid="9074061482474975772">"କିଛି ନାହିଁ"</item>
+ <item msgid="7841117287115880098">"3GPP"</item>
+ <item msgid="5871357530951196401">"3GPP2"</item>
+ <item msgid="4979706772323445701">"OMA"</item>
+ <item msgid="1202873556413702218">"GSMA"</item>
+ <item msgid="2237392451840970059">"ସ୍ଥାନୀୟ"</item>
+ </string-array>
+ <string-array name="protocol">
+ <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
+ <item msgid="6305648228108532104">"MBMS"</item>
+ <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
+ <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
+ <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
+ <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
+ <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
+ <item msgid="7444251498958422990">"TLS_BROWSER"</item>
+ </string-array>
+ <string-array name="uicc_type">
+ <item msgid="5878327014492655902">"ଅଜଣା"</item>
+ <item msgid="1715684709703792003">"SIM"</item>
+ <item msgid="4592543026990143036">"USIM"</item>
+ <item msgid="8763183137100323328">"RSIM"</item>
+ <item msgid="3778400020205644807">"CSIM"</item>
+ <item msgid="3774607711141191499">"ISIM"</item>
+ </string-array>
+</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-ro/strings.xml b/testapps/TestRcsApp/TestApp/res/values-ro/strings.xml
new file mode 100644
index 0000000..593cf46
--- /dev/null
+++ b/testapps/TestRcsApp/TestApp/res/values-ro/strings.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="1411081210960307023">"RcsClient"</string>
+ <string name="provisioning_test" msgid="1035549386706009246">"Test de configurare a accesului pentru utilizatori"</string>
+ <string name="delegate_test" msgid="8212368545489779643">"Test delegat"</string>
+ <string name="uce_test" msgid="6466919844953883038">"Test UCE"</string>
+ <string name="gba_test" msgid="8786745991279224003">"Test GBA"</string>
+ <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
+ <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
+ <string name="result" msgid="435222369457564619">"Rezultat:"</string>
+ <string name="callback_result" msgid="7162990408241244749">"Rezultatul apelării inverse:"</string>
+ <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
+ <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
+ <string name="uce_description" msgid="1117661457446955869">"Introduceți numărul pentru capacitatea de interogare și separați prin „,” dacă aveți mai multe."</string>
+ <string name="number" msgid="9096578126043995890">"Număr:"</string>
+ <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
+ <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
+ <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
+ <string name="start_chat" msgid="96121236227112396">"Începeți conversația"</string>
+ <string name="to" msgid="1156781884609653284">"Către:"</string>
+ <string name="chat_message" msgid="3945528453939746046">"Mesaj prin chat"</string>
+ <string name="send" msgid="8797467615003240434">"Trimiteți"</string>
+ <string name="ok" msgid="2206671077510386729">"OK"</string>
+ <string name="session_succeeded" msgid="4692992136758212220">"S-a inițializat sesiunea"</string>
+ <string name="session_failed" msgid="4524986240102190509">"Sesiunea nu a fost inițializată"</string>
+ <string name="session_not_ready" msgid="4612635394279901948">"Sesiunea nu este gata"</string>
+ <string name="organization" msgid="913518283470119113">"Organizație:"</string>
+ <string name="uicc_type" msgid="5584433205228698588">"Tip UICC:"</string>
+ <string name="protocol" msgid="8626139294022821930">"Protocol:"</string>
+ <string name="tls_cs" msgid="5410567052979996834">"Suita cifrului TLS:"</string>
+ <string name="naf" msgid="7620247915001854662">"URI NAF:"</string>
+ <string name="standalone_pager" msgid="1351341861641131423">"Pager autonom"</string>
+ <string name="standalone_large" msgid="336170805696694543">"Autonom mare"</string>
+ <string name="standalone_deferred" msgid="4906576900729108844">"Autonom amânat"</string>
+ <string name="standalone_pager_large" msgid="5662294171123433547">"Pager autonom mare"</string>
+ <string name="chat" msgid="5500583808773151982">"Chat"</string>
+ <string name="file_transfer" msgid="5522080545470609737">"Transfer de fișier"</string>
+ <string name="geolocation_sms" msgid="4463328438708195479">"SMS pentru localizare geografică"</string>
+ <string name="chatbot_session" msgid="5639314220589146717">"Sesiune chatbot"</string>
+ <string name="chatbot_standalone" msgid="8159185526765238041">"Chatbot autonom"</string>
+ <string name="chatbot_version" msgid="2431939061806512544">"Versiune chatbot"</string>
+ <string name="provisioning_done" msgid="204618840179891984">"S-a configurat accesul pentru utilizatori"</string>
+ <string name="registration_done" msgid="492878616836655421">"S-a înregistrat"</string>
+ <string-array name="organization">
+ <item msgid="9074061482474975772">"NICIUNA"</item>
+ <item msgid="7841117287115880098">"3GPP"</item>
+ <item msgid="5871357530951196401">"3GPP2"</item>
+ <item msgid="4979706772323445701">"OMA"</item>
+ <item msgid="1202873556413702218">"GSMA"</item>
+ <item msgid="2237392451840970059">"LOCAL"</item>
+ </string-array>
+ <string-array name="protocol">
+ <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
+ <item msgid="6305648228108532104">"MBMS"</item>
+ <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
+ <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
+ <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
+ <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
+ <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
+ <item msgid="7444251498958422990">"TLS_BROWSER"</item>
+ </string-array>
+ <string-array name="uicc_type">
+ <item msgid="5878327014492655902">"NECUNOSCUTĂ"</item>
+ <item msgid="1715684709703792003">"SIM"</item>
+ <item msgid="4592543026990143036">"USIM"</item>
+ <item msgid="8763183137100323328">"RSIM"</item>
+ <item msgid="3778400020205644807">"CSIM"</item>
+ <item msgid="3774607711141191499">"ISIM"</item>
+ </string-array>
+</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-ru/strings.xml b/testapps/TestRcsApp/TestApp/res/values-ru/strings.xml
new file mode 100644
index 0000000..1276015
--- /dev/null
+++ b/testapps/TestRcsApp/TestApp/res/values-ru/strings.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="1411081210960307023">"RcsClient"</string>
+ <string name="provisioning_test" msgid="1035549386706009246">"Тест инициализации"</string>
+ <string name="delegate_test" msgid="8212368545489779643">"Делегирование теста"</string>
+ <string name="uce_test" msgid="6466919844953883038">"Тест UCE"</string>
+ <string name="gba_test" msgid="8786745991279224003">"Тест GBA"</string>
+ <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
+ <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
+ <string name="result" msgid="435222369457564619">"Результат:"</string>
+ <string name="callback_result" msgid="7162990408241244749">"Результат обратного вызова:"</string>
+ <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
+ <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
+ <string name="uce_description" msgid="1117661457446955869">"Введите номер для запроса возможности. Разделяйте номера запятыми, если их несколько."</string>
+ <string name="number" msgid="9096578126043995890">"Номер:"</string>
+ <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
+ <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
+ <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
+ <string name="start_chat" msgid="96121236227112396">"Начать чат"</string>
+ <string name="to" msgid="1156781884609653284">"Кому:"</string>
+ <string name="chat_message" msgid="3945528453939746046">"Сообщение чата"</string>
+ <string name="send" msgid="8797467615003240434">"Отправить"</string>
+ <string name="ok" msgid="2206671077510386729">"ОК"</string>
+ <string name="session_succeeded" msgid="4692992136758212220">"Инициализация сеанса выполнена"</string>
+ <string name="session_failed" msgid="4524986240102190509">"Сбой инициализации сеанса"</string>
+ <string name="session_not_ready" msgid="4612635394279901948">"Сеанс не готов\\"</string>
+ <string name="organization" msgid="913518283470119113">"Организация:"</string>
+ <string name="uicc_type" msgid="5584433205228698588">"Тип UICC:"</string>
+ <string name="protocol" msgid="8626139294022821930">"Протокол:"</string>
+ <string name="tls_cs" msgid="5410567052979996834">"Шифронабор TLS:"</string>
+ <string name="naf" msgid="7620247915001854662">"URI NAF:"</string>
+ <string name="standalone_pager" msgid="1351341861641131423">"Автономный пейджер"</string>
+ <string name="standalone_large" msgid="336170805696694543">"Автономный большой"</string>
+ <string name="standalone_deferred" msgid="4906576900729108844">"Автономный отложенный"</string>
+ <string name="standalone_pager_large" msgid="5662294171123433547">"Автономный большой пейджер"</string>
+ <string name="chat" msgid="5500583808773151982">"Чат"</string>
+ <string name="file_transfer" msgid="5522080545470609737">"Передача файла"</string>
+ <string name="geolocation_sms" msgid="4463328438708195479">"SMS геолокации"</string>
+ <string name="chatbot_session" msgid="5639314220589146717">"Сеанс чат-бота"</string>
+ <string name="chatbot_standalone" msgid="8159185526765238041">"Автономный чат-бот"</string>
+ <string name="chatbot_version" msgid="2431939061806512544">"Версия чат-бота"</string>
+ <string name="provisioning_done" msgid="204618840179891984">"Инициализация выполнена"</string>
+ <string name="registration_done" msgid="492878616836655421">"Регистрация выполнена"</string>
+ <string-array name="organization">
+ <item msgid="9074061482474975772">"НЕТ"</item>
+ <item msgid="7841117287115880098">"3GPP"</item>
+ <item msgid="5871357530951196401">"3GPP2"</item>
+ <item msgid="4979706772323445701">"OMA"</item>
+ <item msgid="1202873556413702218">"GSMA"</item>
+ <item msgid="2237392451840970059">"МЕСТНАЯ СЕТЬ"</item>
+ </string-array>
+ <string-array name="protocol">
+ <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
+ <item msgid="6305648228108532104">"MBMS"</item>
+ <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
+ <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
+ <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
+ <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
+ <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
+ <item msgid="7444251498958422990">"TLS_BROWSER"</item>
+ </string-array>
+ <string-array name="uicc_type">
+ <item msgid="5878327014492655902">"НЕИЗВЕСТНО"</item>
+ <item msgid="1715684709703792003">"SIM"</item>
+ <item msgid="4592543026990143036">"USIM"</item>
+ <item msgid="8763183137100323328">"RSIM"</item>
+ <item msgid="3778400020205644807">"CSIM"</item>
+ <item msgid="3774607711141191499">"ISIM"</item>
+ </string-array>
+</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-sl/strings.xml b/testapps/TestRcsApp/TestApp/res/values-sl/strings.xml
new file mode 100644
index 0000000..ca62620
--- /dev/null
+++ b/testapps/TestRcsApp/TestApp/res/values-sl/strings.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="1411081210960307023">"RcsClient"</string>
+ <string name="provisioning_test" msgid="1035549386706009246">"Preizkus priprave za uporabo"</string>
+ <string name="delegate_test" msgid="8212368545489779643">"Preizkus dodelitve"</string>
+ <string name="uce_test" msgid="6466919844953883038">"Preizkus UCE"</string>
+ <string name="gba_test" msgid="8786745991279224003">"Preizkus GBA"</string>
+ <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
+ <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
+ <string name="result" msgid="435222369457564619">"Rezultat:"</string>
+ <string name="callback_result" msgid="7162990408241244749">"Rezultat povratnega klica:"</string>
+ <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
+ <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
+ <string name="uce_description" msgid="1117661457446955869">"Vnesite številko, da pošljete poizvedbo za zmogljivost. Če jih je več, jih ločite z vejicami."</string>
+ <string name="number" msgid="9096578126043995890">"Številka:"</string>
+ <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
+ <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
+ <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
+ <string name="start_chat" msgid="96121236227112396">"Zaženi Chat"</string>
+ <string name="to" msgid="1156781884609653284">"Za:"</string>
+ <string name="chat_message" msgid="3945528453939746046">"Sporočilo v storitvi Chat"</string>
+ <string name="send" msgid="8797467615003240434">"Pošlji"</string>
+ <string name="ok" msgid="2206671077510386729">"V redu"</string>
+ <string name="session_succeeded" msgid="4692992136758212220">"Inicializacija seje je uspela"</string>
+ <string name="session_failed" msgid="4524986240102190509">"Inicializacija seje ni uspela"</string>
+ <string name="session_not_ready" msgid="4612635394279901948">"Seja ni pripravljena"</string>
+ <string name="organization" msgid="913518283470119113">"Organizacija:"</string>
+ <string name="uicc_type" msgid="5584433205228698588">"Vrsta UICC:"</string>
+ <string name="protocol" msgid="8626139294022821930">"Protokol:"</string>
+ <string name="tls_cs" msgid="5410567052979996834">"Zbirka šifriranja TLS:"</string>
+ <string name="naf" msgid="7620247915001854662">"URI NAF:"</string>
+ <string name="standalone_pager" msgid="1351341861641131423">"Samostojni pozivnik"</string>
+ <string name="standalone_large" msgid="336170805696694543">"Samostojno veliko"</string>
+ <string name="standalone_deferred" msgid="4906576900729108844">"Samostojno odloženo"</string>
+ <string name="standalone_pager_large" msgid="5662294171123433547">"Samostojni veliki pozivnik"</string>
+ <string name="chat" msgid="5500583808773151982">"Chat"</string>
+ <string name="file_transfer" msgid="5522080545470609737">"Prenos datotek"</string>
+ <string name="geolocation_sms" msgid="4463328438708195479">"Geolokacijski SMS"</string>
+ <string name="chatbot_session" msgid="5639314220589146717">"Seja bota za klepet"</string>
+ <string name="chatbot_standalone" msgid="8159185526765238041">"Samostojni bot za klepet"</string>
+ <string name="chatbot_version" msgid="2431939061806512544">"Različica bota za klepet"</string>
+ <string name="provisioning_done" msgid="204618840179891984">"Priprava za uporabo je končana"</string>
+ <string name="registration_done" msgid="492878616836655421">"Registracija je končana"</string>
+ <string-array name="organization">
+ <item msgid="9074061482474975772">"NONE"</item>
+ <item msgid="7841117287115880098">"3GPP"</item>
+ <item msgid="5871357530951196401">"3GPP2"</item>
+ <item msgid="4979706772323445701">"OMA"</item>
+ <item msgid="1202873556413702218">"GSMA"</item>
+ <item msgid="2237392451840970059">"LOCAL"</item>
+ </string-array>
+ <string-array name="protocol">
+ <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
+ <item msgid="6305648228108532104">"MBMS"</item>
+ <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
+ <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
+ <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
+ <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
+ <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
+ <item msgid="7444251498958422990">"TLS_BROWSER"</item>
+ </string-array>
+ <string-array name="uicc_type">
+ <item msgid="5878327014492655902">"UNKNOWN"</item>
+ <item msgid="1715684709703792003">"SIM"</item>
+ <item msgid="4592543026990143036">"USIM"</item>
+ <item msgid="8763183137100323328">"RSIM"</item>
+ <item msgid="3778400020205644807">"CSIM"</item>
+ <item msgid="3774607711141191499">"ISIM"</item>
+ </string-array>
+</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-te/strings.xml b/testapps/TestRcsApp/TestApp/res/values-te/strings.xml
new file mode 100644
index 0000000..7a0643d
--- /dev/null
+++ b/testapps/TestRcsApp/TestApp/res/values-te/strings.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="1411081210960307023">"RcsClient"</string>
+ <string name="provisioning_test" msgid="1035549386706009246">"నిర్వహణ టెస్ట్"</string>
+ <string name="delegate_test" msgid="8212368545489779643">"డెలిగేట్ టెస్ట్"</string>
+ <string name="uce_test" msgid="6466919844953883038">"UCE టెస్ట్"</string>
+ <string name="gba_test" msgid="8786745991279224003">"GBA టెస్ట్"</string>
+ <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
+ <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
+ <string name="result" msgid="435222369457564619">"ఫలితం:"</string>
+ <string name="callback_result" msgid="7162990408241244749">"కాల్బ్యాక్ ఫలితం:"</string>
+ <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
+ <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
+ <string name="uce_description" msgid="1117661457446955869">"క్వెరీ సామర్థ్యం కోసం నంబర్ను ఎంటర్ చేసి, అవి ఒకటి కంటే ఎక్కువ ఉంటే \',\'తో వేరు చేయండి."</string>
+ <string name="number" msgid="9096578126043995890">"నంబర్:"</string>
+ <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
+ <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
+ <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
+ <string name="start_chat" msgid="96121236227112396">"చాట్ను ప్రారంభించండి"</string>
+ <string name="to" msgid="1156781884609653284">"వీరికి:"</string>
+ <string name="chat_message" msgid="3945528453939746046">"చాట్ మెసేజ్"</string>
+ <string name="send" msgid="8797467615003240434">"పంపు"</string>
+ <string name="ok" msgid="2206671077510386729">"సరే"</string>
+ <string name="session_succeeded" msgid="4692992136758212220">"సెషన్ ప్రారంభం విజయవంతమైంది"</string>
+ <string name="session_failed" msgid="4524986240102190509">"సెషన్ ప్రారంభం విఫలమైంది"</string>
+ <string name="session_not_ready" msgid="4612635394279901948">"సెషన్ సిద్ధంగా ఉంది"</string>
+ <string name="organization" msgid="913518283470119113">"సంస్థ:"</string>
+ <string name="uicc_type" msgid="5584433205228698588">"UICC రకం:"</string>
+ <string name="protocol" msgid="8626139294022821930">"ప్రోటోకాల్:"</string>
+ <string name="tls_cs" msgid="5410567052979996834">"TLS Cipher Suite:"</string>
+ <string name="naf" msgid="7620247915001854662">"NAF URI:"</string>
+ <string name="standalone_pager" msgid="1351341861641131423">"స్టాండ్ఎలోన్ పేజర్"</string>
+ <string name="standalone_large" msgid="336170805696694543">"స్టాండ్ఎలోన్ లార్జ్"</string>
+ <string name="standalone_deferred" msgid="4906576900729108844">"స్టాండ్ఎలోన్ వాయిదా వేయబడింది"</string>
+ <string name="standalone_pager_large" msgid="5662294171123433547">"స్టాండ్ఎలోన్ లార్జ్ పేజర్"</string>
+ <string name="chat" msgid="5500583808773151982">"చాట్"</string>
+ <string name="file_transfer" msgid="5522080545470609737">"ఫైల్ బదిలీ"</string>
+ <string name="geolocation_sms" msgid="4463328438708195479">"భౌగోళిక స్థాన SMS"</string>
+ <string name="chatbot_session" msgid="5639314220589146717">"చాట్బాట్ సెషన్"</string>
+ <string name="chatbot_standalone" msgid="8159185526765238041">"చాట్బాట్ స్టాండ్ఎలోన్"</string>
+ <string name="chatbot_version" msgid="2431939061806512544">"చాట్బాట్ వెర్షన్"</string>
+ <string name="provisioning_done" msgid="204618840179891984">"నిర్వహణ పూర్తయింది"</string>
+ <string name="registration_done" msgid="492878616836655421">"రిజిస్ట్రేషన్ పూర్తయింది"</string>
+ <string-array name="organization">
+ <item msgid="9074061482474975772">"ఏదీ కాదు"</item>
+ <item msgid="7841117287115880098">"3GPP"</item>
+ <item msgid="5871357530951196401">"3GPP2"</item>
+ <item msgid="4979706772323445701">"OMA"</item>
+ <item msgid="1202873556413702218">"GSMA"</item>
+ <item msgid="2237392451840970059">"LOCAL"</item>
+ </string-array>
+ <string-array name="protocol">
+ <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
+ <item msgid="6305648228108532104">"MBMS"</item>
+ <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
+ <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
+ <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
+ <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
+ <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
+ <item msgid="7444251498958422990">"TLS_BROWSER"</item>
+ </string-array>
+ <string-array name="uicc_type">
+ <item msgid="5878327014492655902">"తెలియదు"</item>
+ <item msgid="1715684709703792003">"SIM"</item>
+ <item msgid="4592543026990143036">"USIM"</item>
+ <item msgid="8763183137100323328">"RSIM"</item>
+ <item msgid="3778400020205644807">"CSIM"</item>
+ <item msgid="3774607711141191499">"ISIM"</item>
+ </string-array>
+</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-tl/strings.xml b/testapps/TestRcsApp/TestApp/res/values-tl/strings.xml
new file mode 100644
index 0000000..e2dc0cb
--- /dev/null
+++ b/testapps/TestRcsApp/TestApp/res/values-tl/strings.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="1411081210960307023">"RcsClient"</string>
+ <string name="provisioning_test" msgid="1035549386706009246">"Pagsusuri ng Provisioning"</string>
+ <string name="delegate_test" msgid="8212368545489779643">"Pagsusuri ng Pinaglaanan"</string>
+ <string name="uce_test" msgid="6466919844953883038">"Pagsusuri ng UCE"</string>
+ <string name="gba_test" msgid="8786745991279224003">"Pagsusuri ng GBA"</string>
+ <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
+ <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
+ <string name="result" msgid="435222369457564619">"Resulta:"</string>
+ <string name="callback_result" msgid="7162990408241244749">"Resulta ng Callback:"</string>
+ <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
+ <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
+ <string name="uce_description" msgid="1117661457446955869">"Ilagay ang numero para i-query ang kakayahan at paghiwa-hiwalayin gamit ang \',\' kung marami ito."</string>
+ <string name="number" msgid="9096578126043995890">"Numero:"</string>
+ <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
+ <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
+ <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
+ <string name="start_chat" msgid="96121236227112396">"Simulan ang Chat"</string>
+ <string name="to" msgid="1156781884609653284">"Para sa:"</string>
+ <string name="chat_message" msgid="3945528453939746046">"Mensahe sa Chat"</string>
+ <string name="send" msgid="8797467615003240434">"Ipadala"</string>
+ <string name="ok" msgid="2206671077510386729">"OK"</string>
+ <string name="session_succeeded" msgid="4692992136758212220">"Matagumpay na nasimulan ang session"</string>
+ <string name="session_failed" msgid="4524986240102190509">"Hindi nasimulan ang session"</string>
+ <string name="session_not_ready" msgid="4612635394279901948">"Hindi pa handa ang session"</string>
+ <string name="organization" msgid="913518283470119113">"Organisasyon:"</string>
+ <string name="uicc_type" msgid="5584433205228698588">"Uri ng UICC:"</string>
+ <string name="protocol" msgid="8626139294022821930">"Protocol:"</string>
+ <string name="tls_cs" msgid="5410567052979996834">"TLS Cipher Suite:"</string>
+ <string name="naf" msgid="7620247915001854662">"URI ng NAF:"</string>
+ <string name="standalone_pager" msgid="1351341861641131423">"Standalone Pager"</string>
+ <string name="standalone_large" msgid="336170805696694543">"Standalone Large"</string>
+ <string name="standalone_deferred" msgid="4906576900729108844">"Standalone Deferred"</string>
+ <string name="standalone_pager_large" msgid="5662294171123433547">"Standalone Large Pager"</string>
+ <string name="chat" msgid="5500583808773151982">"Chat"</string>
+ <string name="file_transfer" msgid="5522080545470609737">"Paglilipat ng File"</string>
+ <string name="geolocation_sms" msgid="4463328438708195479">"SMS ng Geolocation"</string>
+ <string name="chatbot_session" msgid="5639314220589146717">"Chatbot Session"</string>
+ <string name="chatbot_standalone" msgid="8159185526765238041">"Chatbot Standalone"</string>
+ <string name="chatbot_version" msgid="2431939061806512544">"Bersyon ng Chatbot"</string>
+ <string name="provisioning_done" msgid="204618840179891984">"Tapos na ang Provisioning"</string>
+ <string name="registration_done" msgid="492878616836655421">"Tapos na ang Pagpaparehistro"</string>
+ <string-array name="organization">
+ <item msgid="9074061482474975772">"WALA"</item>
+ <item msgid="7841117287115880098">"3GPP"</item>
+ <item msgid="5871357530951196401">"3GPP2"</item>
+ <item msgid="4979706772323445701">"OMA"</item>
+ <item msgid="1202873556413702218">"GSMA"</item>
+ <item msgid="2237392451840970059">"LOKAL"</item>
+ </string-array>
+ <string-array name="protocol">
+ <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
+ <item msgid="6305648228108532104">"MBMS"</item>
+ <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
+ <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
+ <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
+ <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
+ <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
+ <item msgid="7444251498958422990">"TLS_BROWSER"</item>
+ </string-array>
+ <string-array name="uicc_type">
+ <item msgid="5878327014492655902">"HINDI ALAM"</item>
+ <item msgid="1715684709703792003">"SIM"</item>
+ <item msgid="4592543026990143036">"USIM"</item>
+ <item msgid="8763183137100323328">"RSIM"</item>
+ <item msgid="3778400020205644807">"CSIM"</item>
+ <item msgid="3774607711141191499">"ISIM"</item>
+ </string-array>
+</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-zh-rHK/strings.xml b/testapps/TestRcsApp/TestApp/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..ec7f74a
--- /dev/null
+++ b/testapps/TestRcsApp/TestApp/res/values-zh-rHK/strings.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="1411081210960307023">"RcsClient"</string>
+ <string name="provisioning_test" msgid="1035549386706009246">"佈建測試"</string>
+ <string name="delegate_test" msgid="8212368545489779643">"委派測試"</string>
+ <string name="uce_test" msgid="6466919844953883038">"UCE 測試"</string>
+ <string name="gba_test" msgid="8786745991279224003">"GBA 測試"</string>
+ <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
+ <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
+ <string name="result" msgid="435222369457564619">"結果："</string>
+ <string name="callback_result" msgid="7162990408241244749">"回撥電話結果："</string>
+ <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
+ <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
+ <string name="uce_description" msgid="1117661457446955869">"輸入要查詢功能的號碼；如果有多組號碼，請以半形逗號 (,) 分隔。"</string>
+ <string name="number" msgid="9096578126043995890">"號碼："</string>
+ <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
+ <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
+ <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
+ <string name="start_chat" msgid="96121236227112396">"發起即時通訊"</string>
+ <string name="to" msgid="1156781884609653284">"收件者："</string>
+ <string name="chat_message" msgid="3945528453939746046">"即時通訊訊息"</string>
+ <string name="send" msgid="8797467615003240434">"傳送"</string>
+ <string name="ok" msgid="2206671077510386729">"確定"</string>
+ <string name="session_succeeded" msgid="4692992136758212220">"工作階段初始化失敗成功"</string>
+ <string name="session_failed" msgid="4524986240102190509">"工作階段初始化失敗"</string>
+ <string name="session_not_ready" msgid="4612635394279901948">"工作階段尚未就緒"</string>
+ <string name="organization" msgid="913518283470119113">"機構："</string>
+ <string name="uicc_type" msgid="5584433205228698588">"UICC 類型："</string>
+ <string name="protocol" msgid="8626139294022821930">"通訊協定："</string>
+ <string name="tls_cs" msgid="5410567052979996834">"TLS 加密套裝組合："</string>
+ <string name="naf" msgid="7620247915001854662">"NAF URI："</string>
+ <string name="standalone_pager" msgid="1351341861641131423">"一般版 UI：呼叫器"</string>
+ <string name="standalone_large" msgid="336170805696694543">"一般版 UI：大型"</string>
+ <string name="standalone_deferred" msgid="4906576900729108844">"一般版 UI：已延後"</string>
+ <string name="standalone_pager_large" msgid="5662294171123433547">"一般版 UI：大型呼叫器"</string>
+ <string name="chat" msgid="5500583808773151982">"即時通訊"</string>
+ <string name="file_transfer" msgid="5522080545470609737">"檔案傳輸"</string>
+ <string name="geolocation_sms" msgid="4463328438708195479">"地理位置簡訊"</string>
+ <string name="chatbot_session" msgid="5639314220589146717">"聊天機器人工作階段"</string>
+ <string name="chatbot_standalone" msgid="8159185526765238041">"聊天機器人一般版 UI"</string>
+ <string name="chatbot_version" msgid="2431939061806512544">"聊天機器人版本"</string>
+ <string name="provisioning_done" msgid="204618840179891984">"已完成佈建"</string>
+ <string name="registration_done" msgid="492878616836655421">"已完成註冊"</string>
+ <string-array name="organization">
+ <item msgid="9074061482474975772">"無"</item>
+ <item msgid="7841117287115880098">"3GPP"</item>
+ <item msgid="5871357530951196401">"3GPP2"</item>
+ <item msgid="4979706772323445701">"OMA"</item>
+ <item msgid="1202873556413702218">"GSMA"</item>
+ <item msgid="2237392451840970059">"本地"</item>
+ </string-array>
+ <string-array name="protocol">
+ <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
+ <item msgid="6305648228108532104">"MBMS"</item>
+ <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
+ <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
+ <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
+ <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
+ <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
+ <item msgid="7444251498958422990">"TLS_BROWSER"</item>
+ </string-array>
+ <string-array name="uicc_type">
+ <item msgid="5878327014492655902">"不明"</item>
+ <item msgid="1715684709703792003">"SIM"</item>
+ <item msgid="4592543026990143036">"USIM"</item>
+ <item msgid="8763183137100323328">"RSIM"</item>
+ <item msgid="3778400020205644807">"CSIM"</item>
+ <item msgid="3774607711141191499">"ISIM"</item>
+ </string-array>
+</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-zh-rTW/strings.xml b/testapps/TestRcsApp/TestApp/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..ec7f74a
--- /dev/null
+++ b/testapps/TestRcsApp/TestApp/res/values-zh-rTW/strings.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="1411081210960307023">"RcsClient"</string>
+ <string name="provisioning_test" msgid="1035549386706009246">"佈建測試"</string>
+ <string name="delegate_test" msgid="8212368545489779643">"委派測試"</string>
+ <string name="uce_test" msgid="6466919844953883038">"UCE 測試"</string>
+ <string name="gba_test" msgid="8786745991279224003">"GBA 測試"</string>
+ <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
+ <string name="db_client" msgid="5131401341721936367">"DBClient"</string>
+ <string name="result" msgid="435222369457564619">"結果："</string>
+ <string name="callback_result" msgid="7162990408241244749">"回撥電話結果："</string>
+ <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
+ <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
+ <string name="uce_description" msgid="1117661457446955869">"輸入要查詢功能的號碼；如果有多組號碼，請以半形逗號 (,) 分隔。"</string>
+ <string name="number" msgid="9096578126043995890">"號碼："</string>
+ <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
+ <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
+ <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
+ <string name="start_chat" msgid="96121236227112396">"發起即時通訊"</string>
+ <string name="to" msgid="1156781884609653284">"收件者："</string>
+ <string name="chat_message" msgid="3945528453939746046">"即時通訊訊息"</string>
+ <string name="send" msgid="8797467615003240434">"傳送"</string>
+ <string name="ok" msgid="2206671077510386729">"確定"</string>
+ <string name="session_succeeded" msgid="4692992136758212220">"工作階段初始化失敗成功"</string>
+ <string name="session_failed" msgid="4524986240102190509">"工作階段初始化失敗"</string>
+ <string name="session_not_ready" msgid="4612635394279901948">"工作階段尚未就緒"</string>
+ <string name="organization" msgid="913518283470119113">"機構："</string>
+ <string name="uicc_type" msgid="5584433205228698588">"UICC 類型："</string>
+ <string name="protocol" msgid="8626139294022821930">"通訊協定："</string>
+ <string name="tls_cs" msgid="5410567052979996834">"TLS 加密套裝組合："</string>
+ <string name="naf" msgid="7620247915001854662">"NAF URI："</string>
+ <string name="standalone_pager" msgid="1351341861641131423">"一般版 UI：呼叫器"</string>
+ <string name="standalone_large" msgid="336170805696694543">"一般版 UI：大型"</string>
+ <string name="standalone_deferred" msgid="4906576900729108844">"一般版 UI：已延後"</string>
+ <string name="standalone_pager_large" msgid="5662294171123433547">"一般版 UI：大型呼叫器"</string>
+ <string name="chat" msgid="5500583808773151982">"即時通訊"</string>
+ <string name="file_transfer" msgid="5522080545470609737">"檔案傳輸"</string>
+ <string name="geolocation_sms" msgid="4463328438708195479">"地理位置簡訊"</string>
+ <string name="chatbot_session" msgid="5639314220589146717">"聊天機器人工作階段"</string>
+ <string name="chatbot_standalone" msgid="8159185526765238041">"聊天機器人一般版 UI"</string>
+ <string name="chatbot_version" msgid="2431939061806512544">"聊天機器人版本"</string>
+ <string name="provisioning_done" msgid="204618840179891984">"已完成佈建"</string>
+ <string name="registration_done" msgid="492878616836655421">"已完成註冊"</string>
+ <string-array name="organization">
+ <item msgid="9074061482474975772">"無"</item>
+ <item msgid="7841117287115880098">"3GPP"</item>
+ <item msgid="5871357530951196401">"3GPP2"</item>
+ <item msgid="4979706772323445701">"OMA"</item>
+ <item msgid="1202873556413702218">"GSMA"</item>
+ <item msgid="2237392451840970059">"本地"</item>
+ </string-array>
+ <string-array name="protocol">
+ <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
+ <item msgid="6305648228108532104">"MBMS"</item>
+ <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
+ <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
+ <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
+ <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
+ <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
+ <item msgid="7444251498958422990">"TLS_BROWSER"</item>
+ </string-array>
+ <string-array name="uicc_type">
+ <item msgid="5878327014492655902">"不明"</item>
+ <item msgid="1715684709703792003">"SIM"</item>
+ <item msgid="4592543026990143036">"USIM"</item>
+ <item msgid="8763183137100323328">"RSIM"</item>
+ <item msgid="3778400020205644807">"CSIM"</item>
+ <item msgid="3774607711141191499">"ISIM"</item>
+ </string-array>
+</resources>
diff --git a/testapps/TestRcsApp/TestApp/res/values-zu/strings.xml b/testapps/TestRcsApp/TestApp/res/values-zu/strings.xml
new file mode 100644
index 0000000..d05fa16
--- /dev/null
+++ b/testapps/TestRcsApp/TestApp/res/values-zu/strings.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="1411081210960307023">"I-RcsClient"</string>
+ <string name="provisioning_test" msgid="1035549386706009246">"Isivivinyo Sokunikezwa"</string>
+ <string name="delegate_test" msgid="8212368545489779643">"Susa Isivivinyo"</string>
+ <string name="uce_test" msgid="6466919844953883038">"Isivivinyo se-UCE"</string>
+ <string name="gba_test" msgid="8786745991279224003">"Isivivinyo se-GBA"</string>
+ <string name="test_msg_client" msgid="5345166277460949996">"TestMessageClient"</string>
+ <string name="db_client" msgid="5131401341721936367">"I-DBClient"</string>
+ <string name="result" msgid="435222369457564619">"Umphumela:"</string>
+ <string name="callback_result" msgid="7162990408241244749">"Imiphumela yokuphinda ushaye:"</string>
+ <string name="initialize_delegate" msgid="1772072838514674246">"initializeSipDelegate"</string>
+ <string name="destroy_delegate" msgid="1678202834033613371">"destroySipDelegate"</string>
+ <string name="uce_description" msgid="1117661457446955869">"Faka inombolo ukubuza amandla futhi uhlukanise ngokuthi \',\' uma kukuningi."</string>
+ <string name="number" msgid="9096578126043995890">"Inombolo:"</string>
+ <string name="request_capability" msgid="7644752985651089411">"requestCapability"</string>
+ <string name="request_availability" msgid="6387685341316953239">"requestNetworkAvailability"</string>
+ <string name="gba_bootstrap" msgid="549563024448934689">"bootstrapAuthenticationRequest"</string>
+ <string name="start_chat" msgid="96121236227112396">"Qalisa Ingxoxo"</string>
+ <string name="to" msgid="1156781884609653284">"Ku:"</string>
+ <string name="chat_message" msgid="3945528453939746046">"Umlayezo Wengxoxo"</string>
+ <string name="send" msgid="8797467615003240434">"Thumela"</string>
+ <string name="ok" msgid="2206671077510386729">"KULUNGILE"</string>
+ <string name="session_succeeded" msgid="4692992136758212220">"Ukuqaliswa kweseshini kuphumelele"</string>
+ <string name="session_failed" msgid="4524986240102190509">"Ukuqaliswa kweseshini kwehlulekile"</string>
+ <string name="session_not_ready" msgid="4612635394279901948">"Iseshini ayilungile"</string>
+ <string name="organization" msgid="913518283470119113">"Inhlangano:"</string>
+ <string name="uicc_type" msgid="5584433205228698588">"Uhlobo lwe-UICC:"</string>
+ <string name="protocol" msgid="8626139294022821930">"Iphrothokholi:"</string>
+ <string name="tls_cs" msgid="5410567052979996834">"I-TLS Cipher Suite:"</string>
+ <string name="naf" msgid="7620247915001854662">"I-NAF URI:"</string>
+ <string name="standalone_pager" msgid="1351341861641131423">"Ipheja ye-Standalone"</string>
+ <string name="standalone_large" msgid="336170805696694543">"I-Standalone Enkulu"</string>
+ <string name="standalone_deferred" msgid="4906576900729108844">"I-Standalone Iyekiswe ukubhekiswa"</string>
+ <string name="standalone_pager_large" msgid="5662294171123433547">"Ipheja ye-Standalone Enkulu"</string>
+ <string name="chat" msgid="5500583808773151982">"Ingxoxo"</string>
+ <string name="file_transfer" msgid="5522080545470609737">"Ukudluliselwa kwefayela"</string>
+ <string name="geolocation_sms" msgid="4463328438708195479">"I-SMS ye-Geolocation"</string>
+ <string name="chatbot_session" msgid="5639314220589146717">"Iseshini ye-Chatbot"</string>
+ <string name="chatbot_standalone" msgid="8159185526765238041">"I-Chatbot Standalone"</string>
+ <string name="chatbot_version" msgid="2431939061806512544">"Inguqulo ye-Chatbot"</string>
+ <string name="provisioning_done" msgid="204618840179891984">"Ukunikezwa kwenziwe"</string>
+ <string name="registration_done" msgid="492878616836655421">"Ukubhalisa Kwenziwe"</string>
+ <string-array name="organization">
+ <item msgid="9074061482474975772">"LUTHO"</item>
+ <item msgid="7841117287115880098">"I-3GPP"</item>
+ <item msgid="5871357530951196401">"I-3GPP2"</item>
+ <item msgid="4979706772323445701">"I-OMA"</item>
+ <item msgid="1202873556413702218">"I-GSMA"</item>
+ <item msgid="2237392451840970059">"OKWENDAWO"</item>
+ </string-array>
+ <string-array name="protocol">
+ <item msgid="7955884038486794595">"SUBSCRIBER_CERTIFICATE"</item>
+ <item msgid="6305648228108532104">"I-MBMS"</item>
+ <item msgid="4369286857827087787">"HTTP_DIGEST_AUTH"</item>
+ <item msgid="1047245839171009229">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="1728229445161381738">"GENERIC_PUSH_LAYER"</item>
+ <item msgid="8586727908453122385">"IMS_MEDIA_PLANE"</item>
+ <item msgid="5721752897501838331">"GENERATION_TMPI"</item>
+ <item msgid="1622910302975417378">"3GPP_HTTP_BASED_MBMS"</item>
+ <item msgid="7519270727796373646">"TLS_DEFAULT"</item>
+ <item msgid="7444251498958422990">"TLS_BROWSER"</item>
+ </string-array>
+ <string-array name="uicc_type">
+ <item msgid="5878327014492655902">"AKWAZIWA"</item>
+ <item msgid="1715684709703792003">"I-SIM"</item>
+ <item msgid="4592543026990143036">"I-USIM"</item>
+ <item msgid="8763183137100323328">"I-RSIM"</item>
+ <item msgid="3778400020205644807">"I-CSIM"</item>
+ <item msgid="3774607711141191499">"I-ISIM"</item>
+ </string-array>
+</resources>
diff --git a/testapps/TestRcsApp/aosp_test_rcsclient/src/com/android/libraries/rcs/simpleclient/protocol/sip/SipUtils.java b/testapps/TestRcsApp/aosp_test_rcsclient/src/com/android/libraries/rcs/simpleclient/protocol/sip/SipUtils.java
index 13fa53a..942588a 100644
--- a/testapps/TestRcsApp/aosp_test_rcsclient/src/com/android/libraries/rcs/simpleclient/protocol/sip/SipUtils.java
+++ b/testapps/TestRcsApp/aosp_test_rcsclient/src/com/android/libraries/rcs/simpleclient/protocol/sip/SipUtils.java
@@ -183,8 +183,8 @@
// Set a Security-Verify header if exist.
String securityVerify = configuration.getSecurityVerifyHeader();
if (!TextUtils.isEmpty(securityVerify)) {
- request.setHeader(
- sHeaderFactory.createHeader(SecurityVerifyHeader.NAME, securityVerify));
+ request.setHeaders(sHeaderFactory.createHeaders(SecurityVerifyHeader.NAME
+ + ":" + securityVerify.trim()));
}
// Add Route headers.
diff --git a/tests/Android.bp b/tests/Android.bp
index c180476..083d64d 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -50,7 +50,8 @@
"telephony-common-testing",
"testng",
"truth-prebuilt",
- "testables",
+ "testables",
+ "platform-compat-test-rules",
],
test_suites: [
diff --git a/tests/src/com/android/phone/RcsProvisioningMonitorTest.java b/tests/src/com/android/phone/RcsProvisioningMonitorTest.java
index 4fba922..8e5e073 100644
--- a/tests/src/com/android/phone/RcsProvisioningMonitorTest.java
+++ b/tests/src/com/android/phone/RcsProvisioningMonitorTest.java
@@ -305,7 +305,6 @@
@Test
@SmallTest
public void testInitWithSavedConfig() throws Exception {
- ArgumentCaptor<Intent> captorIntent = ArgumentCaptor.forClass(Intent.class);
createMonitor(3);
for (int i = 0; i < 3; i++) {
@@ -313,10 +312,6 @@
mRcsProvisioningMonitor.getConfig(FAKE_SUB_ID_BASE + i)));
}
- verify(mPhone, times(3)).sendBroadcast(captorIntent.capture(), any());
- Intent capturedIntent = captorIntent.getAllValues().get(1);
- assertEquals(ProvisioningManager.ACTION_RCS_SINGLE_REGISTRATION_CAPABILITY_UPDATE,
- capturedIntent.getAction());
verify(mIImsConfig, times(3)).notifyRcsAutoConfigurationReceived(any(), anyBoolean());
}
@@ -324,14 +319,8 @@
@SmallTest
public void testInitWithoutSavedConfig() throws Exception {
when(mCursor.getBlob(anyInt())).thenReturn(null);
- ArgumentCaptor<Intent> captorIntent = ArgumentCaptor.forClass(Intent.class);
createMonitor(3);
- verify(mPhone, times(3)).sendBroadcast(captorIntent.capture(), any());
- Intent capturedIntent = captorIntent.getAllValues().get(1);
-
- assertEquals(ProvisioningManager.ACTION_RCS_SINGLE_REGISTRATION_CAPABILITY_UPDATE,
- capturedIntent.getAction());
//Should not notify null config
verify(mIImsConfig, never()).notifyRcsAutoConfigurationReceived(any(), anyBoolean());
}
@@ -340,16 +329,12 @@
@SmallTest
public void testSubInfoChanged() throws Exception {
createMonitor(3);
- ArgumentCaptor<Intent> captorIntent = ArgumentCaptor.forClass(Intent.class);
for (int i = 0; i < 3; i++) {
assertTrue(Arrays.equals(CONFIG_DEFAULT.getBytes(),
mRcsProvisioningMonitor.getConfig(FAKE_SUB_ID_BASE + i)));
}
- verify(mPhone, times(3)).sendBroadcast(captorIntent.capture(), any());
- Intent capturedIntent = captorIntent.getAllValues().get(1);
- assertEquals(ProvisioningManager.ACTION_RCS_SINGLE_REGISTRATION_CAPABILITY_UPDATE,
- capturedIntent.getAction());
+
verify(mIImsConfig, times(3)).notifyRcsAutoConfigurationReceived(any(), anyBoolean());
makeFakeActiveSubIds(1);
@@ -401,14 +386,20 @@
@SmallTest
public void testCarrierConfigChanged() throws Exception {
createMonitor(1);
+ // should not broadcast message if carrier config is not ready
+ verify(mPhone, never()).sendBroadcast(any(), any());
+
when(mPackageManager.hasSystemFeature(
eq(PackageManager.FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION))).thenReturn(true);
ArgumentCaptor<Intent> captorIntent = ArgumentCaptor.forClass(Intent.class);
+ mBundle.putBoolean(CarrierConfigManager.KEY_CARRIER_CONFIG_APPLIED_BOOL, true);
mBundle.putBoolean(
CarrierConfigManager.Ims.KEY_IMS_SINGLE_REGISTRATION_REQUIRED_BOOL, true);
+
broadcastCarrierConfigChange(FAKE_SUB_ID_BASE);
processAllMessages();
- verify(mPhone, atLeastOnce()).sendBroadcast(captorIntent.capture(), any());
+
+ verify(mPhone, times(1)).sendBroadcast(captorIntent.capture(), any());
Intent capturedIntent = captorIntent.getValue();
assertEquals(capturedIntent.getAction(),
ProvisioningManager.ACTION_RCS_SINGLE_REGISTRATION_CAPABILITY_UPDATE);
@@ -421,7 +412,8 @@
CarrierConfigManager.Ims.KEY_IMS_SINGLE_REGISTRATION_REQUIRED_BOOL, false);
broadcastCarrierConfigChange(FAKE_SUB_ID_BASE);
processAllMessages();
- verify(mPhone, atLeastOnce()).sendBroadcast(captorIntent.capture(), any());
+
+ verify(mPhone, times(2)).sendBroadcast(captorIntent.capture(), any());
capturedIntent = captorIntent.getValue();
assertEquals(capturedIntent.getAction(),
ProvisioningManager.ACTION_RCS_SINGLE_REGISTRATION_CAPABILITY_UPDATE);
@@ -435,7 +427,8 @@
eq(PackageManager.FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION))).thenReturn(false);
broadcastCarrierConfigChange(FAKE_SUB_ID_BASE);
processAllMessages();
- verify(mPhone, atLeastOnce()).sendBroadcast(captorIntent.capture(), any());
+
+ verify(mPhone, times(3)).sendBroadcast(captorIntent.capture(), any());
capturedIntent = captorIntent.getValue();
assertEquals(capturedIntent.getAction(),
ProvisioningManager.ACTION_RCS_SINGLE_REGISTRATION_CAPABILITY_UPDATE);
@@ -479,6 +472,7 @@
when(mPackageManager.hasSystemFeature(
eq(PackageManager.FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION))).thenReturn(false);
+ mBundle.putBoolean(CarrierConfigManager.KEY_CARRIER_CONFIG_APPLIED_BOOL, true);
mBundle.putBoolean(
CarrierConfigManager.Ims.KEY_IMS_SINGLE_REGISTRATION_REQUIRED_BOOL, false);
broadcastCarrierConfigChange(FAKE_SUB_ID_BASE);
@@ -580,13 +574,39 @@
@Test
@SmallTest
public void testSendBroadcastWhenDmaChanged() throws Exception {
- createMonitor(3);
- verify(mPhone, times(3)).sendBroadcast(any(), any());
-
+ when(mCarrierConfigManager.getConfigForSubId(anyInt())).thenReturn(null);
+ mBundle.putBoolean(CarrierConfigManager.KEY_CARRIER_CONFIG_APPLIED_BOOL, true);
+ createMonitor(1);
updateDefaultMessageApplication(DEFAULT_MESSAGING_APP2);
processAllMessages();
- verify(mPhone, times(6)).sendBroadcast(any(), any());
+ // should not broadcast message as no carrier config change happens
+ verify(mPhone, never()).sendBroadcast(any(), any());
+
+ when(mCarrierConfigManager.getConfigForSubId(anyInt())).thenReturn(mBundle);
+ when(mPackageManager.hasSystemFeature(
+ eq(PackageManager.FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION))).thenReturn(true);
+ ArgumentCaptor<Intent> captorIntent = ArgumentCaptor.forClass(Intent.class);
+ mBundle.putBoolean(
+ CarrierConfigManager.Ims.KEY_IMS_SINGLE_REGISTRATION_REQUIRED_BOOL, true);
+
+ broadcastCarrierConfigChange(FAKE_SUB_ID_BASE);
+ processAllMessages();
+
+ verify(mPhone, times(1)).sendBroadcast(captorIntent.capture(), any());
+ Intent capturedIntent = captorIntent.getValue();
+ assertEquals(capturedIntent.getAction(),
+ ProvisioningManager.ACTION_RCS_SINGLE_REGISTRATION_CAPABILITY_UPDATE);
+
+ updateDefaultMessageApplication(DEFAULT_MESSAGING_APP1);
+ processAllMessages();
+
+ // should broadcast message when default messaging application changed if carrier config
+ // has been loaded
+ verify(mPhone, times(2)).sendBroadcast(captorIntent.capture(), any());
+ capturedIntent = captorIntent.getValue();
+ assertEquals(capturedIntent.getAction(),
+ ProvisioningManager.ACTION_RCS_SINGLE_REGISTRATION_CAPABILITY_UPDATE);
}
@Test
@@ -611,6 +631,7 @@
when(mPackageManager.hasSystemFeature(
eq(PackageManager.FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION))).thenReturn(true);
+ mBundle.putBoolean(CarrierConfigManager.KEY_CARRIER_CONFIG_APPLIED_BOOL, true);
mBundle.putBoolean(
CarrierConfigManager.Ims.KEY_IMS_SINGLE_REGISTRATION_REQUIRED_BOOL, true);
broadcastCarrierConfigChange(FAKE_SUB_ID_BASE);
@@ -694,6 +715,7 @@
when(mPackageManager.hasSystemFeature(
eq(PackageManager.FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION))).thenReturn(true);
+ mBundle.putBoolean(CarrierConfigManager.KEY_CARRIER_CONFIG_APPLIED_BOOL, true);
mBundle.putBoolean(
CarrierConfigManager.Ims.KEY_IMS_SINGLE_REGISTRATION_REQUIRED_BOOL, true);
broadcastCarrierConfigChange(FAKE_SUB_ID_BASE);
diff --git a/tests/src/com/android/phone/ServiceStateProviderTest.java b/tests/src/com/android/phone/ServiceStateProviderTest.java
index cde584f..532b1c0 100644
--- a/tests/src/com/android/phone/ServiceStateProviderTest.java
+++ b/tests/src/com/android/phone/ServiceStateProviderTest.java
@@ -27,6 +27,8 @@
import static android.provider.Telephony.ServiceStateTable.getUriForSubscriptionId;
import static android.telephony.NetworkRegistrationInfo.REGISTRATION_STATE_HOME;
+import static com.android.phone.ServiceStateProvider.ENFORCE_LOCATION_PERMISSION_CHECK;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -42,6 +44,7 @@
import android.Manifest;
import android.app.AppOpsManager;
+import android.compat.testing.PlatformCompatChangeRule;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
@@ -62,10 +65,14 @@
import androidx.test.ext.junit.runners.AndroidJUnit4;
+import libcore.junit.util.compat.CoreCompatChangeRule;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.TestRule;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@@ -91,6 +98,9 @@
@Mock LocationManager mLocationManager;
@Mock PackageManager mPackageManager;
+ @Rule
+ public TestRule compatChangeRule = new PlatformCompatChangeRule();
+
// Exception used internally to verify if the Resolver#notifyChange has been called.
private class TestNotifierException extends RuntimeException {
TestNotifierException() {
@@ -170,6 +180,7 @@
// TODO(b/191995565): Turn this on when location access can be off
@Ignore
@SmallTest
+ @CoreCompatChangeRule.EnableCompatChanges({ENFORCE_LOCATION_PERMISSION_CHECK})
public void testQueryServiceState_withNoSubId_withoutLocation() {
setLocationPermissions(false);
@@ -239,7 +250,19 @@
* public columns of ServiceStateTable.
*/
@Test
- public void query_publicColumns_targetS_noReadPrivilege_getPublicColumns() {
+ @CoreCompatChangeRule.EnableCompatChanges({ENFORCE_LOCATION_PERMISSION_CHECK})
+ public void
+ query_publicColumns_enforceLocatoinEnabled_targetS_noReadPrivilege_getPublicColumns() {
+ setTargetSdkVersion(Build.VERSION_CODES.S);
+ setCanReadPrivilegedPhoneState(false);
+
+ verifyServiceStateWithPublicColumns(mTestServiceState, null /*projection*/);
+ }
+
+ @Test
+ @CoreCompatChangeRule.DisableCompatChanges({ENFORCE_LOCATION_PERMISSION_CHECK})
+ public void
+ query_publicColumns_enforceLocationDisabled_targetS_noReadPrivilege_getPublicColumns() {
setTargetSdkVersion(Build.VERSION_CODES.S);
setCanReadPrivilegedPhoneState(false);
@@ -251,6 +274,7 @@
* non-public columns should throw IllegalArgumentException.
*/
@Test
+ @CoreCompatChangeRule.EnableCompatChanges({ENFORCE_LOCATION_PERMISSION_CHECK})
public void query_hideColumn_targetS_noReadPrivilege_throwIllegalArgumentException() {
setTargetSdkVersion(Build.VERSION_CODES.S);
setCanReadPrivilegedPhoneState(false);
@@ -263,11 +287,30 @@
}
/**
- * Verify that apps target S+ with READ_PRIVILEGED_PHONE_STATE and location permissions should
- * be able to access all columns.
+ * Verify that with changeId ENFORCE_LOCATION_PERMISSION_CHECK enabled, apps target S+ with
+ * READ_PRIVILEGED_PHONE_STATE and location permissions should be able to access all columns.
*/
@Test
- public void query_allColumn_targetS_withReadPrivilegedAndLocation_getAllStateUnredacted() {
+ @CoreCompatChangeRule.EnableCompatChanges({ENFORCE_LOCATION_PERMISSION_CHECK})
+ public void
+ query_allColumn_enforceLocationEnabled_targetS_withReadPrivilegedAndLocation_getUnredacted() {
+ setTargetSdkVersion(Build.VERSION_CODES.S);
+ setCanReadPrivilegedPhoneState(true);
+ setLocationPermissions(true);
+
+ verifyServiceStateForSubId(
+ getUriForSubscriptionId(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID),
+ mTestServiceState, true /*hasPermission*/);
+ }
+
+ /**
+ * Verify that with changeId ENFORCE_LOCATION_PERMISSION_CHECK disabled, apps target S+ with
+ * READ_PRIVILEGED_PHONE_STATE and location permissions should be able to access all columns.
+ */
+ @Test
+ @CoreCompatChangeRule.DisableCompatChanges({ENFORCE_LOCATION_PERMISSION_CHECK})
+ public void
+ query_allColumn_enforceLocationDisabled_targetS_withReadPrivilegedAndLocation_getUnredacted() {
setTargetSdkVersion(Build.VERSION_CODES.S);
setCanReadPrivilegedPhoneState(true);
setLocationPermissions(true);
@@ -283,6 +326,7 @@
*/
// TODO(b/191995565): Turn this on once b/191995565 is integrated
@Ignore
+ @CoreCompatChangeRule.EnableCompatChanges({ENFORCE_LOCATION_PERMISSION_CHECK})
public void query_locationColumn_targetS_withReadPrivilegeNoLocation_throwSecurityExecption() {
setTargetSdkVersion(Build.VERSION_CODES.S);
setCanReadPrivilegedPhoneState(true);
@@ -296,10 +340,12 @@
}
/**
- * Verify that apps target R- with location permissions should be able to access all columns.
+ * Verify that when changeId ENFORCE_LOCATION_PERMISSION_CHECK is enabled, apps target R- with
+ * location permissions should be able to access all columns.
*/
@Test
- public void query_allColumn_targetR_withLocation_getAllStateUnredacted() {
+ @CoreCompatChangeRule.EnableCompatChanges({ENFORCE_LOCATION_PERMISSION_CHECK})
+ public void query_allColumn_enforceLoationEnabled_targetR_withLocation_getUnredacted() {
setTargetSdkVersion(Build.VERSION_CODES.R);
setLocationPermissions(true);
@@ -309,12 +355,28 @@
}
/**
- * Verify that apps target R- w/o location permissions should be able to access all columns but
- * with redacted ServiceState.
+ * Verify that when changeId ENFORCE_LOCATION_PERMISSION_CHECK is disabled, apps target R- with
+ * location permissions should be able to access all columns.
+ */
+ @Test
+ @CoreCompatChangeRule.DisableCompatChanges({ENFORCE_LOCATION_PERMISSION_CHECK})
+ public void query_allColumn_enforceLocationDisabled_targetR_withLocation_getUnredacted() {
+ setTargetSdkVersion(Build.VERSION_CODES.R);
+ setLocationPermissions(true);
+
+ verifyServiceStateForSubId(
+ getUriForSubscriptionId(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID),
+ mTestServiceState, true /*hasPermission*/);
+ }
+
+ /**
+ * Verify that changeId ENFORCE_LOCATION_PERMISSION_CHECK is enabled, apps target R- w/o
+ * location permissions should be able to access all columns but with redacted ServiceState.
*/
// TODO(b/191995565): Turn case on when location access can be off
@Ignore
- public void query_allColumn_targetR_noLocation_getRedacted() {
+ @CoreCompatChangeRule.EnableCompatChanges({ENFORCE_LOCATION_PERMISSION_CHECK})
+ public void query_allColumn_enforceLocationEnabled_targetR_noLocation_getRedacted() {
setTargetSdkVersion(Build.VERSION_CODES.R);
setLocationPermissions(false);
@@ -324,6 +386,22 @@
true /*hasPermission*/);
}
+ /**
+ * Verify that changeId ENFORCE_LOCATION_PERMISSION_CHECK is disabled, apps target R- w/o
+ * location permissions should be able to access all columns and with unredacted ServiceState.
+ */
+ // TODO(b/191995565): Turn case on when location access can be off
+ @Ignore
+ @CoreCompatChangeRule.DisableCompatChanges({ENFORCE_LOCATION_PERMISSION_CHECK})
+ public void query_allColumn_enforceLocationDisabled_targetR_noLocation_getUnredacted() {
+ setTargetSdkVersion(Build.VERSION_CODES.R);
+ setLocationPermissions(false);
+
+ verifyServiceStateForSubId(
+ getUriForSubscriptionId(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID),
+ mTestServiceState, true /*hasPermission*/);
+ }
+
private void verifyServiceStateWithLocationColumns(ServiceState ss, String[] projection) {
try (Cursor cursor = mContentResolver.query(ServiceStateTable.CONTENT_URI, projection, null,
null)) {
@@ -335,7 +413,6 @@
try (Cursor cursor = mContentResolver.query(ServiceStateTable.CONTENT_URI, projection, null,
null)) {
assertNotNull(cursor);
- assertEquals(cursor.getColumnCount(), ServiceStateProvider.PUBLIC_COLUMNS.length);
cursor.moveToFirst();
assertEquals(ss.getVoiceRegState(),
diff --git a/tests/src/com/android/phone/SimPhonebookProviderTest.java b/tests/src/com/android/phone/SimPhonebookProviderTest.java
index f897fac..d8518f8 100644
--- a/tests/src/com/android/phone/SimPhonebookProviderTest.java
+++ b/tests/src/com/android/phone/SimPhonebookProviderTest.java
@@ -28,6 +28,7 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
@@ -56,6 +57,7 @@
import com.android.internal.telephony.uicc.IccConstants;
import com.google.common.collect.ImmutableList;
+import com.google.common.io.Closeables;
import com.google.common.truth.Correspondence;
import org.junit.Before;
@@ -179,16 +181,16 @@
public void query_entityFiles_multiSim_returnsCursorWithRowForEachSimEf() {
setupSimsWithSubscriptionIds(2, 3, 7);
- mIccPhoneBook.setRecordsSize(2, IccConstants.EF_ADN, 10, 25);
- mIccPhoneBook.setRecordsSize(2, IccConstants.EF_FDN, 5, 20);
- mIccPhoneBook.setRecordsSize(2, IccConstants.EF_SDN, 15, 20);
- mIccPhoneBook.setRecordsSize(3, IccConstants.EF_ADN, 100, 30);
+ mIccPhoneBook.setupEfWithSizes(2, IccConstants.EF_ADN, 10, 25);
+ mIccPhoneBook.setupEfWithSizes(2, IccConstants.EF_FDN, 5, 20);
+ mIccPhoneBook.setupEfWithSizes(2, IccConstants.EF_SDN, 15, 20);
+ mIccPhoneBook.setupEfWithSizes(3, IccConstants.EF_ADN, 100, 30);
// These Will be omitted from results because zero size indicates the EF is not supported.
- mIccPhoneBook.setRecordsSize(3, IccConstants.EF_FDN, 0, 0);
- mIccPhoneBook.setRecordsSize(3, IccConstants.EF_SDN, 0, 0);
- mIccPhoneBook.setRecordsSize(7, IccConstants.EF_ADN, 0, 0);
- mIccPhoneBook.setRecordsSize(7, IccConstants.EF_FDN, 0, 0);
- mIccPhoneBook.setRecordsSize(7, IccConstants.EF_SDN, 0, 0);
+ mIccPhoneBook.setupEfWithSizes(3, IccConstants.EF_FDN, 0, 0);
+ mIccPhoneBook.setupEfWithSizes(3, IccConstants.EF_SDN, 0, 0);
+ mIccPhoneBook.setupEfWithSizes(7, IccConstants.EF_ADN, 0, 0);
+ mIccPhoneBook.setupEfWithSizes(7, IccConstants.EF_FDN, 0, 0);
+ mIccPhoneBook.setupEfWithSizes(7, IccConstants.EF_SDN, 0, 0);
String[] projection = {
ElementaryFiles.SLOT_INDEX, ElementaryFiles.SUBSCRIPTION_ID,
@@ -210,15 +212,44 @@
public void query_entityFiles_simWithZeroSizes_returnsEmptyCursor() {
setupSimsWithSubscriptionIds(1);
- mIccPhoneBook.setRecordsSize(1, IccConstants.EF_ADN, 0, 0);
- mIccPhoneBook.setRecordsSize(1, IccConstants.EF_FDN, 0, 0);
- mIccPhoneBook.setRecordsSize(1, IccConstants.EF_SDN, 0, 0);
+ mIccPhoneBook.setupEfWithSizes(1, IccConstants.EF_ADN, 0, 0);
+ mIccPhoneBook.setupEfWithSizes(1, IccConstants.EF_FDN, 0, 0);
+ mIccPhoneBook.setupEfWithSizes(1, IccConstants.EF_SDN, 0, 0);
try (Cursor cursor = mResolver.query(ElementaryFiles.CONTENT_URI, null, null, null)) {
assertThat(cursor).hasCount(0);
}
}
+ /**
+ * USIM cards support more than 255 records by having multiple files for one EF type but
+ * IIccPhoneBook.getAdnRecordsSizeForSubscriber returns the size for a single file and so is
+ * inaccurate for such SIMs.
+ *
+ * <p>See b/201385523#comment4 and b/201685690
+ */
+ @Test
+ public void query_entityFiles_adnRecordCountExceedsSize_returnsAdnRecordCountAsMaxRecords() {
+ setupSimsWithSubscriptionIds(1);
+
+ // There are 400 records returned by getAdnRecordsInEfForSubscriber but the count returned
+ // by getAdnRecordsSizeForSubscriber is only 200.
+ AdnRecord[] records = mIccPhoneBook.createEmptyRecords(IccConstants.EF_ADN, 400);
+ mIccPhoneBook.setRecordsSize(1, IccConstants.EF_ADN, 200, 20);
+ mIccPhoneBook.setRecords(1, IccConstants.EF_ADN, records);
+
+ String[] projection = {
+ ElementaryFiles.SUBSCRIPTION_ID, ElementaryFiles.EF_TYPE,
+ ElementaryFiles.MAX_RECORDS
+ };
+ try (Cursor cursor = mResolver.query(
+ ElementaryFiles.CONTENT_URI, projection, null, null)) {
+ assertThat(cursor).hasCount(1);
+ assertThat(cursor)
+ .atRow(0).hasRowValues(1, ElementaryFiles.EF_ADN, 400);
+ }
+ }
+
@Test
public void query_entityFilesItem_nullProjection_returnsCursorWithCorrectProjection() {
setupSimsWithSubscriptionIds(1);
@@ -234,6 +265,19 @@
}
@Test
+ public void query_elementaryFilesItem_nonExistentSubscriptionId_returnsEmptyCursor() {
+ setupSimsWithSubscriptionIds(1);
+ mIccPhoneBook.makeAllEfsSupported(1);
+
+ // Subscription ID 2 does not exist
+ Uri nonExistentElementaryFileItemUri = ElementaryFiles.getItemUri(2, EF_ADN);
+
+ try (Cursor cursor = mResolver.query(nonExistentElementaryFileItemUri, null, null, null)) {
+ assertThat(Objects.requireNonNull(cursor)).hasCount(0);
+ }
+ }
+
+ @Test
public void query_adnRecords_returnsCursorWithMatchingProjection() {
setupSimsWithSubscriptionIds(1);
mIccPhoneBook.makeAllEfsSupported(1);
@@ -275,6 +319,33 @@
}
@Test
+ public void query_adnRecords_invalidColumnProjection_throwsIllegalArgumentException() {
+ setupSimsWithSubscriptionIds(1);
+ mIccPhoneBook.makeAllEfsSupported(1);
+ Uri contentAdn = SimRecords.getContentUri(1, EF_ADN);
+
+ assertThrows(IllegalArgumentException.class, () -> Closeables.close(
+ mResolver.query(contentAdn, new String[] {
+ "an_unsupported_column",
+ }, null, null), false)
+ );
+
+ assertThrows(IllegalArgumentException.class, () -> Closeables.close(
+ mResolver.query(contentAdn, new String[] {
+ SimRecords.RECORD_NUMBER,
+ "an_unsupported_column"
+ }, null, null), false)
+ );
+
+ assertThrows(IllegalArgumentException.class, () -> Closeables.close(
+ mResolver.query(contentAdn, new String[] {
+ "an_unsupported_column",
+ SimRecords.RECORD_NUMBER
+ }, null, null), false)
+ );
+ }
+
+ @Test
public void query_adnRecords_noRecords_returnsEmptyCursor() {
setupSimsWithSubscriptionIds(1);
mIccPhoneBook.makeAllEfsSupported(1);
@@ -507,7 +578,7 @@
@Test
public void query_adnRecords_zeroSizeEf_throwsCorrectException() {
setupSimsWithSubscriptionIds(1);
- mIccPhoneBook.setRecordsSize(1, IccConstants.EF_ADN, 0, 0);
+ mIccPhoneBook.setupEfWithSizes(1, IccConstants.EF_ADN, 0, 0);
IllegalArgumentException e = assertThrows(IllegalArgumentException.class,
() -> mResolver.query(SimRecords.getContentUri(1, EF_ADN), null, null, null));
@@ -576,9 +647,9 @@
@Test
public void query_itemUriEmptyRecord_returnsEmptyCursor() {
setupSimsWithSubscriptionIds(1);
- mIccPhoneBook.setRecordsSize(1, IccConstants.EF_ADN, 1, 30);
- mIccPhoneBook.setRecordsSize(1, IccConstants.EF_FDN, 1, 30);
- mIccPhoneBook.setRecordsSize(1, IccConstants.EF_SDN, 1, 30);
+ mIccPhoneBook.setupEfWithSizes(1, IccConstants.EF_ADN, 1, 30);
+ mIccPhoneBook.setupEfWithSizes(1, IccConstants.EF_FDN, 1, 30);
+ mIccPhoneBook.setupEfWithSizes(1, IccConstants.EF_SDN, 1, 30);
try (Cursor adnItem = mResolver.query(SimRecords.getItemUri(1, ElementaryFiles.EF_ADN, 1),
null, null, null);
@@ -596,9 +667,9 @@
@Test
public void query_itemUriIndexExceedsMax_returnsEmptyCursor() {
setupSimsWithSubscriptionIds(1);
- mIccPhoneBook.setRecordsSize(1, IccConstants.EF_ADN, 1, 30);
- mIccPhoneBook.setRecordsSize(1, IccConstants.EF_FDN, 1, 30);
- mIccPhoneBook.setRecordsSize(1, IccConstants.EF_SDN, 1, 30);
+ mIccPhoneBook.setupEfWithSizes(1, IccConstants.EF_ADN, 1, 30);
+ mIccPhoneBook.setupEfWithSizes(1, IccConstants.EF_FDN, 1, 30);
+ mIccPhoneBook.setupEfWithSizes(1, IccConstants.EF_SDN, 1, 30);
try (Cursor adnItem = mResolver.query(SimRecords.getItemUri(1, ElementaryFiles.EF_ADN, 2),
null, null, null);
@@ -699,7 +770,7 @@
@Test
public void insert_efFull_throwsCorrectException() {
setupSimsWithSubscriptionIds(1);
- mIccPhoneBook.setRecordsSize(1, IccConstants.EF_ADN, 1, 30);
+ mIccPhoneBook.setupEfWithSizes(1, IccConstants.EF_ADN, 1, 30);
mIccPhoneBook.addRecord(1, IccConstants.EF_ADN, "Existing", "8005550101");
ContentValues values = new ContentValues();
@@ -801,7 +872,7 @@
@Test
public void insert_phoneNumberOmitted_throwsCorrectException() {
setupSimsWithSubscriptionIds(1);
- mIccPhoneBook.setRecordsSize(1, IccConstants.EF_ADN, 1, 25);
+ mIccPhoneBook.setupEfWithSizes(1, IccConstants.EF_ADN, 1, 25);
ContentValues values = new ContentValues();
values.put(SimRecords.NAME, "Name");
@@ -814,7 +885,7 @@
@Test
public void insert_nameTooLong_throwsCorrectException() {
setupSimsWithSubscriptionIds(1);
- mIccPhoneBook.setRecordsSize(1, IccConstants.EF_ADN, 1, 25);
+ mIccPhoneBook.setupEfWithSizes(1, IccConstants.EF_ADN, 1, 25);
ContentValues values = new ContentValues();
// Name is limited to 11 characters when the max record size is 25
@@ -837,7 +908,7 @@
@Test
public void insert_phoneNumberTooLong_throwsCorrectException() {
setupSimsWithSubscriptionIds(1);
- mIccPhoneBook.setRecordsSize(1, IccConstants.EF_ADN, 1, 25);
+ mIccPhoneBook.setupEfWithSizes(1, IccConstants.EF_ADN, 1, 25);
ContentValues values = new ContentValues();
values.put(SimRecords.NAME, "Name");
@@ -853,7 +924,7 @@
@Test
public void insert_numberWithInvalidCharacters_throwsCorrectException() {
setupSimsWithSubscriptionIds(1);
- mIccPhoneBook.setRecordsSize(1, IccConstants.EF_ADN, 1, 32);
+ mIccPhoneBook.setupEfWithSizes(1, IccConstants.EF_ADN, 1, 32);
ContentValues values = new ContentValues();
values.put(SimRecords.NAME, "Name");
@@ -873,7 +944,7 @@
@Test
public void insert_unsupportedColumn_throwsCorrectException() {
setupSimsWithSubscriptionIds(1);
- mIccPhoneBook.setRecordsSize(1, IccConstants.EF_ADN, 1, 25);
+ mIccPhoneBook.setupEfWithSizes(1, IccConstants.EF_ADN, 1, 25);
ContentValues values = new ContentValues();
values.put(SimRecords.NAME, "Name");
@@ -965,7 +1036,7 @@
@Test
public void update_indexExceedingMax_returnsZero() {
setupSimsWithSubscriptionIds(1);
- mIccPhoneBook.setRecordsSize(1, IccConstants.EF_ADN, 1, 30);
+ mIccPhoneBook.setupEfWithSizes(1, IccConstants.EF_ADN, 1, 30);
ContentValues values = new ContentValues();
values.put(SimRecords.NAME, "name");
@@ -1004,7 +1075,7 @@
public void delete_indexExceedingMax_returnsZero() {
setupSimsWithSubscriptionIds(1);
mIccPhoneBook.makeAllEfsSupported(1);
- mIccPhoneBook.setRecordsSize(1, IccConstants.EF_ADN, 1, 30);
+ mIccPhoneBook.setupEfWithSizes(1, IccConstants.EF_ADN, 1, 30);
int result = mResolver.delete(SimRecords.getItemUri(1, ElementaryFiles.EF_ADN, 2), null);
@@ -1025,7 +1096,7 @@
@Test
public void update_nameOrNumberTooLong_throwsCorrectException() {
setupSimsWithSubscriptionIds(1);
- mIccPhoneBook.setRecordsSize(1, IccConstants.EF_ADN, 1, 25);
+ mIccPhoneBook.setupEfWithSizes(1, IccConstants.EF_ADN, 1, 25);
mIccPhoneBook.addRecord(1, IccConstants.EF_ADN, "Initial", "8005550101");
ContentValues values = new ContentValues();
@@ -1055,7 +1126,7 @@
@Test
public void update_numberWithInvalidCharacters_throwsCorrectException() {
setupSimsWithSubscriptionIds(1);
- mIccPhoneBook.setRecordsSize(1, IccConstants.EF_ADN, 1, 32);
+ mIccPhoneBook.setupEfWithSizes(1, IccConstants.EF_ADN, 1, 32);
mIccPhoneBook.addRecord(1, IccConstants.EF_ADN, "Initial", "8005550101");
ContentValues values = new ContentValues();
@@ -1148,6 +1219,10 @@
public void subscriptionsChange_callsNotifyChange() {
// Clear invocations that happened in setUp
Mockito.reset(mMockSubscriptionManager);
+ // Stubbing this prevents the spied instance from calling the listener when it is added
+ // which may cause flakiness.
+ doNothing().when(mMockSubscriptionManager)
+ .addOnSubscriptionsChangedListener(any(), any());
setupSimsWithSubscriptionIds(1);
mIccPhoneBook.makeAllEfsSupported(1);
SimPhonebookProvider.ContentNotifier mockNotifier = mock(
@@ -1159,9 +1234,20 @@
mResolver, mMockSubscriptionManager, mIccPhoneBook, mockNotifier);
verify(mMockSubscriptionManager).addOnSubscriptionsChangedListener(
any(), listenerCaptor.capture());
+
+ // Fake the initial call that is made by SubscriptionManager when a listener is registered
+ // with addOnSubscriptionsChangedListener
listenerCaptor.getValue().onSubscriptionsChanged();
+
+ // First subscription change
setupSimsWithSubscriptionIds(1, 2);
listenerCaptor.getValue().onSubscriptionsChanged();
+
+ // Second subscription change
+ setupSimsWithSubscriptionIds(1);
+ listenerCaptor.getValue().onSubscriptionsChanged();
+
+ // Listener is called but subscriptions didn't change so this won't notify
listenerCaptor.getValue().onSubscriptionsChanged();
verify(mockNotifier, times(2)).notifyChange(eq(SimPhonebookContract.AUTHORITY_URI));
@@ -1267,7 +1353,7 @@
// The key for both maps is the (subscription ID, efid)
private Map<Pair<Integer, Integer>, AdnRecord[]> mRecords = new HashMap<>();
// The value is the single record size
- private Map<Pair<Integer, Integer>, Integer> mRecordSizes = new HashMap<>();
+ private Map<Pair<Integer, Integer>, int[]> mRecordSizes = new HashMap<>();
private int mDefaultSubscriptionId = 101;
@@ -1275,7 +1361,7 @@
// Assume that if records are being added then the test wants it to be a valid
// elementary file so set sizes as well.
if (!mRecordSizes.containsKey(key)) {
- setRecordsSize(key.first, key.second,
+ setupEfWithSizes(key.first, key.second,
Math.max(record.getRecId(), DEFAULT_RECORDS_COUNT), DEFAULT_RECORD_SIZE);
}
mRecords.get(key)[record.getRecId() - 1] = record;
@@ -1345,18 +1431,33 @@
* subscription IDs.
*/
public void makeAllEfsSupported(int subscriptionId) {
- setRecordsSize(subscriptionId, IccConstants.EF_ADN, DEFAULT_RECORDS_COUNT,
+ setupEfWithSizes(subscriptionId, IccConstants.EF_ADN, DEFAULT_RECORDS_COUNT,
DEFAULT_RECORD_SIZE);
- setRecordsSize(subscriptionId, IccConstants.EF_FDN, DEFAULT_RECORDS_COUNT,
+ setupEfWithSizes(subscriptionId, IccConstants.EF_FDN, DEFAULT_RECORDS_COUNT,
DEFAULT_RECORD_SIZE);
- setRecordsSize(subscriptionId, IccConstants.EF_SDN, DEFAULT_RECORDS_COUNT,
+ setupEfWithSizes(subscriptionId, IccConstants.EF_SDN, DEFAULT_RECORDS_COUNT,
DEFAULT_RECORD_SIZE);
}
+ public void setRecords(int subscriptionId, int efid, AdnRecord[] records) {
+ mRecords.put(Pair.create(subscriptionId, efid), records);
+ }
+
public void setRecordsSize(int subscriptionId, int efid, int maxRecordCount,
int maxRecordSize) {
+ setRecordsSize(Pair.create(subscriptionId, efid), maxRecordCount, maxRecordSize);
+ }
+
+ private void setRecordsSize(Pair<Integer, Integer> key, int maxRecordCount,
+ int maxRecordSize) {
+ int[] sizes = { maxRecordSize, maxRecordSize * maxRecordCount, maxRecordCount };
+ mRecordSizes.put(key, sizes);
+ }
+
+ public void setupEfWithSizes(int subscriptionId, int efid, int maxRecordCount,
+ int maxRecordSize) {
Pair<Integer, Integer> key = Pair.create(subscriptionId, efid);
- mRecordSizes.put(key, maxRecordSize);
+ setRecordsSize(key, maxRecordCount, maxRecordSize);
AdnRecord[] records = mRecords.computeIfAbsent(key, unused ->
createEmptyRecords(efid, maxRecordCount));
if (records.length < maxRecordCount) {
@@ -1364,7 +1465,7 @@
}
}
- private AdnRecord[] createEmptyRecords(int efid, int count) {
+ AdnRecord[] createEmptyRecords(int efid, int count) {
AdnRecord[] records = new AdnRecord[count];
for (int i = 0; i < records.length; i++) {
if (records[i] == null) {
@@ -1442,12 +1543,11 @@
@Override
public int[] getAdnRecordsSizeForSubscriber(int subId, int efid) {
Pair<Integer, Integer> key = Pair.create(subId, efid);
- Integer recordSize = mRecordSizes.get(key);
- if (recordSize == null) {
+ int[] recordsSize = mRecordSizes.get(key);
+ if (recordsSize == null) {
return new int[]{0, 0, 0};
}
- int count = mRecords.get(key).length;
- return new int[]{recordSize, recordSize * count, count};
+ return recordsSize;
}
@Override
diff --git a/tests/src/com/android/phone/SubscriptionInfoHelperTest.java b/tests/src/com/android/phone/SubscriptionInfoHelperTest.java
new file mode 100644
index 0000000..90f682f
--- /dev/null
+++ b/tests/src/com/android/phone/SubscriptionInfoHelperTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2021 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.
+ */
+
+package com.android.phone;
+
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import android.content.Intent;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+
+import org.junit.Test;
+
+public class SubscriptionInfoHelperTest {
+ private static final String EXTRA_SUBSCRIPTION_LABEL =
+ "com.android.phone.settings.SubscriptionInfoHelper.SubscriptionLabel";
+
+ /**
+ * Ensures {@link SubscriptionInfoHelper#addExtrasToIntent(Intent, SubscriptionInfo)} can
+ * properly handle a null display name without crashing.
+ */
+ @Test
+ public void testAddExtrasToIntentWithNullDisplayName() {
+ Intent intent = new Intent();
+ SubscriptionInfo info = new SubscriptionInfo(1, // id
+ "90210", // iccId
+ 1, // simSlotIndex
+ null, // displayName
+ null, // carrierName
+ SubscriptionManager.NAME_SOURCE_CARRIER_ID, // nameSource
+ 0, //iconTint
+ "555-1212", // number
+ 0, // roaming
+ null, // icon
+ "401", // mcc
+ "384", // mnc
+ "us", // countryIso
+ false, // isEmbedded
+ null, // nativeAccessRules
+ ""); // cardString
+ SubscriptionInfoHelper.addExtrasToIntent(intent, info);
+ assertNull(intent.getStringExtra(EXTRA_SUBSCRIPTION_LABEL));
+ assertTrue(intent.hasExtra(EXTRA_SUBSCRIPTION_LABEL));
+ }
+}
diff --git a/tests/src/com/android/phone/euicc/EuiccUiDispatcherActivityTest.java b/tests/src/com/android/phone/euicc/EuiccUiDispatcherActivityTest.java
index 85dba51..8b0ac5c 100644
--- a/tests/src/com/android/phone/euicc/EuiccUiDispatcherActivityTest.java
+++ b/tests/src/com/android/phone/euicc/EuiccUiDispatcherActivityTest.java
@@ -75,6 +75,12 @@
}
@Test
+ public void testResolveEuiccUiIntent_nullAction() {
+ mIntent = new Intent();
+ assertNull(mActivity.resolveEuiccUiIntent());
+ }
+
+ @Test
public void testResolveEuiccUiIntent_unsupportedAction() {
mIntent = new Intent("fake.action");
assertNull(mActivity.resolveEuiccUiIntent());