Snap for 11227258 from da6575ea3a8cf22bcd8d6eae03b70f5543e8bf21 to 24Q2-release
Change-Id: I4b13e315eb2785011ef1924a110da88d82394259
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 127af0b..06abdbc 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -280,7 +280,7 @@
<string name="status_available" msgid="8081626460682959098">"ଉପଲବ୍ଧ"</string>
<string name="status_away" msgid="2677693194455091315">"ନାହାନ୍ତି"</string>
<string name="status_busy" msgid="2759339190187696727">"ବ୍ୟସ୍ତ ଅଛନ୍ତି"</string>
- <string name="local_invisible_directory" msgid="5936234374879813300">"ଅନ୍ୟାନ୍ୟ"</string>
+ <string name="local_invisible_directory" msgid="5936234374879813300">"ଅନ୍ୟ"</string>
<string name="directory_search_label" msgid="2602118204885565153">"ଡାଇରେକ୍ଟୋରୀ"</string>
<string name="directory_search_label_work" msgid="2392128956332931231">"କାର୍ଯ୍ୟ ଡାଇରେକ୍ଟୋରୀ"</string>
<string name="local_search_label" msgid="6692495405531144805">"ସମସ୍ତ ଯୋଗାଯୋଗ"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 0843228..989fca1 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -191,7 +191,7 @@
<string name="action_menu_add_new_contact_button" msgid="1201339383074001291">"Krijo një kontakt të ri"</string>
<string name="expanding_entry_card_view_see_more" msgid="6636033205952561590">"Shiko më shumë"</string>
<string name="expanding_entry_card_view_see_less" msgid="6399603072579278030">"Shiko më pak"</string>
- <string name="about_card_title" msgid="6635849009952435700">"Informacion rreth"</string>
+ <string name="about_card_title" msgid="6635849009952435700">"Informacione"</string>
<string name="toast_making_personal_copy" msgid="9053129410039312386">"Po krijon një kopje personale..."</string>
<string name="date_time_set" msgid="8526160894146496334">"Cakto"</string>
<string name="header_im_entry" msgid="3581797653862294826">"IM"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 8e4a158..3155c91 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -112,7 +112,7 @@
<string name="groupSavedErrorToast" msgid="8456912862816145318">"Imeshindwa kuhifadhi mabadiliko ya lebo"</string>
<string name="groupExistsErrorMessage" msgid="912222525098791136">"Lebo hiyo tayari ipo"</string>
<string name="groupSomeContactsNoEmailsToast" msgid="2142963883699535155">"Baadhi ya watu hawana anwani za barua pepe."</string>
- <string name="groupSomeContactsNoPhonesToast" msgid="2454029254458875746">"Baadhi ya anwani hazina nambari za simu."</string>
+ <string name="groupSomeContactsNoPhonesToast" msgid="2454029254458875746">"Baadhi ya anwani hazina namba za simu."</string>
<string name="menu_sendEmailOption" msgid="8600335923636486825">"Tuma barua pepe"</string>
<string name="menu_sendMessageOption" msgid="8051852013078110910">"Tuma ujumbe"</string>
<string name="pickerSelectContactsActivityTitle" msgid="8265907544009447967">"Chagua Anwani"</string>
@@ -121,7 +121,7 @@
<string name="add_contact_dlg_message_fmt" msgid="7498024710169591375">"Ongeza \"<xliff:g id="EMAIL">%s</xliff:g>\" kwa anwani?"</string>
<string name="search_settings_description" msgid="5630675648560839920">"Majina ya anwani zako"</string>
<string name="quickcontact_transparent_view_description" msgid="7783027850792852265">"Bofya ili urudi kwenye skrini iliyotangulia"</string>
- <string name="quickcontact_add_phone_number" msgid="1683577288080727862">"Ongeza nambari ya simu"</string>
+ <string name="quickcontact_add_phone_number" msgid="1683577288080727862">"Ongeza namba ya simu"</string>
<string name="quickcontact_add_email" msgid="1442894568471116797">"Ongeza anwani ya barua pepe"</string>
<string name="missing_app" msgid="5674389915738964148">"Hakuna programu iliyopatikana ya kushughulikia tendo hili."</string>
<string name="menu_share" msgid="6343022811796001773">"Shiriki"</string>
@@ -239,7 +239,7 @@
<string name="call_other" msgid="2264440725373659661">"Piga simu"</string>
<string name="call_callback" msgid="1226584395279365027">"Mpigie"</string>
<string name="call_car" msgid="4102050357690774180">"Piga simu kwa gari"</string>
- <string name="call_company_main" msgid="7922526725703041965">"Pigia nambari kuu ya simu ya kampuni"</string>
+ <string name="call_company_main" msgid="7922526725703041965">"Pigia namba kuu ya simu ya kampuni"</string>
<string name="call_isdn" msgid="6313441227468730170">"Piga simu kwa ISDN"</string>
<string name="call_main" msgid="3732801640247896775">"Piga simu kuu"</string>
<string name="call_other_fax" msgid="4273636173311108108">"Piga simu ya faksi"</string>
@@ -287,7 +287,7 @@
<string name="description_quick_contact_for" msgid="6364906818231956042">"Wasiliana kwa haraka na <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="missing_name" msgid="7970183292521946492">"(Hakuna jina)"</string>
<string name="favoritesFrequentContacted" msgid="2885862854079966676">"Unaowasiliana nao zaidi"</string>
- <string name="list_filter_phones" msgid="6839133198968393843">"Anwani zote zilizo na nambari za simu"</string>
+ <string name="list_filter_phones" msgid="6839133198968393843">"Anwani zote zilizo na namba za simu"</string>
<string name="list_filter_phones_work" msgid="5583425697781385616">"Anwani za watu wa kazini"</string>
<string name="view_updates_from_group" msgid="6233444629074835594">"Tazama masasisho"</string>
<string name="account_phone" msgid="8044426231251817556">"Kifaa"</string>
diff --git a/src/com/android/contacts/sdn/SdnRepository.kt b/src/com/android/contacts/sdn/SdnRepository.kt
index 082adeb..0759127 100644
--- a/src/com/android/contacts/sdn/SdnRepository.kt
+++ b/src/com/android/contacts/sdn/SdnRepository.kt
@@ -63,7 +63,7 @@
@SuppressLint("MissingPermission")
fun getSimCardInformation(): List<SimCard> {
val subscriptionManager = context.getSystemService(SubscriptionManager::class.java)
- return subscriptionManager.activeSubscriptionInfoList?.filterNotNull()?.mapNotNull {
+ return subscriptionManager?.activeSubscriptionInfoList?.filterNotNull()?.mapNotNull {
if (it.subscriptionId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
null
} else {
@@ -77,7 +77,7 @@
private fun fetchSdnFromCarrierConfig(simCard: SimCard): List<Sdn> {
val carrierConfigManager = context.getSystemService(CarrierConfigManager::class.java)
val carrierConfig =
- carrierConfigManager.getConfigForSubId(simCard.subscriptionId) ?: return emptyList()
+ carrierConfigManager?.getConfigForSubId(simCard.subscriptionId) ?: return emptyList()
val nameList: List<String> =
carrierConfig
.getStringArray(CarrierConfigManager.KEY_CARRIER_SERVICE_NAME_STRING_ARRAY)