Merge "Set max wait time if setVoicemailNumber is stuck" into main
diff --git a/Android.bp b/Android.bp
index 3bbafc0..2c41fb9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -29,7 +29,7 @@
"libprotobuf-java-lite",
"app-compat-annotations",
"unsupportedappusage",
- "org.apache.http.legacy",
+ "org.apache.http.legacy.stubs.system",
],
static_libs: [
@@ -45,8 +45,7 @@
"modules-utils-os",
"nist-sip",
"service-entitlement",
- "telephony_flags_core_java_lib",
- "android.permission.flags-aconfig-java",
+ "android.permission.flags-aconfig-java-export",
"satellite-s2storage-ro",
"s2-geometry-library-java",
"dropbox_flags_lib",
@@ -102,3 +101,4 @@
name: "TeleService-platform-compat-config",
src: ":TeleService",
}
+
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1190d38..feb5a78 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -119,6 +119,7 @@
<uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />
<uses-permission android:name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+ <uses-permission android:name="android.permission.READ_SYSTEM_GRAMMATICAL_GENDER" />
<!-- Needed to block messages. -->
<uses-permission android:name="android.permission.READ_BLOCKED_NUMBERS" />
<!-- Needed for emergency contact notification. -->
@@ -180,6 +181,8 @@
<!-- Needed because the DISPLAY_EMERGENCY_MESSAGE ConnectionEvent contains a PendingIntent to activate the satellite feature. -->
<uses-permission android:name="com.google.android.apps.stargate.permission.SEND_EMERGENCY_INTENTS"/>
+ <!-- Needed to start demo session -->
+ <uses-permission android:name="com.google.android.apps.stargate.permission.SEND_NON_EMERGENCY_INTENTS"/>
<application android:name="PhoneApp"
android:persistent="true"
@@ -270,7 +273,7 @@
<activity android:name="GsmUmtsCallOptions"
android:label="@string/gsm_umts_options"
- android:exported="true"
+ android:exported="false"
android:theme="@style/DialerSettingsLight">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -279,7 +282,7 @@
<activity android:name="CdmaCallOptions"
android:label="@string/cdma_options"
- android:exported="true"
+ android:exported="false"
android:theme="@style/DialerSettingsLight">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -329,7 +332,7 @@
<!-- fdn setting -->
<activity android:name="com.android.phone.settings.fdn.FdnSetting"
android:label="@string/fdn"
- android:exported="true"
+ android:exported="false"
android:theme="@style/CallSettingsWithoutDividerTheme">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -562,7 +565,7 @@
<receiver
android:name="com.android.phone.vvm.VvmSmsReceiver"
- android:exported="false"
+ android:exported="true"
androidprv:systemUserOnly="true">
<intent-filter>
<action android:name="com.android.internal.provider.action.VOICEMAIL_SMS_RECEIVED"/>
@@ -571,7 +574,7 @@
<receiver
android:name="com.android.phone.vvm.VvmSimStateTracker"
- android:exported="false"
+ android:exported="true"
androidprv:systemUserOnly="true">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED"/>
@@ -596,7 +599,7 @@
<receiver
android:name=".security.SafetySourceReceiver"
- android:exported="false"
+ android:exported="true"
androidprv:systemUserOnly="true">
<intent-filter>
<action android:name="android.safetycenter.action.REFRESH_SAFETY_SOURCES"/>
@@ -641,7 +644,7 @@
android:name=".settings.RadioInfo"
android:label="@string/phone_info_label"
android:exported="true"
- android:theme="@style/Theme.AppCompat.DayNight">
+ android:theme="@style/RadioInfoTheme">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
diff --git a/assets/CarrierRestrictionOperatorDetails.json b/assets/CarrierRestrictionOperatorDetails.json
index 68d066e..a088f94 100644
--- a/assets/CarrierRestrictionOperatorDetails.json
+++ b/assets/CarrierRestrictionOperatorDetails.json
@@ -3,8 +3,8 @@
"_comment": "Example format :: << \"packageName\" : {\"carrierId\":[<int>], \"callerSHA256Ids\":[<SHAID1>, <SHAID2>]} >>",
"com.vzw.hss.myverizon":{"carrierIds":[1839],"callerSHA256Ids":["AE23A03436DF07B0CD70FE881CDA2EC1D21215D7B7B0CC68E67B67F5DF89526A"]},
"com.google.android.apps.tycho":{"carrierIds":[1989],"callerSHA256Ids":["B9CFCE1C47A6AC713442718F15EF55B00B3A6D1A6D48CB46249FA8EB51465350","4C36AF4A5BDAD97C1F3D8B283416D244496C2AC5EAFE8226079EF6F676FD1859"]},
- "com.comcast.mobile.mxs":{"carrierIds": [2032, 2532, 2556],"callerSHA256Ids":["914C26403B57D2D482359FC235CC825AD00D52B0121C18EF2B2B9D4DDA4B8996"]},
- "com.xfinity.digitalhome": {"carrierIds": [2032],"callerSHA256Ids":["31b4c17315c2269040d535f7b6a79cf4d11517c664d9de8f1ddf4f8a785aad47"]},
- "com.xfinity.digitalhome.debug":{"carrierIds": [2032],"callerSHA256Ids":["c9133e8168f97573c8c567f46777dff74ade0c015ecf2c5e91be3e4e76ddcae2"]},
- "com.xfinity.dh.xm.app": {"carrierIds": [2032],"callerSHA256Ids":["c9133e8168f97573c8c567f46777dff74ade0c015ecf2c5e91be3e4e76ddcae2"]}
+ "com.comcast.mobile.mxs":{"carrierIds": [2032,2532,2556],"callerSHA256Ids":["914C26403B57D2D482359FC235CC825AD00D52B0121C18EF2B2B9D4DDA4B8996"]},
+ "com.xfinity.digitalhome": {"carrierIds": [2032,2532,2556],"callerSHA256Ids":["31b4c17315c2269040d535f7b6a79cf4d11517c664d9de8f1ddf4f8a785aad47"]},
+ "com.xfinity.digitalhome.debug":{"carrierIds": [2032,2532,2556],"callerSHA256Ids":["c9133e8168f97573c8c567f46777dff74ade0c015ecf2c5e91be3e4e76ddcae2"]},
+ "com.xfinity.dh.xm.app": {"carrierIds": [2032,2532,2556],"callerSHA256Ids":["c9133e8168f97573c8c567f46777dff74ade0c015ecf2c5e91be3e4e76ddcae2"]}
}
\ No newline at end of file
diff --git a/assets/google_us_san_sat_s2.dat b/assets/google_us_san_sat_s2.dat
index 60b00df..4d99f86 100644
--- a/assets/google_us_san_sat_s2.dat
+++ b/assets/google_us_san_sat_s2.dat
Binary files differ
diff --git a/ecc/input/eccdata.txt b/ecc/input/eccdata.txt
index c4edc9e..f7c36e2 100644
--- a/ecc/input/eccdata.txt
+++ b/ecc/input/eccdata.txt
@@ -547,7 +547,8 @@
}
eccs {
phone_number: "1414"
- types: TYPE_UNSPECIFIED
+ types: MOUNTAIN_RESCUE
+ routing: NORMAL
}
eccs {
phone_number: "0800117117"
@@ -837,11 +838,6 @@
routing: EMERGENCY
}
eccs {
- phone_number: "088"
- types: POLICE
- routing: NORMAL
- }
- eccs {
phone_number: "085"
types: FIRE
routing: NORMAL
@@ -1019,6 +1015,7 @@
eccs {
phone_number: "114"
types: TYPE_UNSPECIFIED
+ routing: NORMAL
}
eccs {
phone_number: "191"
@@ -1383,6 +1380,11 @@
types: FIRE
}
eccs {
+ phone_number: "108"
+ types: AMBULANCE
+ routing: NORMAL
+ }
+ eccs {
phone_number: "100"
types: POLICE
types: AMBULANCE
diff --git a/ecc/output/eccdata b/ecc/output/eccdata
index 482ed79..697fd49 100644
--- a/ecc/output/eccdata
+++ b/ecc/output/eccdata
Binary files differ
diff --git a/proguard.flags b/proguard.flags
index 8eafd30..c572e1b 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -12,4 +12,6 @@
-keep class com.android.phone.callcomposer.** {
*;
}
+# Keep the FakeFeatureFlagsImpl
+-keep class com.android.internal.telephony.flags.FakeFeatureFlagsImpl { *; }
-verbose
\ No newline at end of file
diff --git a/res/layout/radio_info.xml b/res/layout/radio_info.xml
index 2665ea0..ac1f3f3 100644
--- a/res/layout/radio_info.xml
+++ b/res/layout/radio_info.xml
@@ -210,6 +210,26 @@
android:layout_height="wrap_content"
/>
+ <!-- Mock signal strength -->
+ <LinearLayout style="@style/RadioInfo_entry_layout">
+ <TextView android:id="@+id/signal_strength_label"
+ android:text="@string/radio_info_signal_strength_label"
+ style="@style/info_label" />
+ <Spinner android:id="@+id/signalStrength"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"/>
+ </LinearLayout>
+
+ <!-- Mock data network type -->
+ <LinearLayout style="@style/RadioInfo_entry_layout">
+ <TextView android:id="@+id/data_network_type_label"
+ android:text="@string/radio_info_data_network_type_label"
+ style="@style/info_label" />
+ <Spinner android:id="@+id/dataNetworkType"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"/>
+ </LinearLayout>
+
<!-- Horizontal Rule -->
<View
android:layout_width="fill_parent"
@@ -232,6 +252,14 @@
android:layout_height="wrap_content"
android:text="@string/simulate_out_of_service_string"/>
+ <!-- Enforce camping on satellite channel -->
+ <Switch android:id="@+id/enforce_satellite_channel"
+ android:textSize="14sp"
+ android:layout_marginTop="8dip"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/enforce_satellite_channel_string"/>
+
<!-- Simulate this SIM to be satellite -->
<Switch android:id="@+id/mock_carrier_roaming_satellite"
android:textSize="14sp"
@@ -240,6 +268,35 @@
android:layout_height="wrap_content"
android:text="@string/mock_carrier_roaming_satellite_string"/>
+ <!-- ESOS -->
+ <Button android:id="@+id/esos_questionnaire"
+ android:textSize="14sp"
+ android:layout_marginTop="8dip"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAllCaps="false"
+ android:text="@string/esos_satellite_string"
+ />
+
+ <!-- Satellite enable non-emergency mode-->
+ <Button android:id="@+id/satellite_enable_non_emergency_mode"
+ android:textSize="14sp"
+ android:layout_marginTop="8dip"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAllCaps="false"
+ android:text="@string/satellite_enable_non_emergency_mode_string" />
+
+ <!-- Demo ESOS -->
+ <Button android:id="@+id/demo_esos_questionnaire"
+ android:textSize="14sp"
+ android:layout_marginTop="8dip"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAllCaps="false"
+ android:text="@string/demo_esos_satellite_string"
+ />
+
<!-- VoLTE provisioned -->
<Switch android:id="@+id/volte_provisioned_switch"
android:textSize="14sp"
@@ -485,19 +542,5 @@
android:layout_toStartOf="@id/update_smsc"
android:layout_toEndOf="@id/smsc_label" />
</RelativeLayout>
-
- <!-- Test setting to ignore bad DNS, useful in lab environments -->
- <LinearLayout style="@style/RadioInfo_entry_layout">
- <Button android:id="@+id/dns_check_toggle"
- android:textSize="14sp"
- android:layout_marginTop="8dip"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/radio_info_toggle_dns_check_label"
- />
- <TextView android:id="@+id/dnsCheckState" style="@style/info_value" />
- </LinearLayout>
-
-
</LinearLayout>
</ScrollView>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 0dd1a73..e4d1e2f 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Belinstellings"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Oproepinstellings kan net deur die administrateur verander word."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Net die admin of werkgebruiker kan foonrekeninginstellings verander."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Die toesteleienaar het die vermoë om selnetwerkinstellings te verander, beperk."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Instellings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Oproepinstellingsfout"</string>
<string name="reading_settings" msgid="1605904432450871183">"Lees tans instellings…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Stel Verwyderbare-e-SIM as Verstek"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Mobieleradiokrag"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simuleer is nie beskikbaar nie (Slegs ontfoutingbou)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Force Camp Satellite LTE-kanaal (net ontfoutingsbou)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Satellietmodus van skyndiensverskaffer (net ontfoutingsbou)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Toets regte satelliet-eSOS-modus (net ontfoutingsbou)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Toets nie-eSOS-modus vir regte satelliet (net ontfoutingsbou)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Toets demonstrasiesatelliet-eSOS-modus (net ontfoutingsbou)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Bekyk SIM-adresboek"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Kyk na vaste skakelnommers"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Bekyk skakeldiensnommers"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Dateer op"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Herlaai"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Wissel DNS-kontrole"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM-spesifieke inligting/instellings"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC-beskikbaar (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR-beperk (NSA):"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index f2090a6..9c197dd 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"የጥሪ ቅንብሮች"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"የጥሪ ቅንብሮች በአስተዳዳሪ ተጠቃሚው ብቻ ነው ሊለወጡ የሚችሉት።"</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"የስልክ የመለያ ቅንብሮች መለወጥ የሚችሉት በአስተዳዳሪ ወይም በሥራ ተጠቃሚ ብቻ ነው።"</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"የመሣሪያው ባለቤት የተንቀሳቃሽ ስልክ የአውታረ መረብ ቅንብሮችን የመለወጥ ችሎታን ገድበዋል።"</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"ቅንብሮች (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"የጥሪ ቅንብሮች ስህተት"</string>
<string name="reading_settings" msgid="1605904432450871183">"ቅንብሮች በማንበብ ላይ..."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"የሚወገድን ኢሲም ነባሪ በሚል አቀናብር"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"የሞባይል ሬዲዮ ኃይል"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"ከአገልግሎት ውጭን አስመስል (የስህተት ማረሚያ ግንብ ብቻ)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Force Camp Satellite LTE ሰርጥ (የስህተት አርም ግንባታ ብቻ)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Mock Carrier Satellite Mode (የስህተት ማረሚያ ግንባታ ብቻ)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"የእውነተኛ ሳተላይት eSOS ሁነታን ይሞክሩ (የስህተት ማረሚያ ግንብ ብቻ)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"የእውነተኛ ሳተላይት eSOS ያልሆነ ሁነታን ይሞክሩ (የስህተት ማረሚያ ግንብ ብቻ)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"የቅንጭብ ማሳያ ሳተላይት eSOS ሁነታን ይሞክሩ (የስህተት ማረሚያ ግንብ ብቻ)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"የሲም አድራሻ ደብተር አሳይ"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"በቋሚነት የሚደወልባቸው ቁጥሮች"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"የአገልግሎት መደወያ ቁጥሮችን ተመልከት"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"አዘምን"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"አድስ"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"የDNS ፍተሻን ቀያይር"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM-የተወሰነ መረጃ/ቅንብሮች"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC ይገኛል (NSA)፦"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR ተገድቧል (NSA)፦"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 3d4a8ed..23916eb 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"إعدادات الاتصال"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"لا يمكن تغيير إعدادات المكالمات إلا بواسطة المستخدم الإداري."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"لا يمكن تغيير إعدادات حساب الهاتف إلا من قِبل المشرف أو مستخدم حساب العمل."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"حظر مالك الجهاز إمكانية تغيير إعدادات شبكة الجوّال."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"الإعدادات (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"خطأ في إعدادات الاتصال"</string>
<string name="reading_settings" msgid="1605904432450871183">"جارٍ قراءة الإعدادات..."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"ضبط شريحة eSIM القابلة للإزالة كشريحة تلقائية"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"طاقة اللاسلكي للجوّال"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"محاكاة الخطأ \"خارج الخدمة\" (الإصدار المخصص لتصحيح الأخطاء فقط)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"قناة LTE للقمر الصناعي Force Camp (إصدار مخصّص لتصحيح الأخطاء فقط)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"وضع القمر الصناعي التجريبي لمشغّل شبكة الجوّال (إصدار مخصّص لتصحيح الأخطاء فقط)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"اختبار وضع القمر الصناعي الحقيقي لنظام eSOS (إصدار مخصّص لتصحيح الأخطاء فقط)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"اختبار وضع القمر الصناعي الحقيقي غير تابع لنظام eSOS (إصدار مخصّص لتصحيح الأخطاء فقط)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"اختبار وضع \"اتصالات الطوارئ بالقمر الصناعي\" التجريبي (إصدار مخصّص لتصحيح الأخطاء فقط)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"عرض دفتر عناوين SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"عرض أرقام الطلب الثابت"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"عرض أرقام طلب الخدمة"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"تعديل"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"إعادة التحميل"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"تبديل فحص نظام أسماء النطاقات"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"المعلومات/الإعدادات المتعلّقة بالمصنّع الأصلي للجهاز"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC متوفّر (في وضع NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"تم حظر DCNR (في وضع NSA):"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 10baaac..175d5bf 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"কল ছেটিংসমূহ"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"কেৱল প্ৰশাসকে কল ছেটিংসমূহ সলনি কৰিব পাৰে।"</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"ফ’ন একাউণ্টৰ ছেটিং কেৱল প্ৰশাসক অথবা কৰ্মস্থানৰ ব্যৱহাৰকাৰীয়েহে সলনি কৰিব পাৰে।"</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"ডিভাইচৰ গৰাকীয়ে ম’বাইল নেটৱৰ্কৰ ছেটিং সলনি কৰাৰ ক্ষমতা সীমিত কৰিছে।"</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"ছেটিংসমূহ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"কল ছেটিংসমূহত আসোঁৱাহ"</string>
<string name="reading_settings" msgid="1605904432450871183">"ছেটিংসমূহ পঢ়ি থকা হৈছে…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"আঁতৰাব পৰা ই-ছিম ডিফ’ল্ট হিচাপে ছেট কৰক"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"ম’বাইলৰ ৰেডিঅ’ পাৱাৰ"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"সেৱাত নাই ছিমুলে’ট কৰক (কেৱল ডিবাগ বিল্ড)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Force Camp উপগ্ৰহ LTE চেনেল (কেৱল ডিবাগ বিল্ড)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"নকল বাহক উপগ্ৰহ ম’ড (কেৱল ডিবাগ বিল্ড)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"বাস্তৱিক উপগ্ৰহৰ eSOS ম’ড পৰীক্ষা কৰক (কেৱল ডিবাগ বিল্ড)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"বাস্তৱিক উপগ্ৰহৰ অনা eSOS ম’ড পৰীক্ষা কৰক (কেৱল ডিবাগ বিল্ড)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"উপগ্ৰহৰ eSOS ম’ডৰ ডেম’ পৰীক্ষা কৰক (কেৱল ডিবাগ বিল্ড)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"ছিম ঠিকনা সূচী চাওক"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"ফিক্সড্ ডায়েলিং নম্বৰসমূহ চাওক"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"সেৱা ডায়েলিং নম্বৰসমূহ চাওক"</string>
@@ -900,7 +904,7 @@
<string name="radio_info_voice_network_type_label" msgid="2395347336419593265">"ভইচ নেটৱৰ্কৰ প্ৰকাৰ:"</string>
<string name="radio_info_data_network_type_label" msgid="8886597029237501929">"ডেটা নেটৱৰ্কৰ প্ৰকাৰ:"</string>
<string name="radio_info_override_network_type_label" msgid="4176280017221092005">"নেটৱৰ্ক প্ৰকাৰ অ’ভাৰৰাইড কৰক:"</string>
- <string name="radio_info_voice_raw_registration_state_label" msgid="2822988327145825128">"কণ্ঠস্বৰৰ অসম্পাদিত পঞ্জীয়নৰ স্থিতি:"</string>
+ <string name="radio_info_voice_raw_registration_state_label" msgid="2822988327145825128">"ভইচৰ অসম্পাদিত পঞ্জীয়নৰ স্থিতি:"</string>
<string name="radio_info_data_raw_registration_state_label" msgid="2895895513822604539">"ডেটাৰ অসম্পাদিত পঞ্জীয়নৰ স্থিতি:"</string>
<string name="radio_info_wlan_data_raw_registration_state_label" msgid="6396894835757296612">"WLAN ডেটাৰ অসম্পাদিত পঞ্জীয়নৰ স্থিতি:"</string>
<string name="phone_index_label" msgid="6222406512768964268">"ফ’নৰ ইনডেক্স বাছনি কৰক"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"আপডে’ট কৰক"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"ৰিফ্ৰেশ্ব কৰক"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"DNS পৰীক্ষা ট’গল কৰক"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM বিশেষক তথ্য/ছেটিংসমূহ"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC উপলব্ধ (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR সীমিত (NSA):"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index e2b7ee9..e0f42b2 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Zəng ayarları"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Zəng parametrləri yalnız admin olan istifadəçi tərəfindən dəyişdirilə bilər."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Telefon hesabı ayarlarını yalnız admin və ya işçi dəyişə bilər."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Cihaz sahibi mobil şəbəkə ayarlarını dəyişmək imkanını məhdudlaşdırıb."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Ayarlar ( <xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g> )"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Zəng parametrləri xətası"</string>
<string name="reading_settings" msgid="1605904432450871183">"Oxuma ayarları..."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Çıxarıla bilən eSIM\'i Defolt olaraq təyin edin"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Mobil Radio Enerjisi"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"\"Xidmətdənkənar\" Simulyasiyası (yalnız Debaq Versiyası)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Force Camp Satellite LTE Channel (yalnız sazlama versiyası)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Sınaq Daşıyıcı Peyk Rejimi (yalnız sazlama versiyası)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Real peyk eSOS rejimini sınaqdan keçirin (yalnız sazlama versiyası)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Real peyk qeyri-eSOS rejimini sınaqdan keçirin (yalnız sazlama versiyası)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Demo peyk eSOS rejimini sınaqdan keçirin (yalnız sazlama versiyası)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"SIM Ünvan Kitabçasına Baxın"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Sabit Yığım Nömrələrinə Baxın"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Xidmət Yığım Nömrələrinə Baxın"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Güncəlləyin"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Yeniləyin"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"DNS Yoxlanışına keçin"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Orijinal Avadanlıq İstehsalçısının Məlumatı/Ayarlar"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC Əlçatandır (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR Məhdudlaşdırıldı (NSA):"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 19a49ff..8d60adc 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Podešavanja poziva"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Samo korisniku sa administratorskim pravima je dozvoljeno da menja podešavanja poziva."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Podešavanja naloga telefona može da promeni samo administrator ili poslovni korisnik."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Vlasnik uređaja je ograničio mogućnost promene podešavanja mobilne mreže."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Podešavanja (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Greška u podešavanjima poziva"</string>
<string name="reading_settings" msgid="1605904432450871183">"Podešavanja se učitavaju…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Podesi prenosivi eSIM kao podrazumevani"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Napajanje za radio na mobilnim uređajima"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simulacija ne funkcioniše (samo verzija sa otklonjenim greškama)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Prinudno primeni satelit za kampovanje na LTE kanal (samo verzija za otklanjanje grešaka)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Lažni režim mobilnog operatera za slanje preko satelita (samo verzija za otklanjanje grešaka)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Testirajte stvarni satelitski eSOS režim (samo verzija sa otklonjenim greškama)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Testirajte stvarni satelitski režim koji nije eSOS (samo verzija sa otklonjenim greškama)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Testirajte demo verziju satelitskog eSOS režima (samo verzija sa otklonjenim greškama)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Prikaži adresar SIM-a"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Prikaži brojeve za fiksno biranje"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Prikaži brojeve za servisno biranje"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Ažuriraj"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Osveži"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Uključi/isključi proveru DNS-a"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Informacije/podešavanja specifična za proizvođača originalne opreme"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC dostupno (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR ograničeno (NSA):"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index e7c6139..1306dbd 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Налады выклікаў"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Налады выклікаў можа мяняць толькі адміністратар."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Налады ўліковага запісу на тэлефоне можа мяняць толькі адміністратар ці карыстальнік працоўнага профілю."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Уладальнік прылады забараніў змяняць налады мабільнай сеткі."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Налады (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Памылка налад выкліку"</string>
<string name="reading_settings" msgid="1605904432450871183">"Чытанне налад..."</string>
@@ -376,9 +377,9 @@
<item msgid="6685082338652847671">"7"</item>
</string-array>
<string name="list_language_dtitle" msgid="7457017255633587047">"Мовы"</string>
- <string name="enable_disable_local_weather" msgid="7734933941872511543">"Мясцовае надвор\'е"</string>
- <string name="local_weather_enable" msgid="2143929735295254729">"Мясцовае надвор\'е ўключана"</string>
- <string name="local_weather_disable" msgid="4209936355998349647">"Мясцовае надвор\'е адключана"</string>
+ <string name="enable_disable_local_weather" msgid="7734933941872511543">"Мясцовае надвор’е"</string>
+ <string name="local_weather_enable" msgid="2143929735295254729">"Мясцовае надвор’е ўключана"</string>
+ <string name="local_weather_disable" msgid="4209936355998349647">"Мясцовае надвор’е адключана"</string>
<string name="enable_disable_atr" msgid="821714821057385390">"Мясцовыя транспартныя паведамленні"</string>
<string name="atr_enable" msgid="1799097759998768186">"Мясцовыя транспартныя паведамленні ўключаны"</string>
<string name="atr_disable" msgid="6456758173289065766">"Мясцовыя транспартныя паведамленні адключаны"</string>
@@ -553,7 +554,7 @@
<string name="incall_error_supp_service_resume" msgid="1276861499306817035">"Не ўдалося ўзнавіць выклік."</string>
<string name="incall_error_supp_service_separate" msgid="8932660028965274353">"Немагчыма аддзяліць выклік."</string>
<string name="incall_error_supp_service_transfer" msgid="8211925891867334323">"Немагчыма перадаць выклік."</string>
- <string name="incall_error_supp_service_conference" msgid="27578082433544702">"Не ўдалося аб\'яднаць выклікі."</string>
+ <string name="incall_error_supp_service_conference" msgid="27578082433544702">"Не ўдалося аб’яднаць выклікі."</string>
<string name="incall_error_supp_service_reject" msgid="3044363092441655912">"Немагчыма адхіліць выклік."</string>
<string name="incall_error_supp_service_hangup" msgid="836524952243836735">"Немагчыма скончыць выклік(і)."</string>
<string name="incall_error_supp_service_hold" msgid="8535056414643540997">"Немагчыма ўтрымліваць выклікі."</string>
@@ -571,7 +572,7 @@
<string name="emergency_enable_radio_dialog_message" msgid="1695305158151408629">"Уключэнне радыё..."</string>
<string name="emergency_enable_radio_dialog_retry" msgid="4329131876852608587">"Не абслугоўваецца. Паўтор спробы..."</string>
<string name="radio_off_during_emergency_call" msgid="8011154134040481609">"Немагчыма ўвайсцi ў рэжым палёту падчас экстранага выклiку"</string>
- <string name="dial_emergency_error" msgid="825822413209026039">"Выклік немагчымы. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> не з\'яўляецца нумарам экстраннай службы."</string>
+ <string name="dial_emergency_error" msgid="825822413209026039">"Выклік немагчымы. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> не з’яўляецца нумарам экстраннай службы."</string>
<string name="dial_emergency_empty_error" msgid="2785803395047793634">"Выклік немагчымы. Набраць нумар экстраннай службы."</string>
<string name="dial_emergency_calling_not_available" msgid="6485846193794727823">"Экстранныя выклікі недаступныя"</string>
<string name="pin_puk_system_user_only" msgid="1045147220686867922">"Толькі ўладальнік прылады можа ўводзіць PIN-код ці PUK-код."</string>
@@ -585,7 +586,7 @@
<string name="onscreenShowDialpadText" msgid="658465753816164079">"Кнопкі набору"</string>
<string name="onscreenMuteText" msgid="5470306116733843621">"Выключыць гук"</string>
<string name="onscreenAddCallText" msgid="9075675082903611677">"Дадаць выклік"</string>
- <string name="onscreenMergeCallsText" msgid="3692389519611225407">"Аб\'яднаць выклікі"</string>
+ <string name="onscreenMergeCallsText" msgid="3692389519611225407">"Аб’яднаць выклікі"</string>
<string name="onscreenSwapCallsText" msgid="2682542150803377991">"Пераключыць"</string>
<string name="onscreenManageCallsText" msgid="1162047856081836469">"Кіраваць выклікамі"</string>
<string name="onscreenManageConferenceText" msgid="4700574060601755137">"Кірав. канферэнцыяй"</string>
@@ -681,7 +682,7 @@
<string name="status_hint_label_wifi_call" msgid="942993035689809853">"Выклік праз Wi-Fi"</string>
<string name="message_decode_error" msgid="1061856591500290887">"Памылка расшыфравання паведамлення."</string>
<string name="callFailed_cdma_activation" msgid="5392057031552253550">"SIM-карта актывавала вашу службу і абнавіла функцыі роўмінгу вашага тэлефона."</string>
- <string name="callFailed_cdma_call_limit" msgid="1074219746093031412">"Занадта шмат актыўных выклікаў. Скончыце ці аб\'яднайце існуючыя выклікі, перш чым рабіць новы выклік."</string>
+ <string name="callFailed_cdma_call_limit" msgid="1074219746093031412">"Занадта шмат актыўных выклікаў. Скончыце ці аб’яднайце існуючыя выклікі, перш чым рабіць новы выклік."</string>
<string name="callFailed_imei_not_accepted" msgid="7257903653685147251">"Немагчыма падключыцца, устаўце сапраўдную SIM-карту."</string>
<string name="callFailed_wifi_lost" msgid="1788036730589163141">"Страчана падключэнне да Wi-Fi. Выклік завершаны."</string>
<string name="dialFailed_low_battery" msgid="6857904237423407056">"Немагчыма наладзіць злучэнне для відэавыкліку: нізкі зарад акумулятара."</string>
@@ -823,7 +824,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="2761754044990799580">"Немагчыма зрабіць новы выклік, бо ўжо выконваюцца два іншыя. Каб зрабіць новы выклік, завяршыце адзін з бягучых ці аб\'яднайце іх у канферэнц-выклік."</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>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Зрабіць здымную eSIM-карту стандартнай"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Магутнасць радыёсігналу"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Мадэляванне знаходжання па-за сеткай (толькі ў зборцы для адладкі)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Прымусова прымяняць спадарожнікавы канал LTE (толькі для адладачнай зборкі)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Імітацыя рэжыму спадарожніка з SIM-картай ад аператара (толькі ў зборцы для адладкі)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Тэсціраванне рэальнага рэжыму спадарожнікавага падключэння eSOS (толькі ў зборцы для адладкі)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Тэсціраванне рэальнага няэкстраннага (non-eSOS) рэжыму спадарожнікавага падключэння (толькі ў зборцы для адладкі)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Тэсціраванне дэманстрацыйнага рэжыму спадарожнікавага падключэння eSOS (толькі ў зборцы для адладкі)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Праглядзець адрасную кнігу на SIM-карце"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Прагляд фіксаваных нумароў"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Паглядзець сэрвісныя нумары"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Абнавіць"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Абнавіць"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Уключыць/выключыць праверку DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Інфармацыя/налады пастаўшчыка"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"Падключэнне EN-DC даступнае (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"Падключэнне DCNR абмежавана (NSA):"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 7157353..5380279 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Настройки за обаждане"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Само администраторът може да променя настройките за обаждане."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Настройките на профилите в телефона могат да се променят само от администратора или служебния потребител."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Собственикът на устройството е ограничил възможността за промяна на настройките за мобилната мрежа."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Настройки (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Грешка в настройките за обаждане"</string>
<string name="reading_settings" msgid="1605904432450871183">"Извършва се четене на настройки…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Задаване на електронната SIM карта с изваждащ се чип като основна"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Мощност на мобилното радио"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Симулиране на липса на услуга (само в компилацията за отстраняване на грешки)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Принудително използване на сателитен LTE канал (само в компилацията за отстраняване на грешки)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Симулиран сателитен режим от оператора (само в компилацията за отстраняване на грешки)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Тестване на режим на истински сателитен eSOS (само в компилацията за отстраняване на грешки)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Тестване на режим на истинска сателитна неспешна комуникация (само в компилацията за отстраняване на грешки)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Тестване на режим на демонстрация на сателитен eSOS (само в компилацията за отстраняване на грешки)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Преглед на указателя на SIM картата"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Преглед на номера за фиксирано набиране"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Преглед на номера за набиране на услуги"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMS център:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Актуализиране"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Опресняване"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Превключване на проверката на DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Информация/настройки, специфични за ОЕМ"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC е налице (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR е ограничено (NSA):"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 0a91958..e4a02b3 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"কল সেটিংস"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"কেবলমাত্র প্রশাসক ব্যবহারকারী কল সেটিংস পরিবর্তন করতে পারবেন৷"</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"শুধুমাত্র অ্যাডমিন বা অফিস প্রোফাইল ব্যবহারকারী ফোনের অ্যাকাউন্ট সেটিংস পরিবর্তন করতে পারবেন।"</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"ডিভাইসের মালিক, মোবাইল নেটওয়ার্ক সেটিংস পরিবর্তন করার সুবিধা সীমাবদ্ধ করে রেখেছেন।"</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"সেটিংস (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"কল সেটিংসে ত্রুটি"</string>
<string name="reading_settings" msgid="1605904432450871183">"সেটিংস পড়ছে…"</string>
@@ -533,7 +534,7 @@
<string name="notification_voicemail_title_count" msgid="2806950319222327082">"নতুন ভয়েসমেল (<xliff:g id="COUNT">%d</xliff:g>)"</string>
<string name="notification_voicemail_text_format" msgid="5720947141702312537">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> এ ডায়াল করুন"</string>
<string name="notification_voicemail_no_vm_number" msgid="3423686009815186750">"ভয়েসমেল নম্বর অজানা"</string>
- <string name="notification_network_selection_title" msgid="255595526707809121">"কোনো পরিষেবা নেই"</string>
+ <string name="notification_network_selection_title" msgid="255595526707809121">"কোনও পরিষেবা নেই"</string>
<string name="notification_network_selection_text" msgid="553288408722427659">"বেছে নেওয়া নেটওয়ার্ক (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) নেই"</string>
<string name="incall_error_power_off" product="watch" msgid="7191184639454113633">"কল করতে মোবাইল নেটওয়ার্ক চালু করুন, বিমান মোড বা ব্যাটারি সেভার বন্ধ করুন৷"</string>
<string name="incall_error_power_off" product="default" msgid="8131672264311208673">"কল করতে বিমান মোড বন্ধ করুন৷"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"সরিয়ে দেওয়া যায় এমন eSIM ডিফল্ট হিসেবে সেট করুন"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"মোবাইল রেডিওর গুণমান"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"আউট-অফ-সার্ভিস সিমুলেট করা (শুধুমাত্র ডিবাগ বিল্ডের জন্য)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"ফোর্স ক্যাম্প স্যাটেলাইট এলটিই চ্যানেল (শুধুমাত্র ডিবাগ বিল্ড)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"নকল পরিষেবা প্রদানকারী উপগ্রহ মোড (শুধুমাত্র ডিবাগ বিল্ড)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"রিয়েল স্যাটেলাইট eSOS মোড পরীক্ষা করুন (শুধুমাত্র ডিবাগ বিল্ড)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"রিয়েল স্যাটেলাইট নন-ইএসওএস মোড পরীক্ষা করুন (শুধুমাত্র ডিবাগ বিল্ড)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"ডেমো স্যাটেলাইট eSOS মোড পরীক্ষা করুন (শুধুমাত্র ডিবাগ বিল্ড)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"সিম অ্যাড্রেস বুক দেখুন"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"স্থায়ী ডায়াল নম্বরগুলি দেখুন"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"সার্ভিস ডায়াল নম্বরগুলি দেখুন"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"আপডেট করুন"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"রিফ্রেশ"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"DNS চেক টগল করুন"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM-নির্দিষ্ট তথ্য/সেটিংস"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"এন-ডিসি (EN-DC) উপলভ্য (এনএসএ) (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"ডিসিএনআর (DCNR) সীমাবদ্ধ (এনএসএ) (NSA):"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index af0813a..226ab18 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Postavke poziva"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Postavke poziva može promijeniti samo administrator."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Postavke računa na telefonu može promijeniti samo administrator ili poslovni korisnik."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Vlasnik uređaja je ograničio mogućnost promjene postavki mobilne mreže."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Postavke (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Greška u postavkama poziva"</string>
<string name="reading_settings" msgid="1605904432450871183">"Čitanje postavki…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Postavljanje uklonjive eSim kartice kao zadane"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Snaga mobilnog radija"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simulacija ne radi (samo verzija za otklanjanje grešaka)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Satelitski LTE kanala za Force Camp (samo verzija za otklanjanje grešaka)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Lažni način rada operatera za slanje putem satelita (samo verzija za otklanjanje grešaka)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Testiraj stvarni način rada satelitskog eSOS-a (samo verzija za otklanjanje grešaka)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Testiraj stvarni način rada satelita koji nije eSOS (samo verzija za otklanjanje grešaka)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Testiraj demo način rada satelitskog eSOS-a (samo verzija za otklanjanje grešaka)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Prikaži SIM adresar"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Prikaži brojeve fiksnog biranja"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Prikaži brojeve biranja usluga"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Ažuriraj"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Osvježi"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Uključi/isključi provjeru DNS-a"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM-specifične informacije/postavke"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC dostupno (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR ograničeno (NSA):"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 8a2a589..f4c5593 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Configuració de trucada"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Només l\'administrador pot canviar la configuració de trucades."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Només l\'administrador o l\'usuari de la feina pot canviar la configuració del compte del telèfon."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"El propietari del dispositiu ha restringit la possibilitat de canviar la configuració de la xarxa mòbil."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Configuració (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Error de configuració de trucada"</string>
<string name="reading_settings" msgid="1605904432450871183">"S\'està llegint la configuració…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Defineix l\'eSIM extraïble com a opció predeterminada"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Potència del senyal mòbil"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simula que està fora de servei (només per a la compilació de depuració)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Força el canal LTE del satèl·lit de camp (només per a la compilació de depuració)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Mode de satèl·lit d\'un operador de telefonia mòbil simulat (només per a la compilació de depuració)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Provar el mode eSOS de satèl·lit real (només per a la compilació de depuració)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Prova el mode no eSOS de satèl·lit real (només per a la compilació de depuració)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Provar el mode de demostració d\'eSOS de satèl·lit (només per a la compilació de depuració)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Mostra la llibreta d\'adreces de la SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Mostra els números de marcatge fix"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Mostra els números de marcatge de serveis"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Actualitza"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Actualitza"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Activa o desactiva la comprovació de DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Informació/configuració específica d\'OEM"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC disponible (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR amb restriccions (NSA):"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index cca342f..a6a6209 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Nastavení hovorů"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Nastavení hovorů může změnit pouze uživatel s oprávněním administrátora."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Nastavení telefonního účtu může změnit jen administrátor nebo uživatel pracovního účtu."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Vlastník zařízení omezil možnost změnit nastavení mobilní sítě."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Nastavení (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Chyba nastavení hovorů"</string>
<string name="reading_settings" msgid="1605904432450871183">"Načítání nastavení..."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Nastavit vyjímatelnou eSIM jako výchozí"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Výkon mobilního přijímače"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simulovat provoz mimo službu (pouze ladicí sestavení)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Kanál LTE Force Camp Satellite (jen ladicí sestavení)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Simulace satelitního režimu operátora (pouze ladicí sestavení)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Otestovat reálný režim nouzových zpráv přes satelit (pouze ladicí sestavení)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Otestovat reálný režim jiných než nouzových zpráv přes satelit (pouze ladicí sestavení)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Otestovat ukázkový režim nouzových zpráv přes satelit (pouze ladicí sestavení)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Zobrazit adresář SIM karty"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Zobrazit povolená telefonní čísla"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Zobrazit čísla volání služeb"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Aktualizovat"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Obnovit"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Přepnout kontrolu DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Informace a nastavení specifické pro výrobce OEM"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC k dispozici (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR – omezeno (NSA):"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index d2799b8..2f4ede6 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Indstillinger for opkald"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Opkaldsindstillingerne kan kun ændres af administratorbrugeren."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Telefons kontoindstillinger kan kun ændres af en administrator eller arbejdsbruger."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Enhedsejeren har begrænset muligheden for at ændre indstillinger for mobilnetværk."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Indstillinger (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Fejl i indstillinger for opkald"</string>
<string name="reading_settings" msgid="1605904432450871183">"Læser indstillinger ..."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Konfigurer eSIM, der kan fjernes, som standard"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Mobilsendestyrke"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simulering af enhed, der er ude af drift (kun i fejlretningsbuild)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Gennemtving Camp Satellite LTE-kanal (kun fejlretningsbuild)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Test af satellittilstand via mobilselskab (kun fejlretningsbuild)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Test af virkelig eSOS-satellittilstand (kun fejlretningsbuild)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Test af virkelig satellittilstand, der ikke er eSOS (kun fejlretningsbuild)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Test af demo for eSOS-satellittilstand (kun fejlretningsbuild)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Vis adressebog på SIM-kortet"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Vis numre til begrænset opkald"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Vis tjenestens faste opkaldsnumre"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Opdater"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Opdater"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Skift DNS-kontrol"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM-specifikke oplysninger/indstillinger"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"Tilgængelig for EN-DC (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"Begrænset til DCNR (NSA):"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b142bcd..24c72e3 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Anrufeinstellungen"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Anrufeinstellungen können nur vom Administrator geändert werden."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Die Kontoeinstellungen können nur durch den Administrator oder den Nutzer des Arbeitsprofils geändert werden."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Der Eigentümer des Geräts hat die Möglichkeit zum Ändern der Einstellungen für Mobilfunknetze eingeschränkt."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Einstellungen (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Fehler bei Anrufeinstellungen"</string>
<string name="reading_settings" msgid="1605904432450871183">"Einstellungen werden gelesen…"</string>
@@ -191,7 +192,7 @@
<string name="preferred_network_mode_summary" msgid="3787989000044330064">"Netzwerkbetriebsmodus ändern"</string>
<string name="preferred_network_mode_dialogtitle" msgid="2781447433514459696">"Bevorzugter Netzwerktyp"</string>
<string name="forbidden_network" msgid="5081729819561333023">"(nicht zulässig)"</string>
- <string name="choose_network_title" msgid="5335832663422653082">"Netzwerk auswählen"</string>
+ <string name="choose_network_title" msgid="5335832663422653082">"Netz auswählen"</string>
<string name="network_disconnected" msgid="8844141106841160825">"Nicht verbunden"</string>
<string name="network_connected" msgid="2760235679963580224">"Verbunden"</string>
<string name="network_connecting" msgid="160901383582774987">"Verbindung wird hergestellt..."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Wechsel-eSIM als Standard festlegen"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Mobilfunkstärke"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"„Außer Betrieb“ simulieren (nur Debug-Build)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"LTE-Kanal für Satelliten-Camp erzwingen (nur Debug-Build)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Vom Mobilfunkanbieter simulierter Satellitenmodus (nur Debug-Build)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"eSOS-Modus mit echtem Satelliten testen (nur Debug-Build)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"non-eSOS-Modus mit echtem Satelliten testen (nur Debug-Build)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"eSOS-Modus mit Demo-Satelliten testen (nur Debug-Build)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"SIM-Adressbuch anzeigen"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Rufnummernbeschränkung ansehen"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Servicerufnummern anzeigen"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Update"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Aktualisieren"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"DNS-Überprüfung ein-/ausschalten"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM-spezifische Infos/Einstellungen"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC verfügbar (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR eingeschränkt (NSA):"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index ae3a890..75d47a9 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Ρυθμίσεις κλήσης"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Οι ρυθμίσεις κλήσεων μπορούν να αλλάξουν μόνο από τον χρήστη που έχει ρόλο διαχειριστή."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Οι ρυθμίσεις λογαριασμού του τηλεφώνου μπορούν να αλλάξουν μόνο από τον διαχειριστή ή τον χρήστη του προφίλ εργασίας."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Ο κάτοχος της συσκευής έχει περιορίσει τη δυνατότητα αλλαγής των ρυθμίσεων δικτύου κινητής τηλεφωνίας."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Ρυθμίσεις (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Σφάλμα ρυθμίσεων κλήσης"</string>
<string name="reading_settings" msgid="1605904432450871183">"Ανάγνωση ρυθμίσεων…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Ορισμός αφαιρούμενης eSIM ως προεπιλεγμένης"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Ισχύς πομπού κινητής τηλεφωνίας"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Η προσομοίωση δεν λειτουργεί (μόνο έκδοση εντοπισμού σφαλμάτων)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Επιβολή καναλιού Camp Satellite LTE (μόνο έκδοση εντοπισμού σφαλμάτων)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Εικονική λειτουργία δορυφόρου εταιρείας κινητής τηλεφωνίας (μόνο έκδοση εντοπισμού σφαλμάτων)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Δοκιμή πραγματικής δορυφορικής λειτουργίας eSOS (μόνο έκδοση εντοπισμού σφαλμάτων)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Δοκιμή πραγματικής δορυφορικής λειτουργίας εκτός eSOS (μόνο έκδοση εντοπισμού σφαλμάτων)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Έλεγχος δοκιμαστικής δορυφορικής λειτουργίας eSOS (μόνο έκδοση εντοπισμού σφαλμάτων)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Προβολή βιβλίου διευθύνσεων κάρτας SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Προβολή προκαθορισμένων αριθμών κλήσης"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Προβολή αριθμών κλήσης υπηρεσίας"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Ενημέρωση"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Ανανέωση"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Εναλλαγή ελέγχου DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Πληροφορίες/ρυθμίσεις για OEM"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC διαθέσιμο (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR με περιορισμούς (NSA):"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 765321b..75b50b1 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Call settings"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Call settings can only be changed by the admin user."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Phone account settings can only be changed by the admin or work user."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"The device owner has restricted the ability to change mobile network settings."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Settings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Call settings error"</string>
<string name="reading_settings" msgid="1605904432450871183">"Reading settings…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Set removable eSIM as default"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Mobile radio power"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simulate out of service (debug build only)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Force Camp Satellite LTE Channel (debug build only)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Mock operator satellite mode (debug build only)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Test real satellite eSOS mode (debug build only)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Test real satellite non-eSOS mode (debug build only)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Test demo satellite eSOS mode (debug build only)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"View SIM address book"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"View fixed dialling numbers"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"View service dialling numbers"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Update"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Refresh"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Toggle DNS check"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM-specific info/settings"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC available (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR restricted (NSA):"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 5fb42ff..d1edf82 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Call settings"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Call settings can only be changed by the admin user."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Phone account settings can only be changed by the admin or work user."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"The device owner has restricted the ability to change mobile network settings."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Settings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Call settings error"</string>
<string name="reading_settings" msgid="1605904432450871183">"Reading settings…"</string>
@@ -844,7 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Set Removable eSIM as Default"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Mobile Radio Power"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simulate Out of Service (Debug Build only)"</string>
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Force Camp Satellite LTE Channel (Debug Build only)"</string>
<string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Mock Carrier Satellite Mode (Debug Build only)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Test real satellite eSOS mode (Debug Build only)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Test real satellite non-eSOS mode (Debug Build only)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Test demo satellite eSOS mode (Debug Build only)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"View SIM Address Book"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"View Fixed Dialing Numbers"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"View Service Dialing Numbers"</string>
@@ -911,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Update"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Refresh"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Toggle DNS Check"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM-specific Info/Settings"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC Available (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR Restricted (NSA):"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 765321b..75b50b1 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Call settings"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Call settings can only be changed by the admin user."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Phone account settings can only be changed by the admin or work user."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"The device owner has restricted the ability to change mobile network settings."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Settings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Call settings error"</string>
<string name="reading_settings" msgid="1605904432450871183">"Reading settings…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Set removable eSIM as default"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Mobile radio power"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simulate out of service (debug build only)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Force Camp Satellite LTE Channel (debug build only)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Mock operator satellite mode (debug build only)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Test real satellite eSOS mode (debug build only)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Test real satellite non-eSOS mode (debug build only)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Test demo satellite eSOS mode (debug build only)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"View SIM address book"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"View fixed dialling numbers"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"View service dialling numbers"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Update"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Refresh"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Toggle DNS check"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM-specific info/settings"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC available (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR restricted (NSA):"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 765321b..75b50b1 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Call settings"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Call settings can only be changed by the admin user."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Phone account settings can only be changed by the admin or work user."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"The device owner has restricted the ability to change mobile network settings."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Settings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Call settings error"</string>
<string name="reading_settings" msgid="1605904432450871183">"Reading settings…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Set removable eSIM as default"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Mobile radio power"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simulate out of service (debug build only)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Force Camp Satellite LTE Channel (debug build only)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Mock operator satellite mode (debug build only)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Test real satellite eSOS mode (debug build only)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Test real satellite non-eSOS mode (debug build only)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Test demo satellite eSOS mode (debug build only)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"View SIM address book"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"View fixed dialling numbers"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"View service dialling numbers"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Update"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Refresh"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Toggle DNS check"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM-specific info/settings"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC available (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR restricted (NSA):"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 9af3f97..624727b 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Call settings"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Call settings can only be changed by the admin user."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Phone account settings can only be changed by the admin or work user."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"The device owner has restricted the ability to change mobile network settings."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Settings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Call settings error"</string>
<string name="reading_settings" msgid="1605904432450871183">"Reading settings…"</string>
@@ -844,7 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Set Removable eSIM as Default"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Mobile Radio Power"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simulate Out of Service (Debug Build only)"</string>
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Force Camp Satellite LTE Channel (Debug Build only)"</string>
<string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Mock Carrier Satellite Mode (Debug Build only)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Test real satellite eSOS mode (Debug Build only)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Test real satellite non-eSOS mode (Debug Build only)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Test demo satellite eSOS mode (Debug Build only)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"View SIM Address Book"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"View Fixed Dialing Numbers"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"View Service Dialing Numbers"</string>
@@ -911,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Update"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Refresh"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Toggle DNS Check"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM-specific Info/Settings"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC Available (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR Restricted (NSA):"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index f543a9a..4b06be3 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Config. de llamada"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Solo el usuario administrador puede cambiar la configuración de llamadas."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Solo el administrador o usuario de trabajo puede cambiar la configuración de la cuenta telefónica."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"El propietario del dispositivo restringió la capacidad de cambiar la configuración de la red móvil."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Configuración (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Error de configuración de llamada"</string>
<string name="reading_settings" msgid="1605904432450871183">"Leyendo configuración..."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Establecer eSIM extraíble como predeterminada"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Potencia de la señal móvil"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simular fuera de servicio (solo para la compilación de depuración)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Canal LTE de satélite del campamento de la fuerza (solo compilación de depuración)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Modo Satélite del operador de prueba (solo en la compilación de depuración)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Prueba el modo eSOS de satélite real (solo en la compilación de depuración)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Prueba el modo que no es eSOS por satélite real (solo en la compilación de depuración)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Prueba el modo de demostración de eSOS de satélite (solo en la compilación de depuración)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Ver libreta de direcciones de SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Ver números de marcación fija"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Ver números de marcación de servicio"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Actualizar"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Actualizar"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Activar o desactivar la comprobación de DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Configuración/Datos específicos del OEM"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC disponible (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR restringido (NSA):"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 863a88d..bccc7cd 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Ajustes de llamadas"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"El administrador es el único usuario que puede cambiar los ajustes de llamada."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Solo el administrador o el usuario de trabajo pueden cambiar la configuración de la cuenta del teléfono."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"El propietario del dispositivo ha restringido la posibilidad de cambiar la configuración de la red móvil."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Ajustes (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Error de configuración de llamada"</string>
<string name="reading_settings" msgid="1605904432450871183">"Leyendo ajustes..."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Establecer eSIM extraíble como predeterminada"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Potencia de la señal móvil"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simular fuera del servicio (solo versión de depuración)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Forzar canal LTE de satélite de campamento (solo versión de depuración)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Simulación del modo Satélite de operador (solo versión de depuración)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Probar el modo eSOS por satélite real (solo versión de depuración)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Probar el modo no eSOS por satélite real (solo versión de depuración)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Probar el modo eSOS por satélite de demostración (solo versión de depuración)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Ver libreta de direcciones de tarjeta SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Ver números de marcación fija"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Ver números de marcación de servicio"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Actualizar"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Actualizar"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Activar o desactivar comprobación de DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Ajustes o información específica de OEM"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC disponible (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR restringido (NSA):"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 4b3c466..56fc00a 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Kõneseaded"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Kõne seadeid saab muuta ainult administraator."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Telefoni konto seadeid saab muuta ainult administraator või tööprofiili kasutaja."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Seadme omanik on mobiilsidevõrgu seadete muutmise võimalust piiranud."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Seaded (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Kõneseadete viga"</string>
<string name="reading_settings" msgid="1605904432450871183">"Seadete lugemine ..."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Eemaldatava eSIM-i määramine vaikevalikuks"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Mobiiliraadio toide"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simuleerimine ei tööta (ainult silumisjärgus)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Camp Satellite LTE kanali (ainult silumisjärgus) sundaktiveerimine"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Simuleeritud operaatori satelliidirežiim (ainult silumisjärgus)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Režiimi eSOS katsetamine reaalse satelliitsidesüsteemi puhul (ainult silumisjärk)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Režiimi mitte-eSOS katsetamine reaalse satelliitsidesüsteemi puhul (ainult silumisjärk)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Režiimi eSOS katsetamine demo satelliitsidesüsteemi puhul (ainult silumisjärk)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Kuva SIM-i aadressiraamat"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Kuva fikseeritud valimisnumbrid"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Kuva teenuse valimise numbrid"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Värskendamine"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Värskendamine"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"DNS-i kontrolli sisse- või väljalülitamine"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM-i teave/seaded"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC on saadaval (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR on piiratud (NSA):"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index c5d795c..452df67 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Deien ezarpenak"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Administratzaileak soilik alda ditzake deien ezarpenak."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Administratzaileak / Laneko erabiltzaileek alda ditzakete telefonoko kontuaren ezarpenak."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Gailuaren jabeak sare mugikorraren ezarpenak aldatzeko aukera mugatu du."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Ezarpenak (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Deien ezarpenen errorea"</string>
<string name="reading_settings" msgid="1605904432450871183">"Ezarpenak irakurtzen…"</string>
@@ -305,7 +306,7 @@
<string name="keywords_carrier_settings_euicc" msgid="8540160967922063745">"operadorea, esim, esim txartela, sim, sim txartela, euicc, euicc txartela, aldatu operadoreak, aldatu operadorez, aldatu operadorea, gehitu operadorea, gehitu operadoreak"</string>
<string name="carrier_settings_euicc_summary" msgid="2027941166597330117">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>: <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
<string name="mobile_data_settings_title" msgid="7228249980933944101">"Datu-konexioa"</string>
- <string name="mobile_data_settings_summary" msgid="5012570152029118471">"Atzitu datuak datu-konexioaren bidez"</string>
+ <string name="mobile_data_settings_summary" msgid="5012570152029118471">"Atzitu datuak sare mugikorraren bidez"</string>
<string name="data_usage_disable_mobile" msgid="5669109209055988308">"Datu-konexioa desaktibatu nahi duzu?"</string>
<string name="sim_selection_required_pref" msgid="6985901872978341314">"Hautatu egin behar da"</string>
<string name="sim_change_data_title" msgid="9142726786345906606">"Datuetarako SIMa aldatu nahi duzu?"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Ezarri eSIM aldagarria lehenetsi gisa"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Sare mugikor bidezko irratiaren indarra"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simulatu gailua ez dabilela (arazketa-konpilazioa soilik)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Force Camp Satellite LTE kanala (arazte-konpilazioa bakarrik)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Simulatu operadorearen satelite modua (arazketa-konpilazioa soilik)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Probatu satelite bidezko SOS larrialdien modua (arazketa-konpilazioa soilik)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Probatu satelite bidezko SOS larrialdien modua ez dena (arazketa-konpilazioa soilik)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Probatu satelite bidezko SOS larrialdien moduaren demo-bertsioa (arazketa-konpilazioa soilik)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Ikusi SIMeko kontaktuak"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Ikusi markatze finkoko zenbakiak"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Ikusi zerbitzuaren markatze-zenbakiak"</string>
@@ -868,7 +872,7 @@
<string name="radioInfo_data_disconnected" msgid="8085447971880814541">"Deskonektatuta"</string>
<string name="radioInfo_data_connecting" msgid="925092271092152472">"Konektatzen"</string>
<string name="radioInfo_data_connected" msgid="7637335645634239508">"Konektatuta"</string>
- <string name="radioInfo_data_suspended" msgid="8695262782642002785">"Aldi baterako itxitakoak"</string>
+ <string name="radioInfo_data_suspended" msgid="8695262782642002785">"Aldi baterako etenda"</string>
<string name="radioInfo_unknown" msgid="5401423738500672850">"Ezezaguna"</string>
<string name="radioInfo_imei_primary" msgid="5948747378637224400">"Nagusia"</string>
<string name="radioInfo_display_packets" msgid="6794302192441084157">"pkts"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Eguneratu"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Freskatu"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Aldatu DNS egiaztapenaren egoera"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Jatorrizko fabrikatzailearen berariazko informazioa edota ezarpenak"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC erabilgarri (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR murriztua (NSA):"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 873e30e..4aa57e8 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"تنظیمات تماس"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"فقط کاربر سرپرست میتواند تنظیمات تماس را تغییر دهد."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"فقط کاربر کاری یا سرپرست میتواند تنظیمات حساب تلفن را تغییر دهد."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"مالک دستگاه امکان تغییر دادن تنظیمات شبکه تلفن همراه را محدود کرده است."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"تنظیمات (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"خطای تنظیمات تماس"</string>
<string name="reading_settings" msgid="1605904432450871183">"در حال خواندن تنظیمات..."</string>
@@ -285,8 +286,8 @@
<string name="roaming" msgid="1576180772877858949">"فراگردی"</string>
<string name="roaming_enable" msgid="6853685214521494819">"اتصال به سرویسهای داده هنگام فراگردی"</string>
<string name="roaming_disable" msgid="8856224638624592681">"اتصال به سرویسهای داده هنگام فراگردی"</string>
- <string name="roaming_reenable_message" msgid="1951802463885727915">"فراگردی داده خاموش شده است. برای روشن کردن آن، ضربه بزنید."</string>
- <string name="roaming_enabled_message" msgid="9022249120750897">"ممکن است هزینههای فراگردی اعمال شود. برای اصلاح ضربه بزنید."</string>
+ <string name="roaming_reenable_message" msgid="1951802463885727915">"فراگردی داده خاموش شده است. برای روشن کردن آن، تکضرب بزنید."</string>
+ <string name="roaming_enabled_message" msgid="9022249120750897">"ممکن است هزینههای فراگردی اعمال شود. برای اصلاح تکضرب بزنید."</string>
<string name="roaming_notification_title" msgid="3590348480688047320">"اتصال داده تلفن همراه قطع شد"</string>
<string name="roaming_on_notification_title" msgid="7451473196411559173">"فراگردی داده روشن است"</string>
<string name="roaming_warning" msgid="7855681468067171971">"شاید هزینه زیادی برای شما داشته باشد."</string>
@@ -563,11 +564,11 @@
<string name="incall_error_carrier_roaming_satellite_mode" msgid="678603203562886361">"میتوانید بدون شبکه تلفن همراه یا شبکه Wi-Fi پیام ارسال و دریافت کنید."</string>
<string name="emergency_information_hint" msgid="9208897544917793012">"اطلاعات اضطراری"</string>
<string name="emergency_information_owner_hint" msgid="6256909888049185316">"مالک"</string>
- <string name="emergency_information_confirm_hint" msgid="5109017615894918914">"برای دیدن اطلاعات، دوباره ضربه بزنید"</string>
+ <string name="emergency_information_confirm_hint" msgid="5109017615894918914">"برای دیدن اطلاعات، دوباره تکضرب بزنید"</string>
<string name="emergency_enable_radio_dialog_title" msgid="2667568200755388829">"تماس اضطراری"</string>
<string name="single_emergency_number_title" msgid="8413371079579067196">"شماره تلفن اضطراری"</string>
<string name="numerous_emergency_numbers_title" msgid="8972398932506755510">"شماره تلفنهای اضطراری"</string>
- <string name="emergency_call_shortcut_hint" msgid="1290485125107779500">"برای تماس با <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g> دوباره ضربه بزنید"</string>
+ <string name="emergency_call_shortcut_hint" msgid="1290485125107779500">"برای تماس با <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g> دوباره تکضرب بزنید"</string>
<string name="emergency_enable_radio_dialog_message" msgid="1695305158151408629">"در حال روشن کردن رادیو..."</string>
<string name="emergency_enable_radio_dialog_retry" msgid="4329131876852608587">"سرویسی در دسترس نیست. دوباره امتحان کنید..."</string>
<string name="radio_off_during_emergency_call" msgid="8011154134040481609">"در طول تماس اضطراری نمیتوانید به حالت هواپیما بروید."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"تنظیم سیمکارت داخلی جداشدنی بهعنوان پیشفرض"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"توان رادیوی تلفن همراه"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"شبیهسازی از کار افتادن (فقط ساخت اشکالزدایی)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"اجباری کردن کانال Camp Satellite LTE (فقط ساخت اشکالزدایی)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"حالت ماهوارهای شرکت مخابراتی ساختگی (فقط ساخت اشکالزدایی)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"آزمایش کردن حالت واقعی درخواست کمک اضطراری ماهوارهای (فقط ساخت اشکالزدایی)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"آزمایش کردن حالت واقعی درخواست کمک غیراضطراری ماهوارهای (فقط ساخت اشکالزدایی)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"آزمایش کردن نسخه نمایشی درخواست کمک اضطراری ماهوارهای (فقط ساخت اشکالزدایی)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"مشاهده دفترچه نشانی سیمکارت"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"مشاهده شمارههای شمارهگیری ثابت"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"مشاهده شمارههای شمارهگیری سرویس"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"بهروزرسانی"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"بازآوری"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"تغییر وضعیت علامت DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"تنظیمات/اطلاعات خاص OEM"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC دردسترس است (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR محدود شده است (NSA):"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index b004972..3a2dc69 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Puheluasetukset"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Vain järjestelmänvalvoja voi muuttaa puheluasetuksia."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Vain järjestelmänvalvoja tai työkäyttäjä voi muuttaa puhelintilin asetuksia."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Laitteen omistaja on rajoittanut mobiiliverkkoasetusten muuttamista."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Asetukset (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Virhe puheluasetuksissa"</string>
<string name="reading_settings" msgid="1605904432450871183">"Luetaan asetuksia…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Aseta poistettava eSIM oletukseksi"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Mobiiliradion voimakkuus"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Epäkunnossa-simulaatio (vain virheenkorjauksen koontiversio)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Pakota Camp Satellite LTE ‐kanava (vain virheenkorjauksen koontiversio)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Operaattorin satelliittitilaesimerkki (vain virheenkorjauksen koontiversio)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Testaa oikeaa Satellite eSOS ‑tilaa (vain virheenkorjauksen koontiversio)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Testaa oikeaa Satellite non-eSOS ‑tilaa (vain virheenkorjauksen koontiversio)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Testaa Satellite eSOS ‑demotilaa (vain virheenkorjauksen koontiversio)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Näytä SIM-kortin osoitekirja"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Näytä sallitut numerot"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Näytä sallitut palvelunumerot"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Päivitä"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Päivitä"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Ota DNS-tarkistus käyttöön tai poista se käytöstä"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM-kohtaiset tiedot/asetukset"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC saatavana (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR rajoitettu (NSA):"</string>
diff --git a/res/values-fr-feminine/strings.xml b/res/values-fr-feminine/strings.xml
new file mode 100644
index 0000000..af39013
--- /dev/null
+++ b/res/values-fr-feminine/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="manual_mode_disallowed_summary" msgid="3970048592179890197">"Indisponible lorsque vous êtes connectée à %1$s"</string>
+</resources>
diff --git a/res/values-fr-masculine/strings.xml b/res/values-fr-masculine/strings.xml
new file mode 100644
index 0000000..457cf38
--- /dev/null
+++ b/res/values-fr-masculine/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="manual_mode_disallowed_summary" msgid="3970048592179890197">"Indisponible lorsque vous êtes connecté à %1$s"</string>
+</resources>
diff --git a/res/values-fr-neuter/strings.xml b/res/values-fr-neuter/strings.xml
new file mode 100644
index 0000000..221e1eb
--- /dev/null
+++ b/res/values-fr-neuter/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="manual_mode_disallowed_summary" msgid="3970048592179890197">"Indisponible lorsque vous êtes connecté·e à %1$s"</string>
+</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index adfc9b3..ff32473 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Paramètres d\'appel"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Seul l\'administrateur peut modifier les paramètres d\'appel."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Seuls l\'admin. ou l\'utilisat. profession. peuvent modif. les param. du compte tél."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Le propriétaire de l\'appareil a limité la possibilité de modifier les paramètres du réseau cellulaire."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Paramètres (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Erreur des paramètres d\'appel"</string>
<string name="reading_settings" msgid="1605904432450871183">"Lecture des paramètres..."</string>
@@ -145,7 +146,7 @@
<string name="stk_cc_ss_to_ussd_error" msgid="8330749347425752192">"Demande SS remplacée par une demande USSD"</string>
<string name="stk_cc_ss_to_ss_error" msgid="8297155544652134278">"Remplacement par une nouvelle demande SS"</string>
<string name="stk_cc_ss_to_dial_video_error" msgid="4255261231466032505">"Demande SS remplacée par un appel vidéo"</string>
- <string name="fdn_check_failure" msgid="1833769746374185247">"Les numéros autorisés sont activés dans l\'application de votre téléphone. Par conséquent, certaines fonctionnalités d\'appel ne fonctionnent pas."</string>
+ <string name="fdn_check_failure" msgid="1833769746374185247">"Les numéros autorisés sont activés dans l\'appli de votre téléphone. Par conséquent, certaines fonctionnalités d\'appel ne fonctionnent pas."</string>
<string name="radio_off_error" msgid="8321564164914232181">"Activez le signal radio avant d\'afficher ces paramètres."</string>
<string name="close_dialog" msgid="1074977476136119408">"OK"</string>
<string name="enable" msgid="2636552299455477603">"Activer"</string>
@@ -298,7 +299,7 @@
<string name="sip_accounts_removed_notification_title" msgid="3528076957535736095">"Comptes SIP obsolètes trouvés et retirés"</string>
<string name="sip_accounts_removed_notification_message" msgid="1916856744869791592">"Les appels SIP ne sont plus pris en charge par la plateforme Android.\nVos comptes SIP <xliff:g id="REMOVED_SIP_ACCOUNTS">%s</xliff:g> existants ont été retirés.\nVeuillez confirmer votre paramètre de compte d\'appel par défaut."</string>
<string name="sip_accounts_removed_notification_action" msgid="3772778402370555562">"Accéder aux paramètres"</string>
- <string name="data_usage_title" msgid="8438592133893837464">"Utilisation des données des applications"</string>
+ <string name="data_usage_title" msgid="8438592133893837464">"Utilisation des données des applis"</string>
<string name="data_usage_template" msgid="6287906680674061783">"<xliff:g id="ID_1">%1$s</xliff:g> de données mobiles utilisées pendant la période suivante : <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="advanced_options_title" msgid="9208195294513520934">"Avancés"</string>
<string name="carrier_settings_euicc" msgid="1190237227261337749">"Opérateur"</string>
@@ -581,7 +582,7 @@
<string name="description_concat_format" msgid="2014471565101724088">"%1$s, %2$s"</string>
<string name="dialerKeyboardHintText" msgid="1115266533703764049">"Utilisez le clavier pour composer un numéro."</string>
<string name="onscreenHoldText" msgid="4025348842151665191">"Attente"</string>
- <string name="onscreenEndCallText" msgid="6138725377654842757">"Terminé"</string>
+ <string name="onscreenEndCallText" msgid="6138725377654842757">"Terminer"</string>
<string name="onscreenShowDialpadText" msgid="658465753816164079">"Clavier numérique"</string>
<string name="onscreenMuteText" msgid="5470306116733843621">"Couper le son"</string>
<string name="onscreenAddCallText" msgid="9075675082903611677">"Autre appel"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Définir la carte eSIM amovible comme carte SIM par défaut"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Alimentation de radio cellulaire"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simulation de l\'appareil hors service (version de débogage uniquement)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Forcer le canal LTE satellite du camp (version de débogage uniquement)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Mode Satellite de l\'opérateur simulé (version de débogage uniquement)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Tester le mode eSOS par satellite réel (version de débogage uniquement)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Tester le mode non-eSOS par satellite réel (version de débogage uniquement)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Tester eSOS par satellite en mode Démo (version de débogage uniquement)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Afficher le carnet d\'adresses de la carte SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Afficher les numéros d\'appel fixes"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Afficher les numéros de service"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC :"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Mettre à jour"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Actualiser"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Basculer la vérification DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Informations/paramètres OEM"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"Disponibilité EN-DC (NSA) :"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"Restriction DCNR (NSA) :"</string>
@@ -931,9 +934,9 @@
<string name="call_quality_notification_bluetooth_details" msgid="8348950331707346711">"Votre signal Bluetooth est faible. Essayez de passer au haut-parleur mains libres."</string>
<string name="call_quality_notification_name" msgid="3476828289553948830">"Notification de qualité d\'appel"</string>
<string name="notification_channel_sip_account" msgid="1261816025156179637">"Comptes SIP obsolètes"</string>
- <string name="send_from_work_profile_title" msgid="7044759579507604732">"Impossible d\'envoyer un message à partir d\'une application personnelle"</string>
- <string name="send_from_work_profile_description" msgid="2174402508727161974">"Votre organisation ne vous autorise à envoyer de messages qu\'à partir d\'applications professionnelles"</string>
+ <string name="send_from_work_profile_title" msgid="7044759579507604732">"Impossible d\'envoyer un message à partir d\'une appli personnelle"</string>
+ <string name="send_from_work_profile_description" msgid="2174402508727161974">"Votre organisation ne vous autorise à envoyer de messages qu\'à partir d\'applis professionnelles"</string>
<string name="send_from_work_profile_cancel" msgid="177746511030381711">"Annuler"</string>
<string name="send_from_work_profile_action_str" msgid="6892775562934243337">"Passer au profil professionnel"</string>
- <string name="install_messages_on_work_profile_action_str" msgid="3773440996395152903">"Installer une application de messagerie professionnelle"</string>
+ <string name="install_messages_on_work_profile_action_str" msgid="3773440996395152903">"Installer une appli de messagerie professionnelle"</string>
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index e26f13b..22a69bb 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Paramètres d\'appel"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Seul l\'administrateur peut modifier les paramètres d\'appel."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Seul l\'administrateur ou l\'utilisateur professionnel peut modifier les paramètres du compte téléphonique."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Le propriétaire de l\'appareil a limité la possibilité de modifier les paramètres du réseau mobile."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Paramètres (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Erreur des paramètres d\'appel"</string>
<string name="reading_settings" msgid="1605904432450871183">"Lecture des paramètres..."</string>
@@ -184,7 +185,7 @@
<string name="registration_done" msgid="5337407023566953292">"Enregistré sur le réseau."</string>
<string name="already_auto" msgid="8607068290733079336">"La sélection automatique est déjà activée."</string>
<string name="select_automatically" msgid="779750291257872651">"Sélectionner automatiquement le réseau"</string>
- <string name="manual_mode_disallowed_summary" msgid="3970048592179890197">"Indisponibles lorsque vous êtes connecté à %1$s"</string>
+ <string name="manual_mode_disallowed_summary" msgid="3970048592179890197">"Indisponible lorsque vous êtes connecté à %1$s"</string>
<string name="network_select_title" msgid="4117305053881611988">"Réseau"</string>
<string name="register_automatically" msgid="3907580547590554834">"Enregistrement automatique…"</string>
<string name="preferred_network_mode_title" msgid="5253395265169539830">"Type de réseau préféré"</string>
@@ -581,7 +582,7 @@
<string name="description_concat_format" msgid="2014471565101724088">"%1$s, %2$s"</string>
<string name="dialerKeyboardHintText" msgid="1115266533703764049">"Utilisez le clavier pour composer un numéro."</string>
<string name="onscreenHoldText" msgid="4025348842151665191">"En attente"</string>
- <string name="onscreenEndCallText" msgid="6138725377654842757">"Raccrocher"</string>
+ <string name="onscreenEndCallText" msgid="6138725377654842757">"Terminer"</string>
<string name="onscreenShowDialpadText" msgid="658465753816164079">"Clavier"</string>
<string name="onscreenMuteText" msgid="5470306116733843621">"Silencieux"</string>
<string name="onscreenAddCallText" msgid="9075675082903611677">"Autre appel"</string>
@@ -622,7 +623,7 @@
<string name="ota_hfa_activation_title" msgid="3300556778212729671">"Activation en cours…"</string>
<string name="ota_hfa_activation_dialog_message" msgid="7921718445773342996">"Le service de données mobiles est en cours d\'activation sur le téléphone…\n\nCette opération peut prendre jusqu\'à cinq minutes."</string>
<string name="ota_skip_activation_dialog_title" msgid="7666611236789203797">"Ignorer l\'activation ?"</string>
- <string name="ota_skip_activation_dialog_message" msgid="6691722887019708713">"Si vous poursuivez sans activer votre mobile, vous ne pourrez ni téléphoner, ni vous connecter à des réseaux de données mobiles. La connexion à un réseau Wi-Fi reste possible. Vous serez invité à effectuer l\'activation à chaque démarrage du téléphone."</string>
+ <string name="ota_skip_activation_dialog_message" msgid="6691722887019708713">"Si vous poursuivez sans activer votre mobile, vous ne pourrez ni téléphoner, ni vous connecter à des réseaux de données mobiles. La connexion à un réseau Wi-Fi reste possible. L\'activation vous sera proposée à chaque démarrage du téléphone."</string>
<string name="ota_skip_activation_dialog_skip_label" msgid="5908029466817825633">"Ignorer"</string>
<string name="ota_activate" msgid="7939695753665438357">"Activer"</string>
<string name="ota_title_activate_success" msgid="1272135024761004889">"Votre téléphone est activé"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Définir l\'eSIM amovible comme SIM par défaut"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Alimentation radio mobile"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simuler une panne (version de débogage uniquement)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Forcer le canal LTE satellite du camp (version de débogage uniquement)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Simuler le mode Satellite de l\'opérateur (version de débogage uniquement)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Tester le SOS par satellite en mode réel (version de débogage uniquement)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Tester le mode non-eSOS par satellite réel (version de débogage uniquement)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Tester eSOS par satellite en mode démo (version de débogage uniquement)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Afficher le carnet d\'adresses de la carte SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Afficher les numéros autorisés"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Afficher les numéros de service"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC :"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Mise à jour"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Actualiser"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Activer/Désactiver le contrôle DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Infos/paramètres OEM"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"Accès EN-DC disponible (NSA) :"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"Limitation DCNR (NSA) :"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 44aa75d..3d0bc84 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Configuración de chamada"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Só o usuario administrador pode cambiar a configuración de chamada."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Só o usuario administrador ou o usuario do traballo poden cambiar a configuración da conta do teléfono."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"A persoa propietaria do dispositivo restrinxiu a capacidade de modificar a configuración da rede de telefonía móbil."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Configuración (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Erro de configuración das chamadas"</string>
<string name="reading_settings" msgid="1605904432450871183">"Lendo a configuración..."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Establecer eSIM extraíble como predeterminada"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Alimentación da radio móbil"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simular Fóra de servizo (só compilación de depuración)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Forzar o canal LTE do satélite do campamento (só compilación de depuración)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Simular o modo Satélite do operador (só compilación de depuración)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Probar o modo real eSOS por satélite (só compilación de depuración)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Probar o modo real non eSOS por satélite (só compilación de depuración)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Probar o modo de demostración de eSOS por satélite (só compilación de depuración)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Ver axenda de enderezos da SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Ver números de marcación fixa"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Ver números de marcación de servizo"</string>
@@ -882,7 +886,7 @@
<string name="radio_info_dl_kbps" msgid="2382922659525318726">"Largura de banda de descarga (kbps):"</string>
<string name="radio_info_ul_kbps" msgid="2102225400904799036">"Largura de banda de carga (kbps):"</string>
<string name="radio_info_phy_chan_config" msgid="608045501232211303">"Configuración da canle física:"</string>
- <string name="radio_info_cell_info_refresh_rate" msgid="670511448975997340">"Taxa de actualización da información para móbiles:"</string>
+ <string name="radio_info_cell_info_refresh_rate" msgid="670511448975997340">"Frecuencia de actualización da información para móbiles:"</string>
<string name="radio_info_cellinfo_label" msgid="8199062974670377659">"Toda a información de medición para móbiles:"</string>
<string name="radio_info_gprs_service_label" msgid="6819204246355412952">"Servizo de datos:"</string>
<string name="radio_info_roaming_label" msgid="6636932886446857120">"Itinerancia:"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Actualizar"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Actualizar"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Alternar comprobación de DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Información ou configuración específica de OEM"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC dispoñible (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR restrinxido (NSA):"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 3b3ce6f..60b9b24 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -25,13 +25,13 @@
<string name="private_num" msgid="4487990167889159992">"ખાનગી નંબર"</string>
<string name="payphone" msgid="7936735771836716941">"પેફોન"</string>
<string name="onHold" msgid="6132725550015899006">"હોલ્ડ પર"</string>
- <string name="carrier_mmi_msg_title" msgid="6050165242447507034">"<xliff:g id="MMICARRIER">%s</xliff:g> સંદેશ"</string>
- <string name="default_carrier_mmi_msg_title" msgid="7754317179938537213">"કૅરિઅરનો સંદેશ"</string>
+ <string name="carrier_mmi_msg_title" msgid="6050165242447507034">"<xliff:g id="MMICARRIER">%s</xliff:g> મેસેજ"</string>
+ <string name="default_carrier_mmi_msg_title" msgid="7754317179938537213">"કૅરિઅર મેસેજ"</string>
<string name="mmiStarted" msgid="9212975136944568623">"MMI કોડ પ્રારંભ કર્યો"</string>
<string name="ussdRunning" msgid="1163586813106772717">"USSD કોડ ચાલે છે…"</string>
<string name="mmiCancelled" msgid="5339191899200678272">"MMI કોડ રદ કર્યો"</string>
<string name="cancel" msgid="8984206397635155197">"રદ કરો"</string>
- <string name="enter_input" msgid="6193628663039958990">"USSD સંદેશ <xliff:g id="MIN_LEN">%1$d</xliff:g> અને <xliff:g id="MAX_LEN">%2$d</xliff:g> વર્ણ વચ્ચેનો હોવો આવશ્યક છે. કૃપા કરીને ફરી પ્રયાસ કરો."</string>
+ <string name="enter_input" msgid="6193628663039958990">"USSD મેસેજ <xliff:g id="MIN_LEN">%1$d</xliff:g> અને <xliff:g id="MAX_LEN">%2$d</xliff:g> અક્ષરો વચ્ચે હોવો આવશ્યક છે. કૃપા કરીને ફરી પ્રયાસ કરો."</string>
<string name="manageConferenceLabel" msgid="8415044818156353233">"કોન્ફરન્સ કૉલ સંચાલિત કરો"</string>
<string name="ok" msgid="7818974223666140165">"ઓકે"</string>
<string name="audio_mode_speaker" msgid="243689733219312360">"સ્પીકર્સ"</string>
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"કૉલ સેટિંગ"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"કૉલ સેટિંગને ફક્ત ઍડમિન વપરાશકર્તા દ્વારા જ બદલી શકાય છે."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"ફોન એકાઉન્ટના સેટિંગને ફક્ત ઍડમિન અથવા ઑફિસના વપરાશકર્તા જ બદલી શકે છે."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"ડિવાઇસના માલિકે મોબાઇલ નેટવર્ક સેટિંગ બદલવાની ક્ષમતા પ્રતિબંધિત કરી છે."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"સેટિંગ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"કૉલ સેટિંગની ભૂલ"</string>
<string name="reading_settings" msgid="1605904432450871183">"સેટિંગ વાંચી રહ્યાં છે…"</string>
@@ -172,7 +173,7 @@
<string name="vm_change_pin_error_mismatch" msgid="5364847280026257331">"જૂનો PIN મેળ ખાતો નથી."</string>
<string name="vm_change_pin_error_invalid" msgid="5230002671175580674">"નવો PIN અમાન્ય અક્ષરો ધરાવે છે."</string>
<string name="vm_change_pin_error_system_error" msgid="9116483527909681791">"PIN બદલવામાં અસમર્થ"</string>
- <string name="vvm_unsupported_message_format" msgid="4206402558577739713">"અસમર્થિત સંદેશ પ્રકાર, સાંભળવા માટે <xliff:g id="NUMBER">%s</xliff:g> પર કૉલ કરો."</string>
+ <string name="vvm_unsupported_message_format" msgid="4206402558577739713">"અનસપોર્ટેડ મેસેજ પ્રકાર, સાંભળવા માટે <xliff:g id="NUMBER">%s</xliff:g> પર કૉલ કરો."</string>
<string name="network_settings_title" msgid="7560807107123171541">"મોબાઇલ નેટવર્ક"</string>
<string name="label_available" msgid="1316084116670821258">"ઉપલબ્ધ નેટવર્ક્સ"</string>
<string name="load_networks_progress" msgid="4051433047717401683">"શોધી રહ્યું છે..."</string>
@@ -547,7 +548,7 @@
<string name="incall_error_out_of_service_wfc_2g_user" msgid="8218768986365299663">"મોબાઇલ નેટવર્ક ઉપલબ્ધ નથી.\n\nકોઈ કૉલ કરવા માટે, વાયરલેસ નેટવર્કથી કનેક્ટ કરો.\n\nઆ ડિવાઇસ પર 2G સેવા બંધ છે, જે તમારી કનેક્ટિવિટીને અસર કરી શકે છે. સેટિંગમાં જાઓ અને આ સેવાને ચાલુ રાખવા માટે \'2Gને મંજૂરી આપો\' ચાલુ કરો."</string>
<string name="incall_error_no_phone_number_supplied" msgid="8680831089508851894">"કૉલ કરવા માટે, માન્ય નંબર દાખલ કરો."</string>
<string name="incall_error_call_failed" msgid="393508653582682539">"કૉલ નિષ્ફળ થયો."</string>
- <string name="incall_error_cannot_add_call" msgid="5425764862628655443">"આ સમયે કૉલ ઉમેરી શકાતો નથી. તમે એક સંદેશ મોકલીને સંપર્ક કરવાનો પ્રયાસ કરી શકો છો."</string>
+ <string name="incall_error_cannot_add_call" msgid="5425764862628655443">"આ સમયે કૉલ ઉમેરી શકાતો નથી. તમે એક મેસેજ મોકલીને સંપર્ક કરવાનો પ્રયાસ કરી શકો છો."</string>
<string name="incall_error_supp_service_unknown" msgid="8751177117194592623">"સેવા સમર્થિત નથી"</string>
<string name="incall_error_supp_service_switch" msgid="5272822448189448479">"કૉલ્સ સ્વિચ કરી શકાતા નથી."</string>
<string name="incall_error_supp_service_resume" msgid="1276861499306817035">"કૉલ ફરી શરૂ કરી શકતા નથી."</string>
@@ -600,8 +601,8 @@
<string name="hac_mode_title" msgid="4127986689621125468">"સાંભળવામાં સહાયતા"</string>
<string name="hac_mode_summary" msgid="7774989500136009881">"સાંભળવામાં સહાયતા સુસંગતતા ચાલુ કરો"</string>
<string name="rtt_mode_title" msgid="3075948111362818043">"રિઅલ-ટાઇમ ટેક્સ્ટ(RTT) કૉલ"</string>
- <string name="rtt_mode_summary" msgid="8631541375609989562">"વૉઇસ કૉલ અંતર્ગત સંદેશ મોકલવાની મંજૂરી આપો"</string>
- <string name="rtt_mode_more_information" msgid="587500128658756318">"RTT બહેરા, સાંભળવા અને બોલવામાં મુશ્કેલી પડતી હોય અથવા વૉઇસ કરતાં પણ વધુ કંઈકની જરૂર હોય એવા કૉલરની સહાય કરે છે.<br> <a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>>વધુ જાણો</a>\n <br><br> - RTT કૉલને સંદેશ ટ્રાન્સક્રિપ્ટ તરીકે સાચવવામાં આવે છે\n <br> - RTT વીડિઓ કૉલ માટે ઉપલબ્ધ નથી"</string>
+ <string name="rtt_mode_summary" msgid="8631541375609989562">"વૉઇસ કૉલ અંતર્ગત મેસેજ મોકલવાની મંજૂરી આપો"</string>
+ <string name="rtt_mode_more_information" msgid="587500128658756318">"RTT બહેરા, સાંભળવા અને બોલવામાં મુશ્કેલી પડતી હોય અથવા વૉઇસ કરતાં પણ વધુ કંઈકની જરૂર હોય એવા કૉલરની સહાય કરે છે.<br> <a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>>વધુ જાણો</a>\n <br><br> - RTT કૉલને મેસેજ ટ્રાન્સક્રિપ્ટ તરીકે સાચવવામાં આવે છે\n <br> - RTT વીડિયો કૉલ માટે ઉપલબ્ધ નથી"</string>
<string name="no_rtt_when_roaming" msgid="5268008247378355389">"નોંધ: રોમિંગ વખતે RTT ઉપલબ્ધ નથી"</string>
<string-array name="tty_mode_entries">
<item msgid="3238070884803849303">"TTY બંધ"</item>
@@ -615,8 +616,8 @@
<item msgid="2271798469250155310">"સામાન્ય"</item>
<item msgid="6044210222666533564">"લાંબુ"</item>
</string-array>
- <string name="network_info_message" msgid="7599413947016532355">"નેટવર્ક સંદેશ"</string>
- <string name="network_error_message" msgid="4271579424089326618">"ભૂલ સંદેશ"</string>
+ <string name="network_info_message" msgid="7599413947016532355">"નેટવર્ક મેસેજ"</string>
+ <string name="network_error_message" msgid="4271579424089326618">"ભૂલ મેસેજ"</string>
<string name="ota_title_activate" msgid="4049645324841263423">"તમારા ફોનને સક્રિય કરો"</string>
<string name="ota_touch_activate" msgid="838764494319694754">"તમારી ફોન સેવાને સક્રિય કરવા માટે એક વિશિષ્ટ કૉલની જરૂર છે. \n\n\"સક્રિય કરો\" દબાવ્યાં પછી, તમારા ફોનને સક્રિય કરવા માટે પ્રદાન કરવામાં આવેલ સૂચનાઓને અનુસરો."</string>
<string name="ota_hfa_activation_title" msgid="3300556778212729671">"સક્રિય કરી રહ્યું છે…"</string>
@@ -679,7 +680,7 @@
<string name="accessibility_settings_activity_title" msgid="7883415189273700298">"ઍક્સેસિબિલિટી"</string>
<string name="status_hint_label_incoming_wifi_call" msgid="2606052595898044071">"આમના તરફથી Wi-Fi કૉલ"</string>
<string name="status_hint_label_wifi_call" msgid="942993035689809853">"Wi-Fi કૉલ"</string>
- <string name="message_decode_error" msgid="1061856591500290887">"સંદેશ ડીકોડિંગ કરતી વખતે ભૂલ આવી હતી."</string>
+ <string name="message_decode_error" msgid="1061856591500290887">"મેસેજ ડિકોડિંગ કરતી વખતે ભૂલ આવી હતી."</string>
<string name="callFailed_cdma_activation" msgid="5392057031552253550">"એક SIM કાર્ડ એ તમારી સેવા સક્રિય કરી છે અને તમારા ફોનની રોમિંગ ક્ષમતાઓને અપડેટ કરી છે."</string>
<string name="callFailed_cdma_call_limit" msgid="1074219746093031412">"અહીં ઘણા બધા સક્રિય કૉલ્સ છે. કૃપા કરીને એક નવો કૉલ કરવા પહેલાં અસ્તિત્વમાંના કૉલ્સને સમાપ્ત કરો અથવા મર્જ કરો."</string>
<string name="callFailed_imei_not_accepted" msgid="7257903653685147251">"કનેક્ટ કરવામાં અસમર્થ, કૃપા કરીને એક માન્ય SIM કાર્ડ દાખલ કરો."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"કાઢી નાખી શકાય એવા ઇ-સિમ કાર્ડને ડિફૉલ્ટ તરીકે સેટ કરો"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"મોબાઇલ રેડિયો પાવર"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"\'સેવા ઉપલબ્ધ નથી\' મોડ સિમ્યુલેટ કરો (માત્ર ડિબગ બિલ્ડ માટે)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"ફોર્સ કેમ્પ સૅટલાઇટ LTE ચૅનલ (માત્ર ડિબગ માટે બનાવવામાં આવેલી)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"મૉક કૅરિઅર સૅટલાઇટ મોડ (માત્ર ડિબગ બિલ્ડ માટે)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"રિઅલ સૅટલાઇટ eSOS મોડનું પરિક્ષણ કરો (માત્ર ડિબગ બિલ્ડ માટે)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"રિઅલ સૅટલાઇટ નૉન-eSOS મોડનું પરિક્ષણ કરો (માત્ર ડિબગ બિલ્ડ માટે)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"ડેમો સૅટલાઇટ eSOS મોડનું પરીક્ષણ કરો (માત્ર ડિબગ બિલ્ડ માટે)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"સિમમાં સરનામા પુસ્તિકા જુઓ"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"ફિક્સ્ડ ડાયલિંગ નંબર જુઓ"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"સર્વિસ ડાયલિંગ નંબર જુઓ"</string>
@@ -895,7 +899,7 @@
<string name="radio_info_signal_strength_label" msgid="5545444702102543260">"સિગ્નલની પ્રબળતા:"</string>
<string name="radio_info_call_status_label" msgid="7693575431923095487">"વૉઇસ કૉલનું સ્ટેટસ:"</string>
<string name="radio_info_ppp_sent_label" msgid="6542208429356199695">"ડેટા મોકલ્યો:"</string>
- <string name="radio_info_message_waiting_label" msgid="1886549432566952078">"સંદેશ ઉપલબ્ધ છે:"</string>
+ <string name="radio_info_message_waiting_label" msgid="1886549432566952078">"મેસેજ ઉપલબ્ધ છે:"</string>
<string name="radio_info_phone_number_label" msgid="2533852539562512203">"ફોન નંબર:"</string>
<string name="radio_info_voice_network_type_label" msgid="2395347336419593265">"વૉઇસ નેટવર્ક પ્રકાર:"</string>
<string name="radio_info_data_network_type_label" msgid="8886597029237501929">"ડેટા નેટવર્કનો પ્રકાર:"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"અપડેટ કરો"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"રિફ્રેશ કરો"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"DNS તપાસ ટૉગલ કરો"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM-વિશિષ્ટ માહિતી/સેટિંગ"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC ઉપલબ્ધ (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR પ્રતિબંધિત (NSA):"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 800ded0..68fca48 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"कॉल सेटिंग"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"कॉल सेटिंग केवल व्यवस्थापक उपयोगकर्ता द्वारा ही बदली जा सकती हैं."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"फ़ोन की खाता सेटिंग, सिर्फ़ एडमिन या वर्क प्रोफ़ाइल के उपयोगकर्ता बदल सकते हैं."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"डिवाइस के मालिक ने मोबाइल नेटवर्क की सेटिंग बदलने की सुविधा पर पाबंदी लगा दी है."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"सेटिंग (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"कॉल सेटिंग गड़बड़ी"</string>
<string name="reading_settings" msgid="1605904432450871183">"सेटिंग पढ़ रहा है..."</string>
@@ -591,7 +592,7 @@
<string name="onscreenManageConferenceText" msgid="4700574060601755137">"कॉन्फ़्रेंस प्रबंधित करें"</string>
<string name="onscreenAudioText" msgid="7224226735052019986">"ऑडियो"</string>
<string name="onscreenVideoCallText" msgid="1743992456126258698">"वीडियो कॉल"</string>
- <string name="importSimEntry" msgid="3892354284082689894">"आयात करें"</string>
+ <string name="importSimEntry" msgid="3892354284082689894">"इंपोर्ट करें"</string>
<string name="importAllSimEntries" msgid="2628391505643564007">"सभी आयात करें"</string>
<string name="importingSimContacts" msgid="4995457122107888932">"सिम संपर्क आयात कर रहा है"</string>
<string name="importToFDNfromContacts" msgid="5068664870738407341">"संपर्कों से आयात करें"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"हटाए जा सकने वाले ई-सिम को डिफ़ॉल्ट के तौर पर सेट करें"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"मोबाइल रेडियो पावर"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"सिम्युलेट किया गया डिवाइस काम नहीं कर रहा है (सिर्फ़ डीबग के लिए बिल्ड)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"फ़ोर्स कैंप सैटलाइट एलटीई चैनल (सिर्फ़ डीबग के लिए बिल्ड)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी के सैटलाइट मोड की मॉक टेस्टिंग करें (सिर्फ़ डीबग के लिए बिल्ड)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"रीयल सैटलाइट इमरजेंसी एसओएस मोड को आज़माएं (सिर्फ़ डीबग के लिए बिल्ड)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"रीयल सैटलाइट नॉन इमरजेंसी एसओएस मोड को आज़माएं (सिर्फ़ डीबग के लिए बिल्ड)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"डेमो सैटलाइट इमरजेंसी एसओएस मोड को आज़माएं (सिर्फ़ डीबग के लिए बिल्ड)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"सिम में संपर्कों के पते की सूची देखें"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"फ़िक्स्ड डायलिंग नंबर देखें"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"सेवा के डायलिंग नंबर देखें"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"एसएमएससी:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"अपडेट करें"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"रीफ़्रेश करें"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"डीएनएस जांच टॉगल करें"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"ओईएम-खास जानकारी/सेटिंग"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC उपलब्ध है (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR प्रतिबंधित है (NSA):"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 2b8b9b6..c397d8e 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Postavke poziva"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Postavke poziva može mijenjati samo korisnik koji je administrator."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Postavke računa za telefon može mijenjati samo administrator ili poslovni korisnik."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Vlasnik uređaja ograničio je mogućnost promjene postavki mobilne mreže."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Postavke (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Pogreška postavki poziva"</string>
<string name="reading_settings" msgid="1605904432450871183">"Čitanje postavki..."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Postavljanje uklonjivog eSIM-a kao zadanog"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Snaga mobilnog radija"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simulacija stanja \"izvan upotrebe\" (samo međuverzija programa za otklanjanje pogrešaka)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Satelitski LTE kanal za Force Camp (samo međuverzija programa za otklanjanje pogrešaka)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Lažni način mobilnog operatera za slanje putem satelita (samo međuverzija programa za otklanjanje pogrešaka)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Testiranje eSOS načina pravog satelita (samo međuverzija programa za otklanjanje pogrešaka)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Testiranje načina pravog satelita bez eSOS-a (samo međuverzija programa za otklanjanje pogrešaka)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Testiranje pokazne verzije eSOS načina satelita (samo međuverzija programa za otklanjanje pogrešaka)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Prikaži imenik SIM-a"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Prikaži brojeve za fiksno biranje"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Prikaži brojeve za servisno biranje"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Ažuriraj"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Osvježi"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Uključi/isključi provjeru DNS-a"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Informacije/postavke koje se posebno odnose na OEM"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC dostupan (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"Ograničeni DCNR (NSA):"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index bfd7472..ea48ea6 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Hívásbeállítások"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"A hívásbeállításokat csak a rendszergazda módosíthatja."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"A telefon fiókbeállításait csak az adminisztrátor vagy munkahelyi felhasználó módosíthatja."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Az eszköz tulajdonosa korlátozta a mobilhálózati beállítások módosítását."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Beállítások (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Hiba a hívásbeállításokban"</string>
<string name="reading_settings" msgid="1605904432450871183">"Beállítások olvasása..."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Cserélhető eSIM beállítása alapértelmezettként"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Mobil rádióadó teljesítménye"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Szolgáltatáskiesés szimulációja (csak hibaelhárító build)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Force Camp Műholdas LTE-csatorna (csak hibaelhárító build)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Szimulált szolgáltató – Műholdas mód (csak hibaelhárító build)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"A valódi műholdas eSOS mód tesztelése (csak hibaelhárító build)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"A valódi műholdas, nem eSOS mód tesztelése (csak hibaelhárító build)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"A műholdas eSOS demó mód tesztelése (csak hibaelhárító build)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"SIM-kártya telefonkönyvének megtekintése"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Fix hívószámok megtekintése"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Szolgáltatásszámok megtekintése"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Frissítés"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Frissítés"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"DNS-ellenőrzés váltása"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM-specifikus adatok és beállítások:"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC rendelkezésre áll (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR korlátozva (NSA):"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index c8b1198..5764065 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Զանգի կարգավորումներ"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Զանգի կարգավորումները կարող է փոխել միայն ադմինիստրատոր հանդիսացող օգտատերը:"</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Հեռախոսի հաշվի կարգավորումները կարող է փոխել միայն ադմինիստրատորը կամ աշխատանքային հաշվի օգտատերը։"</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Սարքի սեփականատերը սահմանափակել է բջջային ցանցի կարգավորումները փոխելու հնարավորությունը։"</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Կարգավորումներ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Զանգի կարգավորումների սխալ"</string>
<string name="reading_settings" msgid="1605904432450871183">"Ընթերցման կարգավորումներ..."</string>
@@ -560,7 +561,7 @@
<string name="incall_error_wfc_only_no_wireless_network" msgid="5860742792811400109">"Զանգ կատարելու համար միացեք անլար ցանցին:"</string>
<string name="incall_error_promote_wfc" msgid="9164896813931363415">"Զանգ կատարելու համար միացրեք «Զանգեր Wi-Fi ցանցի միջոցով» գործառույթը:"</string>
<string name="incall_error_satellite_enabled" msgid="5247740814607087814">"Զանգ կատարելու համար նախ անջատեք արբանյակային կապը։"</string>
- <string name="incall_error_carrier_roaming_satellite_mode" msgid="678603203562886361">"Դուք կարող եք ուղարկել և ստանալ հաղորդագրություններ՝ առանց բջջային կամ Wi-Fi կապի։"</string>
+ <string name="incall_error_carrier_roaming_satellite_mode" msgid="678603203562886361">"Դուք կարող եք հաղորդագրություններ ուղարկել և ստանալ առանց բջջային կամ Wi-Fi կապի։"</string>
<string name="emergency_information_hint" msgid="9208897544917793012">"Անհետաձգելի բուժօգնության տվյալներ"</string>
<string name="emergency_information_owner_hint" msgid="6256909888049185316">"Սեփականատեր"</string>
<string name="emergency_information_confirm_hint" msgid="5109017615894918914">"Կրկին հպեք՝ տեղեկությունները դիտելու համար"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Սահմանել հեռացվելի eSIM քարտը որպես կանխադրված"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Բջջային ռադիոազդանշանի հզորությունը"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Սպասարկման գոտուց դուրս գտնվելու սիմուլյացիա (միայն վրիպազերծման կառուցում)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Force Camp արբանյակային LTE ալիք (միայն վրիպազերծման կառուցման մեջ)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Օպերատորի արբանյակի ռեժիմի սիմուլյացիա (միայն վրիպազերծման կառուցում)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Փորձարկել իրական արբանյակային eSOS ռեժիմը (միայն վրիպազերծման կառուցման մեջ)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Փորձարկել իրական արբանյակային ոչ eSOS ռեժիմը (միայն վրիպազերծման կառուցման մեջ)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Փորձարկել արբանյակային eSOS ռեժիմը դեմո տարբերակով (միայն վրիպազերծման կառուցման մեջ)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Դիտել SIM քարտի հասցեագիրքը"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Տեսնել ամրակցված հեռախոսահամարները"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Տեսնել ծառայությունների հեռախոսահամարները"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC`"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Թարմացնել"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Թարմացնել"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Փոխարկել DNS ստուգումը"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM-հատուկ տեղեկություններ/կարգավորումներ"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC հասանելի (NSA)՝"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR սահմանափակ (NSA)՝"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index e4cbd31..efb22b1 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Setelan panggilan"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Setelan panggilan telepon hanya dapat diubah oleh pengguna admin."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Setelan akun Telepon hanya dapat diubah admin atau pengguna untuk kerja."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Pemilik perangkat telah membatasi kemampuan untuk mengubah setelan jaringan seluler."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Setelan (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Kesalahan setelan panggilan"</string>
<string name="reading_settings" msgid="1605904432450871183">"Membaca setelan…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Tetapkan eSIM yang Dapat Dilepas sebagai Default"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Daya Radio Seluler"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simulasi Tidak dapat Digunakan (Khusus Build Debug)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Terapkan Saluran Satelit LTE (khusus Build Debug)."</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Mode Satelit Operator Tiruan (khusus Build Debug)."</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Uji mode eSOS satelit asli (khusus Build Debug)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Uji mode non-eSOS satelit asli (khusus Build Debug)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Uji mode eSOS satelit demo (khusus Build Debug)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Lihat Buku Alamat SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Lihat Panggilan Terbatas"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Lihat Nomor Panggilan Layanan"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Update"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Perbarui"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Aktifkan Pemeriksaan DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Info spesifik OEM/Setelan"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC Tersedia (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR Dibatasi (NSA):"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index bd13872..9724819 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Símtalsstillingar"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Aðeins stjórnandinn má breyta símtalsstillingum."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Aðeins stjórnandi eða vinnunotandi getur breytt reikningsstillingum símans."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Eigandi tækisins takmarkaði getu til að breyta stillingum farsímakerfis."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Stillingar (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Villa í símtalsstillingum"</string>
<string name="reading_settings" msgid="1605904432450871183">"Les stillingar…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Stilla laust eSIM sem sjálfgefið"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Loftnetsstyrkur farsíma"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Líkja eftir „Utan þjónustusvæðis“ (aðeins villuleitarsmíði)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Þvinga Camp Satellite LTE-rás (aðeins villuleitarsmíði)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Eftirlíking af gervihnattarstillingu símafyrirtækis (aðeins villuleitarsmíði)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Prófa eSOS-stillingu raunverulegs gervihnattar (eingöngu villuleitarsmíð)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Prófa af-eSOS-stillingu raunverulegs gervihnattar (eingöngu villuleitarsmíð)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Prófa prufuútgáfu af eSOS-stillingu gervihnattar (eingöngu villuleitarsmíð)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Skoða símaskrá SIM-korts"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Skoða læst númeraval"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Skoða þjónustunúmer"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Uppfæra"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Endurnýja"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Kveikja/slökkva á DNS-prófun"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Upplýsingar/stillingar framleiðanda"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC tiltækt (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR takmarkað (NSA):"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 8a70695..9bbe00c 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Impostazioni chiamate"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Le impostazioni delle chiamate possono essere modificate solo dall\'utente amministratore."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Le impostazioni dell\'account del telefono possono essere modificate solo dall\'amministratore o dall\'utente di lavoro."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Il proprietario del dispositivo ha limitato la possibilità di modificare le impostazioni della rete mobile."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Impostazioni (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Errore durante aggiornam. impostaz. chiamate"</string>
<string name="reading_settings" msgid="1605904432450871183">"Lettura impostazioni..."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Imposta la eSIM rimovibile come predefinita"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Potenza del segnale radio mobile"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simulazione non disponibile (solo build di debug)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Forza canale LTE satellitare del campo (solo build di debug)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Modalità satellite operatore fittizio (solo build di debug)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Testa la modalità eSOS con satellite reale (solo build di debug)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Testa la modalità non-eSOS con satellite reale (solo build di debug)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Prova la demo della modalità eSOS con satellite (solo build di debug)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Visualizza rubrica SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Visualizza numeri consentiti"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Visualizza numeri dell\'elenco dei numeri di servizio"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Aggiorna"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Aggiorna"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Attiva o disattiva verifica DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Info/impostazioni specifiche OEM"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC disponibile (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR con limitazioni (NSA):"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 0c3e818..5e8999f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"הגדרות שיחה"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"רק מנהל המערכת יכול לשנות הגדרות שיחה."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"אפשר לשנות את הגדרות החשבון בטלפון רק מהחשבון של האדמין או של העבודה."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"אי אפשר לשנות את הגדרות הרשת הסלולרית בגלל מגבלות שהוגדרו על ידי בעלי המכשיר."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"הגדרות (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"שגיאה בהגדרות שיחה"</string>
<string name="reading_settings" msgid="1605904432450871183">"קריאת ההגדרות מתבצעת…"</string>
@@ -845,8 +846,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"הגדרת eSIM נשלף כברירת המחדל"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"הפעלה של רדיו סלולרי"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"סימולציה של המצב \'לא בשירות\' (גרסת build לניפוי באגים בלבד)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"ערוץ Force Camp Satellite LTE (רק גרסת build לניפוי באגים)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"מצב שמדמה תקשורת לוויינית דרך ספק הסלולר (גרסת build לניפוי באגים בלבד)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"מצב בדיקה שמדמה תקשורת לוויינית eSOS (גרסת build לניפוי באגים בלבד)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"מצב בדיקה שמדמה תקשורת לוויינית לא במצב eSOS (גרסת build לניפוי באגים בלבד)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"מצב בדיקה שמדמה תקשורת לוויינית eSOS (גרסת build לניפוי באגים בלבד)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"הצגת פנקס כתובות של SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"הצגת מספרי חיוג קבועים"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"מספרי חיוג לשירות"</string>
@@ -913,7 +917,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"עדכון"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"רענון"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"החלפת מצב של בדיקת DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"מידע/הגדרות ספציפיים ל-OEM"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"זמין ל-EN-DC (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"מוגבל על ידי DCNR (NSA):"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 941413a..ddbec3a 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"通話設定"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"通話設定は管理者ユーザーのみが変更できます。"</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"モバイル デバイスのアカウント設定を変更できるのは、管理者または従業員ユーザーのみに限られています。"</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"デバイス所有者によって、モバイル ネットワークの設定を変更する機能が制限されています。"</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"設定(<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"通話設定エラー"</string>
<string name="reading_settings" msgid="1605904432450871183">"設定を読み取り中..."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"リムーバブル eSIM をデフォルトに設定"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"モバイル無線電力"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"圏外状態のシミュレート(デバッグビルドのみ)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Force Camp Satellite LTE チャンネル(デバッグビルドのみ)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"携帯通信会社の疑似航空写真モード(デバッグビルドのみ)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"実際に衛星経由の緊急 SOS モードをテストする(デバッグビルドのみ)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"実際に衛星経由の非緊急 SOS モードをテストする(デバッグビルドのみ)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"デモ用の衛星による緊急 SOS モードをテストする(デバッグビルドのみ)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"SIM のアドレス帳を表示"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"発信番号制限を表示"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"サービス電話番号を表示"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"更新"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"更新"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"DNS チェックを切り替え"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM 固有の情報 / 設定"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC 利用可能(NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR 制限あり(NSA):"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 9d89e60..31c7e08 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"ზარის პარამეტრები"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"ზარის პარამეტრების შეცვლა მხოლოდ მომხმარებელ-ადმინისტრატორს შეუძლია."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"ტელ. ანგარიშის პარამეტრების შეცვლა შეუძლია მხოლოდ ადმინს/სამსახურის მომხმარებელს."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"მოწყობილობის მფლობელმა შეზღუდა მობილური ქსელის პარამეტრების შეცვლის შესაძლებლობა."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"პარამეტრები (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"ზარის პარამეტრების შეცდომა"</string>
<string name="reading_settings" msgid="1605904432450871183">"პარამეტრების წაკითხვა…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"მოსახსნელი eSIM-ის ნაგულისხმევად დაყენება"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"მობილური რადიოკავშირის ელკვება"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"სიმულაცია სერვისის გარეშე (მხოლოდ გამართვის აგება)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Camp Satellite LTE არხის ფორსირება (მხოლოდ გამართვის მიზნით)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"სიმულაციური ოპერატორის სატელიტის რეჟიმი (მხოლოდ გამართვის აგება)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"სატელიტური eSOS-ის რეალური რეჟიმის ტესტირება (მხოლოდ გამართვის მიზნით)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"სატელიტური eSOS-ის რეალური რეჟიმის ტესტირება (მხოლოდ გამართვის მიზნით)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"სატელიტური eSOS-ის დემო-ვერსიის ტესტირება (მხოლოდ გამართვის მიზნით)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"SIM-ის მისამართების წიგნის ნახვა"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"დაშვებული ნომრების ნახვა"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"სერვისის დარეკილი ნომრების ნახვა"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"განახლება"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"განახლება"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"DNS შემოწმების გადართვა"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"ინფორმაცია/პარამეტრები სპეციალურად OEM-ისთვის"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC ხელმისაწვდომია (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR შეზღუდულია (NSA):"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index c6c01e0..6e51a49 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Қоңырау параметрлері"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Қоңырау параметрлерін тек әкімші пайдаланушы өзгерте алады."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Телефонның аккаунт параметрлерін тек әкімші немесе жұмыстағы пайдаланушы өзгерте алады."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Құрылғының иесі мобильдік желі параметрлерін өзгертуге шектеу қойды."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Параметрлер (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Қоңырау параметрлерінің қателігі"</string>
<string name="reading_settings" msgid="1605904432450871183">"Параметрлерді оқуда…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Алынбалы eSIM әдепкі етіп орнату"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Радиосигнал күші"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"\"Істен шыққан\" қызметін симуляциялау (түзету құрамасы ғана)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Жерсеріктік LTE каналын мәжбүрлеп қолдану (тек түзету конструкциясы)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Mock Carrier жер серігі режимі (тек түзету құрамасы)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Шынайы жерсеріктегі құтқару қызметін шақыру режимін сынау (тек түзету құрамасы)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Шынайы жерсерікті құтқару қызметін шақыру режимінен басқа режимде сынау (тек түзету құрамасы)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Демо жерсеріктегі құтқару қызметін шақыру режимін сынау (тек түзету құрамасы)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"SIM мекенжай кітапшасын көру"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Рұқсат нөмірлерді көру"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Қызметтік теру нөмірлерін көру"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Жаңарту"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Жаңарту"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"DNS тексерісін қосу/өшіру"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Өндірушіге қатысты ақпарат/параметрлер"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC қолжетімді (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR шектеулі (NSA):"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 31ccb6d..a6f712d 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"កំណត់ការហៅ"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"ការកំណត់ការហៅអាចផ្លាស់ប្តូរបានដោយអ្នកប្រើដែលមានសិទ្ធិគ្រប់គ្រងតែប៉ុណ្ណោះ។"</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"មានតែអ្នកគ្រប់គ្រង ឬអ្នកប្រើប្រាស់ពាក់ព័ន្ធនឹងការងារប៉ុណ្ណោះ ទើបអាចផ្លាស់ប្ដូរការកំណត់គណនីទូរសព្ទបាន។"</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"ម្ចាស់ឧបករណ៍បានរឹតបន្តឹងលទ្ធភាពក្នុងការប្ដូរការកំណត់បណ្ដាញទូរសព្ទចល័ត។"</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"ការកំណត់ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"បញ្ហាការកំណត់ការហៅ"</string>
<string name="reading_settings" msgid="1605904432450871183">"កំពុងអានការកំណត់…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"កំណត់ eSIM ដែលអាចដកបានជាលំនាំដើម"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"ថាមពលវិទ្យុទូរសព្ទចល័ត"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"ត្រាប់តាមពេលគ្មានសេវា (កំណែបង្កើតសម្រាប់ជួសជុលតែប៉ុណ្ណោះ)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Force Camp Satellite LTE Channel (តែកំណែបង្កើតសម្រាប់ជួសជុលប៉ុណ្ណោះ)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"មុខងារផ្កាយរណបក្រុមហ៊ុនសេវាទូរសព្ទសាកល្បង (កំណែបង្កើតសម្រាប់ជួសជុលតែប៉ុណ្ណោះ)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"មុខងារធ្វើតេស្ត eSOS ផ្កាយរណបជាក់ស្ដែង (កំណែបង្កើតសម្រាប់ជួសជុលតែប៉ុណ្ណោះ)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"មុខងារធ្វើតេស្តដែលមិនមែនជា eSOS ផ្កាយរណបជាក់ស្ដែង (កំណែបង្កើតសម្រាប់ជួសជុលតែប៉ុណ្ណោះ)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"មុខងារធ្វើតេស្ត eSOS ផ្កាយរណបសាកល្បង (កំណែបង្កើតសម្រាប់ជួសជុលតែប៉ុណ្ណោះ)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"មើលសៀវភៅអាសយដ្ឋានក្នុងស៊ីមកាត"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"មើលលេខហៅថេរ"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"មើលលេខហៅសេវាកម្ម"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC ៖"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"ធ្វើបច្ចុប្បន្នភាព"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"ផ្ទុកឡើងវិញ"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"បិទ/បើកការពិនិត្យ DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"ការកំណត់/ព័ត៌មានជាក់លាក់ OEM"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"អាចប្រើ EN-DC បាន (NSA)៖"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"បានដាក់កំហិត DCNR (NSA)៖"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index b77b225..9ef2be9 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"ಕರೆ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"ಕರೆ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಕೇವಲ ನಿರ್ವಾಹಕ ಬಳಕೆದಾರರು ಮಾತ್ರ ಬದಲಾಯಿಸಬಹುದು."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"ಫೋನ್ ಖಾತೆಯ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ನಿರ್ವಾಹಕರು ಅಥವಾ ಕೆಲಸದ ಬಳಕೆದಾರರಿಂದ ಮಾತ್ರ ಬದಲಾಯಿಸಬಹುದಾಗಿದೆ."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"ಸಾಧನದ ಮಾಲೀಕರು ಮೊಬೈಲ್ ನೆಟ್ವರ್ಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಬದಲಾಯಿಸುವ ಸಾಮರ್ಥ್ಯವನ್ನು ನಿರ್ಬಂಧಿಸಿದ್ದಾರೆ."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"ಸೆಟ್ಟಿಂಗ್ಗಳು (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"ಕರೆ ಸೆಟ್ಟಿಂಗ್ಗಳ ದೋಷ"</string>
<string name="reading_settings" msgid="1605904432450871183">"ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಓದಲಾಗುತ್ತಿದೆ…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"ತೆಗೆದುಹಾಕಬಹುದಾದ eSIM ಅನ್ನು ಡೀಫಾಲ್ಟ್ ಆಗಿ ಸೆಟ್ ಮಾಡಿ"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"ಮೊಬೈಲ್ ರೇಡಿಯೋ ಪವರ್"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"ಸೇವೆಯಲ್ಲಿಲ್ಲದಿರುವುದನ್ನು ಸಿಮ್ಯುಲೇಟ್ ಮಾಡುವುದು (ಡೀಬಗ್ ಬಿಲ್ಡ್ ಮಾತ್ರ)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"ಫೋರ್ಸ್ ಕ್ಯಾಂಪ್ ಸ್ಯಾಟಲೈಟ್ LTE ಚಾನಲ್ (ಡೀಬಗ್ ಬಿಲ್ಡ್ ಮಾತ್ರ)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Mock Carrier ಉಪಗ್ರಹ ಮೋಡ್ (ಡೀಬಗ್ ಬಿಲ್ಡ್ ಮಾತ್ರ)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"ನೈಜ ಸ್ಯಾಟಲೈಟ್ eSOS ಮೋಡ್ ಅನ್ನು ಪರೀಕ್ಷಿಸಿ (ಡೀಬಗ್ ಬಿಲ್ಡ್ ಮಾತ್ರ)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"ರಿಯಲ್ ಸ್ಯಾಟಲೈಟ್ ನಾನ್-eSOS ಮೋಡ್ (ಡೀಬಗ್ ಬಿಲ್ಡ್ ಮಾತ್ರ) ಅನ್ನು ಟೆಸ್ಟ್ ಮಾಡಿ"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"ಸ್ಯಾಟಲೈಟ್ eSOS ಮೋಡ್ ಅನ್ನು ಟೆಸ್ಟ್ ಡೆಮೋ ನೀಡಿ (ಡೀಬಗ್ ಬಿಲ್ಡ್ ಮಾತ್ರ)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"ಸಿಮ್ ವಿಳಾಸ ಪುಸ್ತಕವನ್ನು ವೀಕ್ಷಿಸಿ"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"ಸ್ಥಿರ ಡಯಲಿಂಗ್ ಸಂಖ್ಯೆಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"ಸೇವಾ ಡಯಲಿಂಗ್ ಸಂಖ್ಯೆಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"ಅಪ್ಡೇಟ್ ಮಾಡಿ"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"ರಿಫ್ರೆಶ್ ಮಾಡಿ"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"DNS ಪರಿಶೀಲನೆ ಟಾಗಲ್ ಮಾಡಿ"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM-ನಿರ್ದಿಷ್ಟ ಮಾಹಿತಿ/ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC ಲಭ್ಯವಿದೆ (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR ನಿರ್ಬಂಧಿತ (NSA):"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index cd705f4..8e345f2 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"통화 설정"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"관리자만 통화 설정을 변경할 수 있습니다."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"전화 계정 설정은 관리자 또는 직장 사용자만 변경할 수 있습니다."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"기기 소유자가 모바일 네트워크 설정 변경 기능을 제한했습니다."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"설정(<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"통화 설정 오류"</string>
<string name="reading_settings" msgid="1605904432450871183">"설정을 읽는 중..."</string>
@@ -305,7 +306,7 @@
<string name="keywords_carrier_settings_euicc" msgid="8540160967922063745">"이동통신사, esim, sim, euicc, 이동통신사 전환, 이동통신사 추가"</string>
<string name="carrier_settings_euicc_summary" msgid="2027941166597330117">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> — <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
<string name="mobile_data_settings_title" msgid="7228249980933944101">"모바일 데이터"</string>
- <string name="mobile_data_settings_summary" msgid="5012570152029118471">"모바일 네트워크를 사용하여 데이터 액세스"</string>
+ <string name="mobile_data_settings_summary" msgid="5012570152029118471">"모바일 네트워크를 사용하여 데이터에 액세스합니다."</string>
<string name="data_usage_disable_mobile" msgid="5669109209055988308">"모바일 데이터를 사용 중지하시겠습니까?"</string>
<string name="sim_selection_required_pref" msgid="6985901872978341314">"선택 필요"</string>
<string name="sim_change_data_title" msgid="9142726786345906606">"데이터 SIM을 변경하시겠습니까?"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"삭제 가능한 eSIM을 기본으로 설정"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"모바일 무선 전력"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"\'서비스 지역 벗어남\' 시뮬레이션(디버그 빌드만 해당)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"캠프 위성 LTE 채널 강제(디버그 빌드만 해당)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"모의 이동통신사 위성 모드(디버그 빌드만 해당)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"실제 위성 eSOS 모드 테스트(디버그 빌드만 해당)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"실제 위성 비eSOS 모드 테스트(디버그 빌드만 해당)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"데모 위성 eSOS 모드 테스트(디버그 빌드만 해당)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"SIM 주소록 보기"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"발신 허용 번호 보기"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"SDN(Service Dialing Numbers) 보기"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"업데이트"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"새로고침"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"DNS 확인 전환"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM별 정보/설정"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC 사용 가능(NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR 제한됨(NSA):"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 32ffc65..a7054f9 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Чалуу параметрлери"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Чалуу параметрлерин администратор гана өзгөртө алат."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Телефондогу аккаунттун параметрлерин администратор же жумуштагы колдонуучу гана өзгөртө алат."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Түзмөктүн ээси мобилдик тармактын параметрлерин өзгөртүүгө тыюу салды."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Параметрлер (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Чалуу жөндөөлөрүндө ката кетти"</string>
<string name="reading_settings" msgid="1605904432450871183">"Параметрлер окулууда…"</string>
@@ -524,7 +525,7 @@
<string name="card_title_dialing" msgid="8742182654254431781">"Терилүүдө"</string>
<string name="card_title_redialing" msgid="18130232613559964">"Кайра терүү"</string>
<string name="card_title_conf_call" msgid="901197309274457427">"Конференц-чалуу"</string>
- <string name="card_title_incoming_call" msgid="881424648458792430">"Кирүүчү чалуу"</string>
+ <string name="card_title_incoming_call" msgid="881424648458792430">"Чалып жатат"</string>
<string name="card_title_call_ended" msgid="650223980095026340">"Чалуу аяктады"</string>
<string name="card_title_on_hold" msgid="9028319436626975207">"Күтүлүүдө"</string>
<string name="card_title_hanging_up" msgid="814874106866647871">"Телефон коюлууда"</string>
@@ -538,7 +539,7 @@
<string name="incall_error_power_off" product="watch" msgid="7191184639454113633">"Мобилдик тармакты күйгүзүңүз, чалуу үчүн \"Учакта\" режимин же \"Батареяны үнөмдөө\" режимин өчүрүңүз."</string>
<string name="incall_error_power_off" product="default" msgid="8131672264311208673">"Чалуу үчүн учак режимин өчүрүңүз."</string>
<string name="incall_error_power_off_wfc" msgid="9125661184694727052">"Чалуу үчүн учак режимин өчүрүңүз же зымсыз тармакка туташыңыз."</string>
- <string name="incall_error_power_off_thermal" product="default" msgid="8695809601655300168"><b>"Телефон ысып кетти"</b>\n\n"Бул чалуу аяктабай жатат. Телефон муздагандан кийин кайра аракет кылыңыз.\n\nШашылыш чалууларды аткара берсеңиз болот."</string>
+ <string name="incall_error_power_off_thermal" product="default" msgid="8695809601655300168"><b>"Телефон ысып кетти"</b>\n\n"Бул чалуу аяктабай жатат. Телефон муздагандан кийин кайталап көрүңүз.\n\nШашылыш чалууларды аткара берсеңиз болот."</string>
<string name="incall_error_ecm_emergency_only" msgid="5622379058883722080">"Кадимки шартта чалуу үчүн шашылыш кайра чалуу режиминен чыгыңыз."</string>
<string name="incall_error_emergency_only" msgid="8786127461027964653">"Тармакта катталган эмес."</string>
<string name="incall_error_out_of_service" msgid="1927265196942672791">"Мобилдик тармак жок."</string>
@@ -772,19 +773,19 @@
<string name="sum_call_barring_enabled" msgid="5184331188926370824">"Күйүк"</string>
<string name="sum_call_barring_disabled" msgid="5699448000600153096">"Өчүк"</string>
<string name="call_barring_baoc" msgid="7400892586336429326">"Чыгуучу чалуулардын баары"</string>
- <string name="call_barring_baoc_enabled" msgid="3131509193386668182">"Чыгуучу чалуулардын баарын бөгөттөө функциясы өчүрүлсүнбү?"</string>
+ <string name="call_barring_baoc_enabled" msgid="3131509193386668182">"Чыгуучу чалуулардын баарын бөгөттөө функциясын өчүрөсүзбү?"</string>
<string name="call_barring_baoc_disabled" msgid="8534224684091141509">"Чыгуучу чалуулардын баары бөгөттөлсүнбү?"</string>
<string name="call_barring_baoic" msgid="8668125428666851665">"Эл аралык чыгуучу чалуу"</string>
- <string name="call_barring_baoic_enabled" msgid="1203758092657630123">"Эл аралык чыгуучу чалууларды бөгөттөө функциясы өчүрүлсүнбү?"</string>
+ <string name="call_barring_baoic_enabled" msgid="1203758092657630123">"Эл аралык чыгуучу чалууларды бөгөттөө функциясын өчүрөсүзбү?"</string>
<string name="call_barring_baoic_disabled" msgid="5656889339002997449">"Эл аралык чыгуучу чалуулар бөгөттөлсүнбү?"</string>
<string name="call_barring_baoicr" msgid="8566167764432343487">"Роумингдеги эл аралык чыгуучу чалуулар"</string>
- <string name="call_barring_baoicr_enabled" msgid="1615324165512798478">"Роумингдеги эларалык чыгуучу чалууларды бөгөттөө функциясы өчүрүлсүнбү?"</string>
+ <string name="call_barring_baoicr_enabled" msgid="1615324165512798478">"Роумингдеги эларалык чыгуучу чалууларды бөгөттөө функциясын өчүрөсүзбү?"</string>
<string name="call_barring_baoicr_disabled" msgid="172010175248142831">"Роумингдеги эларалык чыгуучу чалуулар бөгөттөлсүнбү?"</string>
<string name="call_barring_baic" msgid="7941393541678658566">"Кирүүчү чалуулардын баары"</string>
- <string name="call_barring_baic_enabled" msgid="4357332358020337470">"Кирүүчү чалуулардын баарын бөгөттөө функциясы өчүрүлсүнбү?"</string>
+ <string name="call_barring_baic_enabled" msgid="4357332358020337470">"Кирүүчү чалуулардын баарын бөгөттөө функциясын өчүрөсүзбү?"</string>
<string name="call_barring_baic_disabled" msgid="2355945245938240958">"Кирүүчү чалуулардын баары бөгөттөлсүнбү?"</string>
<string name="call_barring_baicr" msgid="8712249337313034226">"Роумингдеги эл аралык кирүүчү чалуу"</string>
- <string name="call_barring_baicr_enabled" msgid="64774270234828175">"Роумингдеги эл аралык кирүүчү чалууларды бөгөттөө функциясы өчүрүлсүнбү?"</string>
+ <string name="call_barring_baicr_enabled" msgid="64774270234828175">"Роумингдеги эл аралык кирүүчү чалууларды бөгөттөө функциясын өчүрөсүзбү?"</string>
<string name="call_barring_baicr_disabled" msgid="3488129262744027262">"Роумингдеги эл аралык кирүүчү чалуу бөгөттөлсүнбү?"</string>
<string name="call_barring_deactivate_all" msgid="7837931580047157328">"Баары өчүрүлсүн"</string>
<string name="call_barring_deactivate_all_description" msgid="4474119585042121604">"Чалууларга тыюу салуу функциясынын параметрлерин өчүрүү"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Чыгарылуучу eSIM-картаны демейки катары коюу"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Мобилдик радионун кубаты"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Тейлөө аймагынын сыртында режимин иштетүү (Мүчүлүштүктөрдү оңдоо үчүн гана)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Спутник LTE каналын иштетүү (Мүчүлүштүктөрдү оңдоо үчүн гана)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Симуляцияланган байланыш операторунун спутниги (Мүчүлүштүктөрдү оңдоо үчүн гана)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Чыныгы спутник eSOS режимин сыноо (Мүчүлүштүктөрдү оңдоо үчүн гана)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"eSOS болбогон чыныгы спутник режимин сыноо (Мүчүлүштүктөрдү оңдоо үчүн гана)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Демо спутник eSOS режимин сыноо (Мүчүлүштүктөрдү оңдоо үчүн гана)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"SIM картадагы дарек китепчесин көрүү"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Туруктуу терүү номерлерин көрүү"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Кызматтык терүү номерлерин көрүү"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Жаңыртуу"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Жаңылоо"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"DNS текшерүүнү которуштуруу"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM\'ге тиешелүү Маалымат/Параметрлер"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC жеткиликтүү (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR чектелген (NSA):"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index ae3767d..b823c54 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"ການຕັ້ງຄ່າການໂທ"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"ມີແຕ່ຜູ້ໃຊ້ທີ່ເປັນຜູ້ດູແລລະບົບເທົ່ານັ້ນທີ່ສາມາດປ່ຽນການຕັ້ງຄ່າການໂທໄດ້."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"ສະເພາະຜູ້ເບິ່ງແຍງລະບົບ ຫຼື ຜູ້ໃຊ້ຢູ່ບ່ອນເຮັດວຽກເທົ່ານັ້ນທີ່ສາມາດປ່ຽນການຕັ້ງຄ່າບັນຊີຂອງໂທລະສັບໄດ້."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"ເຈົ້າຂອງອຸປະກອນໄດ້ຈຳກັດຄວາມສາມາດໃນການປ່ຽນການຕັ້ງຄ່າເຄືອຂ່າຍມືຖື."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"ການຕັ້ງຄ່າ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"ການຕັ້ງຄ່າການໂທຜິດພາດ"</string>
<string name="reading_settings" msgid="1605904432450871183">"ກຳລັງອ່ານການຕັ້ງຄ່າ..."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"ຕັ້ງຄ່າ eSIM ແບບຖອດໄດ້ໃຫ້ເປັນຄ່າເລີ່ມຕົ້ນ"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"ພະລັງງານວິທະຍຸມືຖື"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"ຈໍາລອງເຫດການບໍ່ພ້ອມໃຫ້ບໍລິການ (ສໍາລັບ Build ດີບັກເທົ່ານັ້ນ)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"ບັງຄັບໃຫ້ໃຊ້ຊ່ອງສັນຍານດາວທຽມ LTE ຂອງຄ້າຍ (ສຳລັບ Build ດີບັກເທົ່ານັ້ນ)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"ຈຳລອງໂໝດດາວທຽມຂອງຜູ້ໃຫ້ບໍລິການ (ສຳລັບ Build ດີບັກເທົ່ານັ້ນ)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"ທົດສອບໂໝດ eSOS ດາວທຽມແທ້ (ສຳລັບ Build ດີບັກເທົ່ານັ້ນ)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"ທົດສອບໂໝດດາວທຽມແທ້ທີ່ບໍ່ແມ່ນ eSOS (ສຳລັບ Build ດີບັກເທົ່ານັ້ນ)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"ທົດສອບໂໝດ eSOS ຂອງດາວທຽມເດໂມ (ສຳລັບ Build ດີບັກເທົ່ານັ້ນ)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"ເບິ່ງສະໝຸດທີ່ຢູ່ໃນຊິມ"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"ເບິ່ງໝາຍເລກໂທອອກທີ່ກຳນົດ"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"ເບິ່ງໝາຍເລກບໍລິການໂທອອກ"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"ອັບເດດ"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"ໂຫຼດຂໍ້ມູນໃໝ່"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"ເປີດ/ປິດ ການກວດ DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"ຂໍ້ມູນ/ການຕັ້ງຄ່າສະເພາະ OEM"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"ສາມາດໃຊ້ EN-DC ໄດ້ (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"ຈຳກັດ DCNR (NSA):"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 7ad3e77..f2bc95b 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Skambinimo nustatymai"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Skambučių nustatymus gali keisti tik administruojantis naudotojas."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Telefono paskyros nustatymus gali keisti tik administratorius arba darbo paskyros naudotojas."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Įrenginio savininkas apribojo galimybę keisti mobiliojo ryšio tinklo nustatymus."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Nustatymai (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Skambinimo nustatymų klaida"</string>
<string name="reading_settings" msgid="1605904432450871183">"Analizuojami nustatymai..."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Nustatyti pašalinimą „eSIM“ kaip numatytąją"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Mobiliojo ryšio radijo signalas"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Modeliavimas neteikiamas (tik derinimo versija)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Priverstinis stovyklos palydovinio ryšio LTE kanalo vykdymas (tik derinimo versija)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Netikras operatoriaus satelito režimas (tik derinimo versija)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Išbandykite tikrą Pagalbos iškvietimo kritiniu atveju naudojant palydovinį ryšį režimą (tik derinimo versija)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Išbandykite tikrą Pagalbos iškvietimo ne kritiniu atveju naudojant palydovinį ryšį režimą (tik derinimo versija)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Išbandykite demonstracinę Pagalbos iškvietimo kritiniu atveju naudojant palydovinį ryšį versiją (tik derinimo versija)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Žiūrėti SIM kortelės adresų knygą"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Žiūrėti fiksuotojo rinkimo numerius"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Žiūrėti paslaugos renkamus numerius"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Atnaujinti"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Atnaujinti"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Kaitalioti DNS tikrinimą"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM būdinga informacija / nustatymai"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"Pasiekiama EN-DC (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR apribota (NSA):"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 62ae78f..339ea82 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Zvanu iestatījumi"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Tikai lietotājs ar administratora tiesībām var mainīt zvanu iestatījumus."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Tikai administrators vai primārais lietotājs var mainīt tālruņa konta iestatījumus."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Ierīces īpašnieks ir ierobežojis iespēju mainīt mobilā tīkla iestatījumus."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Iestatījumi (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Zvanu iestatījumu kļūda"</string>
<string name="reading_settings" msgid="1605904432450871183">"Notiek iestatījumu lasīšana..."</string>
@@ -843,9 +844,12 @@
<string name="dsds_dialog_cancel" msgid="3245958947099586655">"Atcelt"</string>
<string name="removable_esim_string" msgid="7931369811671787649">"Iestatīt noņemamu eSIM kā noklusējumu"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Mobilā tālruņa radio signāla stiprums"</string>
- <string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simulācijas ierīce nedarbojas (tikai būvējuma atkļūdošana)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simulācijas ierīce nedarbojas (tikai atkļūdošanas būvējums)"</string>
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"LTE satelīta kanāla piespiedu izmantošana (tikai atkļūdošanas būvējums)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Mobilo sakaru operatora satelīta režīma imitēšana (tikai atkļūdošanas būvējums)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Izmēģināt īsta satelīta eSOS režīmu (tikai atkļūdošanas būvējumā)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Izmēģināt īsta satelīta režīmu, kas nav eSOS režīms (tikai atkļūdošanas būvējumā)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Izmēģināt demonstrācijas satelīta eSOS režīmu (tikai atkļūdošanas būvējumā)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Skatīt SIM adrešu grāmatu"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Skatīt ierobežotā zvanu saraksta numurus"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Pakalpojuma iezvanes numuru skatīšana"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Atjaunināt"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Atsvaidzināt"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Pārslēgt DNS pārbaudi"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OAR raksturīga informācija/iestatījumi"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC pieejamība (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR ierobežojums (NSA):"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 1ed6d0a..7eef5ee 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Поставки за повици"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Поставките за повик може да ги измени само администраторскиот корисник."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Поставките за сметката на телефонот може да ги промени само администраторот или деловниот корисник."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Сопственикот на уредот ја ограничил можноста за менување на поставките за мобилната мрежа."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Поставки (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Грешка со поставки на повици"</string>
<string name="reading_settings" msgid="1605904432450871183">"Се читаат поставките..."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Поставување eSIM што може да се отстрани како стандардна"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Радио-напојување на мобилен"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Симулирање „Надвор од употреба“ (само за верзиите за отстранување грешки)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Force Camp Satellite LTE Channel (само верзија за отстранување грешки)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Симулација на режим на сателит за оператор (само за верзиите за отстранување грешки)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Тестирајте го реалниот режим на eSOS (само во верзијата за отстранување грешки)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Тестирајте го реалниот режим што не е на eSOS (само во верзијата за отстранување грешки)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Тестирајте го демо-режимот на eSOS (само во верзијата за отстранување грешки)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Прикажи именик на SIM-картичката"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Прикажи броеви со ограничено бирање"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Прикажи броеви за бирање служби"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Ажурирање"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Освежи"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Префрли на DNS-проверка"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Информации/Поставки карактеристични за ОЕМ"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"Достапно за EN-DC (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"Ограничено на DCNR (NSA):"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 32b93bb..8fd0e8e 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"കോൾ ക്രമീകരണങ്ങൾ"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"അഡ്മിൻ ഉപയോക്താവിന് മാത്രമേ കോൾ ക്രമീകരണം മാറ്റാൻ കഴിയൂ."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"അഡ്മിനോ ഔദ്യോഗിക ഉപയോക്താവിനോ മാത്രമേ ഫോൺ അക്കൗണ്ട് ക്രമീകരണം മാറ്റാനാകൂ."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"ഉപകരണത്തിന്റെ ഉടമ, മൊബൈൽ നെറ്റ്വർക്ക് ക്രമീകരണം മാറ്റാനുള്ള ശേഷി നിയന്ത്രിച്ചിരിക്കുന്നു."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"ക്രമീകരണം (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"കോൾ ക്രമീകരണ പിശക്"</string>
<string name="reading_settings" msgid="1605904432450871183">"ക്രമീകരണങ്ങൾ റീഡ് ചെയ്യുന്നു.…"</string>
@@ -535,7 +536,7 @@
<string name="notification_voicemail_no_vm_number" msgid="3423686009815186750">"വോയ്സ്മെയിൽ നമ്പർ അജ്ഞാതമാണ്"</string>
<string name="notification_network_selection_title" msgid="255595526707809121">"സേവനമില്ല"</string>
<string name="notification_network_selection_text" msgid="553288408722427659">"തിരഞ്ഞെടുത്ത നെറ്റ്വർക്ക് (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) ലഭ്യമല്ല"</string>
- <string name="incall_error_power_off" product="watch" msgid="7191184639454113633">"ഒരു കോൾ വിളിക്കാൻ മൊബൈൽ നെറ്റ്വർക്ക് ഓണാക്കുകയോ ഫ്ലൈറ്റ് മോഡ് അല്ലെങ്കിൽ ബാറ്ററി ലാഭിക്കൽ മോഡ് ഓഫാക്കുകയോ ചെയ്യുക."</string>
+ <string name="incall_error_power_off" product="watch" msgid="7191184639454113633">"ഒരു കോൾ വിളിക്കാൻ മൊബൈൽ നെറ്റ്വർക്ക് ഓണാക്കുകയോ ഫ്ലൈറ്റ് മോഡ് അല്ലെങ്കിൽ ബാറ്ററി സേവർ മോഡ് ഓഫാക്കുകയോ ചെയ്യുക."</string>
<string name="incall_error_power_off" product="default" msgid="8131672264311208673">"ഒരു കോൾ വിളിക്കാൻ വിമാന മോഡ് ഓഫാക്കുക."</string>
<string name="incall_error_power_off_wfc" msgid="9125661184694727052">"ഒരു കോൾ വിളിക്കാൻ വിമാന മോഡ് ഓഫാക്കുക അല്ലെങ്കിൽ വയർലെസ്സ് നെറ്റ്വർക്കിലേക്ക് കണക്റ്റുചെയ്യുക."</string>
<string name="incall_error_power_off_thermal" product="default" msgid="8695809601655300168"><b>"ഫോൺ വളരെയധികം ചൂടായിരിക്കുന്നു"</b>\n\n"ഈ കോൾ പൂർത്തിയാക്കാനാകില്ല. ഫോൺ തണുക്കുമ്പോൾ വീണ്ടും ശ്രമിക്കുക.\n\nഎമർജൻസി കോളുകൾ നിങ്ങൾക്ക് ഇപ്പോഴും ചെയ്യാവുന്നതാണ്."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"നീക്കം ചെയ്യാവുന്ന ഇ-സിം ഡിഫോൾട്ടായി സജ്ജീകരിക്കുക"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"മൊബൈൽ റേഡിയോ പവർ"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"സേവനം ലഭ്യമല്ലെന്ന് അനുകരിക്കുക (ഡീബഗ് ബിൽഡ് മാത്രം)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"ഫോഴ്സ് ക്യാമ്പ് സാറ്റലൈറ്റ് LTE ചാനൽ(ഡീബഗ് ബിൽഡ് മാത്രം)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Mock സേവനദാതാവ് ഉപഗ്രഹ മോഡ് (ഡീബഗ് ബിൽഡ് മാത്രം)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"യഥാർത്ഥ സാറ്റലൈറ്റ് eSOS മോഡ് പരീക്ഷിക്കുക (ഡീബഗ് ബിൽഡ് മാത്രം)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"യഥാർത്ഥ സാറ്റലൈറ്റ് eSOS ഇതര മോഡ് പരീക്ഷിക്കുക (ഡീബഗ് ബിൽഡ് മാത്രം)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"ഡെമോ സാറ്റലൈറ്റ് eSOS മോഡ് പരീക്ഷിക്കുക (ഡീബഗ് ബിൽഡ് മാത്രം)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"സിം വിലാസ പുസ്തകം കാണുക"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"സ്ഥിര ഡയലിംഗ് നമ്പറുകൾ കാണുക"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"സർവീസ് ഡയലിംഗ് നമ്പറുകൾ കാണുക"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"അപ്ഡേറ്റ് ചെയ്യുക"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"റീഫ്രഷ് ചെയ്യുക"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"DNS പരിശോധന മാറ്റുക"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM-നിർദ്ദിഷ്ട വിവരം/ക്രമീകരണം"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC ലഭ്യമാണ് (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR നിയന്ത്രിച്ചിരിക്കുന്നു (NSA):"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 1d85926..16f3207 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -56,7 +56,7 @@
<string name="requesting_unlock" msgid="930512210309437741">"Сүлжээг тайлах хүсэлтийг илгээж байна…"</string>
<string name="unlock_failed" msgid="7103543844840661366">"Сүлжээг тайлах хүсэлт амжилтгүй боллоо."</string>
<string name="unlock_success" msgid="32681089371067565">"Сүлжээг амжилттай тайллаа."</string>
- <string name="mobile_network_settings_not_available" msgid="8678168497517090039">"Энэ хэрэглэгч мобайл сүлжээний тохиргоог ашиглах боломжгүй"</string>
+ <string name="mobile_network_settings_not_available" msgid="8678168497517090039">"Энэ хэрэглэгч хөдөлгөөнт холбооны сүлжээний тохиргоог ашиглах боломжгүй"</string>
<string name="labelGSMMore" msgid="7354182269461281543">"GSM дуудлагын тохиргоо"</string>
<string name="labelGsmMore_with_label" msgid="3206015314393246224">"GSM дуудлагын тохиргоо (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="labelCDMAMore" msgid="7937441382611224632">"CDMA дуудлагын тохиргоо"</string>
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Дуудлагын тохиргоо"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Дуудлагын тохиргоог зөвхөн админ хэрэглэгч солих боломжтой."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Утасны бүртгэлийн тохиргоог зөвхөн админ эсвэл ажлын хэрэглэгч өөрчлөх боломжтой."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Төхөөрөмжийн өмчлөгч хөдөлгөөнт холбооны сүлжээний тохиргоог өөрчлөх чадамжийг хязгаарласан."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Тохиргоо (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Дуудлагын тохиргооны алдаа"</string>
<string name="reading_settings" msgid="1605904432450871183">"Тохиргоог уншиж байна…"</string>
@@ -173,7 +174,7 @@
<string name="vm_change_pin_error_invalid" msgid="5230002671175580674">"Шинэ ПИН-д буруу тэмдэгт агуулагдаж байна."</string>
<string name="vm_change_pin_error_system_error" msgid="9116483527909681791">"ПИН-г өөрчлөх боломжгүй"</string>
<string name="vvm_unsupported_message_format" msgid="4206402558577739713">"Дэмжигдээгүй мессежийн төрөл, сонсохын тулд <xliff:g id="NUMBER">%s</xliff:g> руу залгана уу."</string>
- <string name="network_settings_title" msgid="7560807107123171541">"Мобайл сүлжээ"</string>
+ <string name="network_settings_title" msgid="7560807107123171541">"Хөдөлгөөнт холбооны сүлжээ"</string>
<string name="label_available" msgid="1316084116670821258">"Боломжтой сүлжээнүүд"</string>
<string name="load_networks_progress" msgid="4051433047717401683">"Хайж байна..."</string>
<string name="empty_networks_list" msgid="9216418268008582342">"Сүлжээ олдсонгүй."</string>
@@ -305,7 +306,7 @@
<string name="keywords_carrier_settings_euicc" msgid="8540160967922063745">"үүрэн холбооны компани, esim, sim, euicc, үүрэн холбооны компани сэлгэх, үүрэн холбооны компани нэмэх"</string>
<string name="carrier_settings_euicc_summary" msgid="2027941166597330117">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> — <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
<string name="mobile_data_settings_title" msgid="7228249980933944101">"Мобайл дата"</string>
- <string name="mobile_data_settings_summary" msgid="5012570152029118471">"Мобайл сүлжээг ашиглан датанд хандах"</string>
+ <string name="mobile_data_settings_summary" msgid="5012570152029118471">"Хөдөлгөөнт холбооны сүлжээг ашиглан датанд хандах"</string>
<string name="data_usage_disable_mobile" msgid="5669109209055988308">"Мобайл датаг унтраах уу?"</string>
<string name="sim_selection_required_pref" msgid="6985901872978341314">"Сонгох шаардлагатай"</string>
<string name="sim_change_data_title" msgid="9142726786345906606">"Дата SIM солих уу?"</string>
@@ -535,16 +536,16 @@
<string name="notification_voicemail_no_vm_number" msgid="3423686009815186750">"Дуут шуудангийн дугаар тодорхойгүй"</string>
<string name="notification_network_selection_title" msgid="255595526707809121">"Үйлчилгээ байхгүй"</string>
<string name="notification_network_selection_text" msgid="553288408722427659">"Сонгосон <xliff:g id="OPERATOR_NAME">%s</xliff:g> сүлжээг ашиглах боломжгүй"</string>
- <string name="incall_error_power_off" product="watch" msgid="7191184639454113633">"Дуудлага хийхийн тулд мобайл сүлжээг асаах, нислэгийн горим буюу батарей хэмнэх горимыг идэвхгүй болгоно уу."</string>
+ <string name="incall_error_power_off" product="watch" msgid="7191184639454113633">"Дуудлага хийхийн тулд хөдөлгөөнт холбооны сүлжээг асаах, нислэгийн горим буюу батарей хэмнэх горимыг идэвхгүй болгоно уу."</string>
<string name="incall_error_power_off" product="default" msgid="8131672264311208673">"Дуудлага хийхийн тулд онгоцны горимыг унтраа."</string>
<string name="incall_error_power_off_wfc" msgid="9125661184694727052">"Дуудлага хийхийн тулд онгоцны горимыг унтраа эсвэл утасгүй интернетэд холбогдоно уу."</string>
<string name="incall_error_power_off_thermal" product="default" msgid="8695809601655300168"><b>"Утас хэт халуун байна"</b>\n\n"Энэ дуудлагыг гүйцээх боломжгүй. Та утсаа хөрсөн үед дахин оролдоно уу.\n\nТа яаралтай дуудлага хийх боломжтой хэвээр байна."</string>
<string name="incall_error_ecm_emergency_only" msgid="5622379058883722080">"Яаралтай түргэн тусламжийн бус дуудлага хийхийн тулд яаралтай түргэн тусламжийн callback горимоос гарна уу."</string>
<string name="incall_error_emergency_only" msgid="8786127461027964653">"Сүлжээнд бүртгэгдээгүй."</string>
<string name="incall_error_out_of_service" msgid="1927265196942672791">"Мобайль сүлжээ байхгүй."</string>
- <string name="incall_error_out_of_service_2g" msgid="904434080740846116">"Мобайл сүлжээ боломжгүй байна.\n\nДуудлага хийхийн тулд утасгүй сүлжээнд холбогдоно уу.\n\n2G-г энэ төхөөрөмж дээр идэвхгүй болгосон бөгөөд энэ нь таны холболтод нөлөөлж байж магадгүй. Үргэлжлүүлэхийн тулд Тохиргоо руу очоод, 2G-г зөвшөөрөхийг идэвхжүүлнэ үү."</string>
- <string name="incall_error_out_of_service_wfc" msgid="4497663185857190885">"Мобайл сүлжээнд холбогдох боломжгүй байна. Дуудлага хийхийн тулд утасгүй интернетэд холбогдоно уу."</string>
- <string name="incall_error_out_of_service_wfc_2g_user" msgid="8218768986365299663">"Мобайл сүлжээ боломжгүй байна.\n\nДуудлага хийхийн тулд утасгүй сүлжээнд холбогдоно уу.\n\n2G-г энэ төхөөрөмж дээр идэвхгүй болгосон бөгөөд энэ нь таны холболтод нөлөөлж байж магадгүй. Үргэлжлүүлэхийн тулд Тохиргоо руу очоод, 2G-г зөвшөөрөхийг идэвхжүүлнэ үү."</string>
+ <string name="incall_error_out_of_service_2g" msgid="904434080740846116">"Хөдөлгөөнт холбооны сүлжээ боломжгүй байна.\n\nДуудлага хийхийн тулд утасгүй сүлжээнд холбогдоно уу.\n\n2G-г энэ төхөөрөмж дээр идэвхгүй болгосон бөгөөд энэ нь таны холболтод нөлөөлж байж магадгүй. Үргэлжлүүлэхийн тулд Тохиргоо руу очоод, 2G-г зөвшөөрөхийг идэвхжүүлнэ үү."</string>
+ <string name="incall_error_out_of_service_wfc" msgid="4497663185857190885">"Хөдөлгөөнт холбооны сүлжээнд холбогдох боломжгүй байна. Дуудлага хийхийн тулд утасгүй интернетэд холбогдоно уу."</string>
+ <string name="incall_error_out_of_service_wfc_2g_user" msgid="8218768986365299663">"Хөдөлгөөнт холбооны сүлжээ боломжгүй байна.\n\nДуудлага хийхийн тулд утасгүй сүлжээнд холбогдоно уу.\n\n2G-г энэ төхөөрөмж дээр идэвхгүй болгосон бөгөөд энэ нь таны холболтод нөлөөлж байж магадгүй. Үргэлжлүүлэхийн тулд Тохиргоо руу очоод, 2G-г зөвшөөрөхийг идэвхжүүлнэ үү."</string>
<string name="incall_error_no_phone_number_supplied" msgid="8680831089508851894">"Дуудлага хийхийн тулд хүчин төгөлдөр дугаар оруулна уу."</string>
<string name="incall_error_call_failed" msgid="393508653582682539">"Дуудлага амжилтгүй болсон."</string>
<string name="incall_error_cannot_add_call" msgid="5425764862628655443">"Дуудлагыг энэ удаад нэмэх боломжгүй. Та мессеж илгээн холбоо тогтоохыг оролдох боломжтой."</string>
@@ -717,7 +718,7 @@
<string name="clh_card_title_call_ended_txt" msgid="5977978317527299698">"Дуудлага дууссан"</string>
<string name="clh_callFailed_powerOff_txt" msgid="8279934912560765361">"Нислэгийн горим асаалттай"</string>
<string name="clh_callFailed_simError_txt" msgid="5128538525762326413">"SIM картад хандах боломжгүй"</string>
- <string name="clh_incall_error_out_of_service_txt" msgid="2736010617446749869">"Мобайл сүлжээ байхгүй"</string>
+ <string name="clh_incall_error_out_of_service_txt" msgid="2736010617446749869">"Хөдөлгөөнт холбооны сүлжээ байхгүй"</string>
<string name="clh_callFailed_satelliteEnabled_txt" msgid="1675517238240377396">"Хиймэл дагуулын горим асаалттай байна"</string>
<string name="clh_callFailed_unassigned_number_txt" msgid="141967660286695682">"Таны залгахыг оролдож буй утасны дугаарт асуудал байна. Алдааны код 1."</string>
<string name="clh_callFailed_no_route_to_destination_txt" msgid="4805015149822352308">"Дуудлагыг гүйцээж чадсангүй. Алдааны код 3."</string>
@@ -824,10 +825,10 @@
<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="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>
- <string name="supp_service_over_ut_precautions_roaming_dual_sim" msgid="6627654855191817965">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g>-г ашиглахын тулд SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g>-д мобайл дата болон дата роуминг асаасан эсэхээ шалгана уу. Та эдгээрийг мобайл сүлжээний тохиргоонд өөрчлөх боломжтой."</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>
+ <string name="supp_service_over_ut_precautions_roaming_dual_sim" msgid="6627654855191817965">"<xliff:g id="SUPP_SERVICE">%1$s</xliff:g>-г ашиглахын тулд SIM <xliff:g id="SIM_NUMBER">%2$d</xliff:g>-д мобайл дата болон дата роуминг асаасан эсэхээ шалгана уу. Та эдгээрийг хөдөлгөөнт холбооны сүлжээний тохиргоонд өөрчлөх боломжтой."</string>
<string name="supp_service_over_ut_precautions_dialog_dismiss" msgid="5934541487903081652">"Үл хэрэгсэх"</string>
<string name="radio_info_data_connection_enable" msgid="6183729739783252840">"Дата холболтыг идэвхжүүлэх"</string>
<string name="radio_info_data_connection_disable" msgid="6404751291511368706">"Дата холболтыг идэвхгүй болгох"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Салгах боломжтой eSIM-г өгөгдмөлөөр тохируулах"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Мобайл радио цахилгаан"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Үйлчилгээний хүрээнээс гарсан нөхцөл байдлыг загварчлах (зөвхөн дебагийн хийц)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Camp Satellite LTE сувгийг хүчлэх (зөвхөн дебаг хийсэн хийц)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Оператор компанийн хуурамч хиймэл дагуулын горим (зөвхөн дебаг хийсэн хийц)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Жинхэнэ хиймэл дагуул eSOS горимыг турших (зөвхөн дебаг хийсэн хийц)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Жинхэнэ хиймэл дагуул eSOS бус горимыг турших (зөвхөн дебаг хийсэн хийц)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Демо хиймэл дагуул eSOS горимыг турших (зөвхөн дебаг хийсэн хийц)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"SIM хаягийн лавлахыг харах"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Залгахаар тохируулсан дугаарыг харах"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Үйлчилгээний залгах дугаарыг харах"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Шинэчлэх"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Сэргээх"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"DNS шалгалтыг асаах/унтраах"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM-тодорхой Мэдээлэл/Тохиргоо"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC боломжтой (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR хязгаарласан (NSA):"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index e4d903c..d3fe12d 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"कॉल सेटिंग्ज"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"कॉल सेटिंग्ज केवळ प्रशासक वापरकर्त्याद्वारे बदलल्या जाऊ शकतात."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"फोन खाते सेटिंग्ज फक्त ॲडमिन किंवा ऑफिसच्या वापरकर्त्याद्वारे बदलली जाऊ शकतात."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"डिव्हाइसच्या मालकाने मोबाइल नेटवर्क सेटिंग्ज बदलण्याची क्षमता प्रतिबंधित केली आहे."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"सेटिंग्ज (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"कॉल सेटिंग्ज एरर"</string>
<string name="reading_settings" msgid="1605904432450871183">"सेटिंग्ज वाचत आहे…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"काढून टाकण्यायोग्य eSIM डीफॉल्ट म्हणून सेट करा"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"मोबाइल रेडिओ पॉवर"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"सेवा बंद आहे सिम्युलेट करा (फक्त डीबगचा बिल्ड)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"फोर्स कॅम्प सॅटेलाइट LTE चॅनल (फक्त डीबग बिल्ड)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"नमुना वाहकाचा उपग्रह मोड (फक्त डीबग बिल्ड)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"प्रत्यक्ष सॅटेलाइट eSOS मोडची चाचणी करा (फक्त डीबग बिल्ड)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"eSOS नसलेल्या वास्तविक सॅटेलाइट मोडची चाचणी करा (फक्त डीबग बिल्ड)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"डेमो सॅटेलाइट eSOS मोडची चाचणी करा (फक्त डीबग बिल्ड)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"सिम ॲड्रेस बुक पहा"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"निश्चित डायलिंग नंबर पहा"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"सर्व्हिस डायलिंग नंबर पहा"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"अपडेट करा"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"रिफ्रेश करा"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"DNS तपासणी टॉगल करा"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM-विशिष्ट माहिती/सेटिंग्ज"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC उपलब्ध (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR प्रतिबंधित (NSA):"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index ade76f7..fe16a45 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Tetapan panggilan"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Tetapan panggilan hanya boleh diubah oleh pengguna pentadbir."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Tetapan akaun telefon hanya boleh ditukar oleh pentadbir atau pengguna di tempat kerja."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Pemilik peranti telah mengehadkan keupayaan untuk menukar tetapan rangkaian mudah alih."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Tetapan (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Ralat tetapan panggilan"</string>
<string name="reading_settings" msgid="1605904432450871183">"Membaca tetapan..."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Tetapkan eSIM Boleh Tanggal sebagai Lalai"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Kuasa Radio Mudah Alih"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simulasi Rosak (Binaan Penyahpepijatan sahaja)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Paksa Saluran LTE Satelit Kem (Binaan Nyahpepijat sahaja)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Contoh Mod Satelit Pembawa (Binaan Penyahpepijatan sahaja)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Uji mod sSOS satelit sebenar (Binaan Penyahpepijatan sahaja)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Uji mod bukan eSOS satelit sebenar (Binaan Penyahpepijatan sahaja)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Uji mod eSOS satelit demo (Binaan Penyahpepijatan sahaja)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Lihat Buku Alamat SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Lihat Nombor Dailan Tetap"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Lihat Nombor Dailan Perkhidmatan"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Kemas kini"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Muat semula"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Togol Semakan DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Maklumat/Tetapan khusus OEM"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC Tersedia (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR Terhad (NSA):"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 9ccd3df..90b1229 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"ဖုန်းခေါ်ဆိုခြင်း ဆက်တင်များ"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"ခေါ်ဆိုမှုကြိုတင်ပြင်ဆင်ချက်များကို ကြီးကြပ်သူသာလျှင် ပြောင်းလဲနိုင်သည်။"</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"ဖုန်းအကောင့်ဆက်တင်များကို စီမံခန့်ခွဲသူ (သို့) ဝန်ထမ်းကသာ ပြောင်းနိုင်သည်။"</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"စက်ပစ္စည်းပိုင်ရှင်သည် မိုဘိုင်းကွန်ရက်ဆက်တင်များ ပြောင်းခွင့်ကို ကန့်သတ်ထားသည်။"</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"ဆက်တင်များ ( <xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g> )"</string>
<string name="error_updating_title" msgid="2024290892676808965">"ခေါ်ဆိုမှုဆက်တင်အမှား"</string>
<string name="reading_settings" msgid="1605904432450871183">"ဆက်တင်များကို ဖတ်နေပါသည်…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"ဖယ်ရှားနိုင်သော eSIM ကို မူရင်းအဖြစ် သတ်မှတ်ရန်"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"မိုဘိုင်း ရေဒီယိုစွမ်းအား"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"အသွင်တူပြုလုပ်သောစက် အလုပ်မလုပ်ပါ (အမှားရှာပြင်ခြင်းသာလျှင်)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Force Camp Satellite LTE ချန်နယ် (အမှားရှာပြင်ခြင်းအတွက်သာ)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Mock Carrier Satellite Mode (အမှားရှာပြင်ခြင်း အတွက်သာ)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"ဂြိုဟ်တုအစစ် eSOS မုဒ်ကို စမ်းသပ်ခြင်း (အမှားရှာပြင်ခြင်းအတွက်သာ)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"ဂြိုဟ်တုအစစ် eSOS မဟုတ်သော မုဒ်ကို စမ်းသပ်ခြင်း (အမှားရှာပြင်ခြင်းအတွက်သာ)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"သရုပ်ပြ ဂြိုဟ်တု eSOS မုဒ်ကို စမ်းသပ်ခြင်း (အမှားရှာပြင်ခြင်းအတွက်သာ)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"SIM ထဲရှိ လိပ်စာ စာအုပ်ကိုကြည့်ပါ"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"ခေါ်ဆိုရန် ကန့်သတ် နံပါတ်ကို ကြည့်မည်"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"ခေါ်ဆိုသည့်ဝန်ဆောင်မှုနံပါတ်အားကြည့်မည်"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC -"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"အပ်ဒိတ်လုပ်ရန်"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"ပြန်စရန်"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"DNS စစ်ဆေးမှုခလုတ်ကို နှိပ်ပါ"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"ထုတ်လုပ်သူနှင့် သက်ဆိုင်သော အချက်အလက်/ဆက်တင်များ"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC ရနိုင်သည် (NSA)-"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR ကန့်သတ်ထားသည် (NSA)-"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 2e54a23..776a55d 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Samtaleinnstillinger"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Anropsinnstillinger kan bare endres av administratoren."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Kontoinnstillingene for telefonen kan bare endres av administratoren eller jobbrukeren."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Enhetseieren har begrenset muligheten til å endre innstillingene for mobilnettverk."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Innstillinger (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Feil ved samtaleinnstillinger"</string>
<string name="reading_settings" msgid="1605904432450871183">"Leser innstillingene …"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Angi flyttbart eSIM-kort som standard"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Strømforsyning for mobilradio"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Ute av drift-simulering (bare for feilsøkingsversjoner)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Force Camp Satellite LTE-kanal (bare feilsøkingsversjon)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Satelittmodus for fiktiv operatør (feilsøkingsversjon)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Test ekte satellitt med eSOS-modus (kun for feilsøkingsversjoner)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Test ekte satellitt med ikke-eSOS-modus (kun for feilsøkingsversjoner)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Test demo av satellitt med eSOS-modus (kun for feilsøkingsversjoner)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Se adressebok for SIM-kort"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Vis forhåndsbestemte numre"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Vis tjenestenumre"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Oppdater"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Last inn på nytt"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Slå av/på DNS-sjekk"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Produsentspesfikk informasjon og innstillinger"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC tilgjengelig (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR begrenset (NSA):"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index ebf09e7..baa5aa7 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"कल सेटिङहरू"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"कल सेटिङहरू केवल प्रशासकीय प्रयोगकर्ताद्वारा परिवर्तन गर्न सकिन्छ।"</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"एड्मिन वा कार्य प्रोफाइलका प्रयोगकर्ता मात्र फोनमा लिंक गरिएको खाताका सेटिङ बदल्न सक्नुहुन्छ।"</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"डिभाइसका मालिकले मोबाइल नेटवर्कसम्बन्धी सेटिङ परिवर्तन गर्न रोक लगाउनुभएको छ।"</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"सेटिङहरू (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"कल सेटिङमा त्रुटि"</string>
<string name="reading_settings" msgid="1605904432450871183">"सेटिङहरू पढ्दै..."</string>
@@ -192,7 +193,7 @@
<string name="preferred_network_mode_dialogtitle" msgid="2781447433514459696">"रुचाइएको नेटवर्कको प्रकार"</string>
<string name="forbidden_network" msgid="5081729819561333023">"(निषेध गरिएको)"</string>
<string name="choose_network_title" msgid="5335832663422653082">"नेटवर्क छनौट गर्नुहोस्"</string>
- <string name="network_disconnected" msgid="8844141106841160825">"जडान विच्छेद गरियो"</string>
+ <string name="network_disconnected" msgid="8844141106841160825">"जडान डिस्कनेक्ट गरियो"</string>
<string name="network_connected" msgid="2760235679963580224">"जडान गरियो"</string>
<string name="network_connecting" msgid="160901383582774987">"जडान गरिँदै छ..."</string>
<string name="network_could_not_connect" msgid="6547460848093727998">"जडान गर्न सकिएन"</string>
@@ -306,7 +307,7 @@
<string name="carrier_settings_euicc_summary" msgid="2027941166597330117">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> — <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
<string name="mobile_data_settings_title" msgid="7228249980933944101">"मोबाइल डेटा"</string>
<string name="mobile_data_settings_summary" msgid="5012570152029118471">"मोबाइल नेटवर्कको प्रयोग गरी डेटामाथि पहुँच गर्नुहोस्"</string>
- <string name="data_usage_disable_mobile" msgid="5669109209055988308">"मोबाइल डेटा निष्क्रिय पार्ने हो?"</string>
+ <string name="data_usage_disable_mobile" msgid="5669109209055988308">"मोबाइल डेटा अफ गर्ने हो?"</string>
<string name="sim_selection_required_pref" msgid="6985901872978341314">"चयन गर्न आवश्यक छ"</string>
<string name="sim_change_data_title" msgid="9142726786345906606">"डेटा सिम परिवर्तन गर्ने हो?"</string>
<string name="sim_change_data_message" msgid="3567358694255933280">"मोबाइल डेटाका लागि <xliff:g id="OLD_SIM">%2$s</xliff:g> को सट्टा <xliff:g id="NEW_SIM">%1$s</xliff:g> को प्रयोग गर्ने हो?"</string>
@@ -482,8 +483,8 @@
<string name="fdn_failed" msgid="216592346853420250">"FDN कार्य बिफल भयो।"</string>
<string name="simContacts_emptyLoading" msgid="4989040293858675483">"SIM कार्ड पढ्दै..."</string>
<string name="simContacts_empty" msgid="1135632055473689521">"तपाईँको SIM कार्डमा कुनै पनि सम्पर्क छैन।"</string>
- <string name="simContacts_title" msgid="2714029230160136647">"सम्पर्कहरू आयात गर्न चयन गर्नुहोस्"</string>
- <string name="simContacts_airplaneMode" msgid="4654884030631503808">"SIM कार्डबाट सम्पर्कहरू आयात गर्न हवाइजहाज मोड बन्द गर्नुहोस्।"</string>
+ <string name="simContacts_title" msgid="2714029230160136647">"कन्ट्याक्टहरू इम्पोर्ट गर्न चयन गर्नुहोस्"</string>
+ <string name="simContacts_airplaneMode" msgid="4654884030631503808">"SIM कार्डबाट कन्ट्याक्टहरू इम्पोर्ट गर्न हवाइजहाज मोड बन्द गर्नुहोस्।"</string>
<string name="enable_pin" msgid="967674051730845376">"SIM PIN सक्षम/अक्षम गर्नुहोस्"</string>
<string name="change_pin" msgid="3657869530942905790">"SIM को PIN परिवर्तन गर्नुहोस्"</string>
<string name="enter_pin_text" msgid="3182311451978663356">"SIM PIN:"</string>
@@ -591,14 +592,14 @@
<string name="onscreenManageConferenceText" msgid="4700574060601755137">"सम्मेलन प्रबन्ध गर्नुहोस्"</string>
<string name="onscreenAudioText" msgid="7224226735052019986">"अडियो"</string>
<string name="onscreenVideoCallText" msgid="1743992456126258698">"भिडियो कल"</string>
- <string name="importSimEntry" msgid="3892354284082689894">"आयात गर्नुहोस्"</string>
- <string name="importAllSimEntries" msgid="2628391505643564007">"सबै आयात गर्नुहोस्"</string>
- <string name="importingSimContacts" msgid="4995457122107888932">"SIM सम्पर्कहरू आयात गर्दै"</string>
- <string name="importToFDNfromContacts" msgid="5068664870738407341">"सम्पर्कहरूबाट आयात गर्नुहोस्"</string>
+ <string name="importSimEntry" msgid="3892354284082689894">"इम्पोर्ट गर्नुहोस्"</string>
+ <string name="importAllSimEntries" msgid="2628391505643564007">"सबै इम्पोर्ट गर्नुहोस्"</string>
+ <string name="importingSimContacts" msgid="4995457122107888932">"SIM कन्ट्याक्टहरू आयात गर्दै"</string>
+ <string name="importToFDNfromContacts" msgid="5068664870738407341">"कन्ट्याक्टबाट इम्पोर्ट गर्नुहोस्"</string>
<string name="singleContactImportedMsg" msgid="3619804066300998934">"आयातित सम्पर्क"</string>
- <string name="failedToImportSingleContactMsg" msgid="228095510489830266">"सम्पर्क आयात गर्न असफल"</string>
- <string name="hac_mode_title" msgid="4127986689621125468">"श्रवणका लागि सहयोगी यन्त्रहरू"</string>
- <string name="hac_mode_summary" msgid="7774989500136009881">"श्रवण सहायता अनुकूलता खोल्नुहोस्"</string>
+ <string name="failedToImportSingleContactMsg" msgid="228095510489830266">"सम्पर्क इम्पोर्ट गर्न असफल"</string>
+ <string name="hac_mode_title" msgid="4127986689621125468">"हियरिङ डिभाइसहरू"</string>
+ <string name="hac_mode_summary" msgid="7774989500136009881">"हियरिङ डिभाइस कम्प्याटिबिलिटी अन गर्नुहोस्"</string>
<string name="rtt_mode_title" msgid="3075948111362818043">"द्रुत टेक्स्ट म्यासेज (RTT) कल"</string>
<string name="rtt_mode_summary" msgid="8631541375609989562">"भ्वाइस कलभित्रै सन्देश प्रवाह गर्ने अनुमति दिनुहोस्"</string>
<string name="rtt_mode_more_information" msgid="587500128658756318">"RTT ले बहिरा, सुन्नमा कठिन हुने, बोल्न नसक्ने र आवाज मात्र नभई कल गर्दा थप कुराहरू चाहिने मान्छेहरूलाई सहायता गर्छ!<br> <a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>>थप जान्नुहोस्</a>\n <br><br> - RTT कलहरूलाई सन्देशसम्बन्धी ट्रान्सक्रिप्टका रूपमा सुरक्षित गरिन्छ\n <br> - RTT भिडियो कलहरूमा उपलब्ध छैन"</string>
@@ -818,7 +819,7 @@
<string name="supp_service_deflected_call" msgid="7565979024562921707">"कल अर्को नम्बरमा स्थानान्तरण गरियो।"</string>
<string name="supp_service_forwarded_call" msgid="6475776013771821457">"कल फर्वार्ड गरियो।"</string>
<string name="supp_service_conference_call" msgid="4004193534408317148">"सम्मेलन कलमा सामेल हुँदै छ।"</string>
- <string name="supp_service_held_call_released" msgid="2847835124639112410">"होल्डमा राखिएको कललाई विच्छेद गरियो।"</string>
+ <string name="supp_service_held_call_released" msgid="2847835124639112410">"होल्डमा राखिएको कललाई डिस्कनेक्ट गरियो।"</string>
<string name="callFailed_otasp_provisioning_in_process" msgid="3345666183602879326">"डिभाइसमा हाल सेवाहरूको व्यवस्था गरिँदै हुनाले कल गर्न सकिँदैन।"</string>
<string name="callFailed_already_dialing" msgid="7250591188960691086">"अर्को बहिर्गमन कल पहिले नै डायल भएका हुनाले कल गर्न सकिँदैन।"</string>
<string name="callFailed_already_ringing" msgid="2376603543544289303">"जवाफ नदिइएको आगमन कल जारी रहेकाले नयाँ कल गर्न सकिँदैन। कुनै नयाँ कल गर्नुअघि आगमन कलको जवाफ दिनुहोस् वा त्यसलाई अस्वीकार गर्नुहोस्।"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"हटाउन मिल्ने eSIM डिफल्ट रूपमा सेट गर्नुहोस्"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"मोबाइल रेडियोको पावर"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"\"सेवा उपलब्ध छैन\" सिमुलेट गर्नुहोस् (डिबग बिल्डमा मात्र सिमुलेट गर्न मिल्छ)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Force Camp Satellite LTE च्यानल (डिबग बिल्ड मात्र)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"सेवा प्रदायकको स्याटेलाइट मोडको परीक्षण गर्नुहोस् (डिबग बिल्ड मात्र)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"वास्तविक स्याटेलाइट eSOS मोड परीक्षण गर्नुहोस् (डिबग बिल्ड मात्र)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"वास्तविक स्याटेलाइट eSOS बाहेकका मोड (डिबग बिल्ड मात्र) परीक्षण गर्नुहोस्"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"डेमो स्याटेलाइट eSOS मोडको परीक्षण गर्नुहोस् (डिबग बिल्ड मात्र)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"SIM को ठेगाना पुस्तिका हेर्नुहोस्"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"स्थिर डायल गर्ने नम्बरहरू हेर्नुहोस्"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"सेवामा डायल गर्ने नम्बरहरू हेर्नुहोस्"</string>
@@ -865,7 +869,7 @@
<string name="radioInfo_phone_idle" msgid="2191653783170757819">"निष्क्रिय"</string>
<string name="radioInfo_phone_ringing" msgid="8100354169567413370">"घन्टी बज्दै छ"</string>
<string name="radioInfo_phone_offhook" msgid="7564601639749936170">"कल जारी छ"</string>
- <string name="radioInfo_data_disconnected" msgid="8085447971880814541">"विच्छेद गरियो"</string>
+ <string name="radioInfo_data_disconnected" msgid="8085447971880814541">"डिस्कनेक्ट गरिएको छ"</string>
<string name="radioInfo_data_connecting" msgid="925092271092152472">"जोडिँदै"</string>
<string name="radioInfo_data_connected" msgid="7637335645634239508">"जडान गरियो"</string>
<string name="radioInfo_data_suspended" msgid="8695262782642002785">"निलम्बित"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"अपडेट गर्नुहोस्"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"पुनः ताजा गर्नुहोस्"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"DNS को जाँचलाई टगल गर्नुहोस्"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM-विशिष्ट जानकारी/सेटिङ"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC उपलब्ध छ (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR प्रतिबन्धित छ (NSA):"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 2f84556..b859f88 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Gespreksinstellingen"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Oproepinstellingen kunnen alleen worden gewijzigd door de beheerder."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Alleen de beheerder of zakelijke gebruiker kan de accountinstellingen wijzigen."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"De eigenaar van het apparaat heeft de mogelijkheid voor het wijzigen van de mobiele netwerkinstellingen beperkt."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Instellingen (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Fout met oproepinstellingen"</string>
<string name="reading_settings" msgid="1605904432450871183">"Instellingen lezen..."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Verwisselbare e-simkaart instellen als standaard"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Mobiel radiovermogen"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"\'Niet in gebruik\' simuleren (alleen in foutopsporingsbuild)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Camp Satellite LTE-kanaal afdwingen (alleen in foutopsporingsbuild)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Satellietmodus voor testprovider (alleen in foutopsporingsbuild)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Echte e-SOS via satellietmodus testen (alleen in foutopsporingsbuild)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Echte niet-noodoproep via satellietmodus testen (alleen in foutopsporingsbuild)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Demo e-SOS via satellietmodus testen (alleen in foutopsporingsbuild)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Adresboek op simkaart bekijken"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Vaste nummers bekijken"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Servicenummers bekijken"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Updaten"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Vernieuwen"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"DNS-controle aan-/uitzetten"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM-specifieke gegevens/instellingen"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC beschikbaar (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR beperkt (NSA):"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index ac72cf2..3ec9fe7 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"କଲ ସେଟିଂସ"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"କଲ ସେଟିଂସକୁ କେବଳ ଆଡମିନ ୟୁଜର ବଦଳାଇପାରିବେ।"</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"ଫୋନ ଆକାଉଣ୍ଟ ସେଟିଂସ କେବଳ ଆଡମିନ କିମ୍ବା ୱାର୍କ ୟୁଜରଙ୍କ ଦ୍ୱାରା ପରିବର୍ତ୍ତନ କରାଯାଇପାରିବ।"</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"ମୋବାଇଲ ନେଟୱାର୍କ ସେଟିଂସ ପରିବର୍ତ୍ତନ କରିବାର କ୍ଷମତାକୁ ଡିଭାଇସ ମାଲିକ ପ୍ରତିବନ୍ଧିତ କରିଛନ୍ତି।"</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"ସେଟିଙ୍ଗ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"କଲ୍ ସେଟିଙ୍ଗରେ ତ୍ରୁଟି"</string>
<string name="reading_settings" msgid="1605904432450871183">"ସେଟିଂସକୁ ପଢ଼ାଯାଉଛି…"</string>
@@ -623,7 +624,7 @@
<string name="ota_hfa_activation_dialog_message" msgid="7921718445773342996">"ଏହି ଫୋନ୍ ଆପଣଙ୍କର ମୋବାଇଲ୍ ଡାଟା ସେବାକୁ ସକ୍ରିୟ କରୁଛି। \n\nଏଥି ପାଇଁ ପ୍ରାୟ 5 ମିନିଟ୍ ସମୟ ଲାଗିପାରେ।"</string>
<string name="ota_skip_activation_dialog_title" msgid="7666611236789203797">"ସକ୍ରିୟ କରିବା ଛାଡ଼ିଯିବେ?"</string>
<string name="ota_skip_activation_dialog_message" msgid="6691722887019708713">"ଯଦି ଆପଣ ସକ୍ରିୟ କରିବା କାର୍ଯ୍ୟକୁ ଛାଡ଼ିଯା’ନ୍ତି ତେବେ ଆପଣ କଲ୍ କରିପାରିବେ ନାହିଁ କିମ୍ବା ମୋବାଇଲ୍ ନେଟ୍ୱର୍କ (ଯଦିଓ ଆପଣ ୱାଇ-ଫାଇ ନେଟ୍ୱର୍କ ସହିତ ଯୋଡ଼ିହୋଇପାରିବେ) ସହିତ ଯୋଡ଼ିହୋଇପାରିବେ ନାହିଁ। ଆପଣ ନିଜର ଫୋନ୍କୁ ସକ୍ରିୟ ନକରିବା ପର୍ଯ୍ୟନ୍ତ ପ୍ରତ୍ୟେକଥର ଏହାକୁ ଚାଲୁ କରିବା ସମୟରେ ସକ୍ରିୟ କରିବା ପାଇଁ କୁହାଯିବ।"</string>
- <string name="ota_skip_activation_dialog_skip_label" msgid="5908029466817825633">"ଛାଡ଼ିଦିଅନ୍ତୁ"</string>
+ <string name="ota_skip_activation_dialog_skip_label" msgid="5908029466817825633">"ବାଦ ଦିଅନ୍ତୁ"</string>
<string name="ota_activate" msgid="7939695753665438357">"ସକ୍ରିୟ କରନ୍ତୁ"</string>
<string name="ota_title_activate_success" msgid="1272135024761004889">"ଫୋନ୍ ସକ୍ରିୟ ହୋଇଯାଇଛି।"</string>
<string name="ota_title_problem_with_activation" msgid="7019745985413368726">"ସକ୍ରିୟ ହେବାରେ ସମସ୍ୟା"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"କାଢ଼ି ହେଉଥିବା eSIMକୁ ଡିଫଲ୍ଟ ଭାବେ ସେଟ କରନ୍ତୁ"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"ମୋବାଇଲ୍ ରେଡିଓ ପାୱାର୍"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"\"କାମ କରୁନାହିଁ\"ରେ ସିମୁଲେଟ କରନ୍ତୁ (କେବଳ ଡିବଗ ବିଲ୍ଡ)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"ଫୋର୍ସ କେମ୍ପ ସେଟେଲାଇଟ LTE ଚେନେଲ (କେବଳ ଡିବଗ ବିଲ୍ଡ)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"ମକ କେରିଅର ସେଟେଲାଇଟ ମୋଡ (କେବଳ ଡିବଗ ବିଲ୍ଡ)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"ପ୍ରକୃତ ସେଟେଲାଇଟର eSOS ମୋଡ ପରୀକ୍ଷା କରନ୍ତୁ (କେବଳ ଡିବଗ ବିଲ୍ଡ)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"ପ୍ରକୃତ ସେଟେଲାଇଟର ଅଣ-eSOS ମୋଡ ପରୀକ୍ଷା କରନ୍ତୁ (କେବଳ ଡିବଗ ବିଲ୍ଡ)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"ଡେମୋ ସେଟେଲାଇଟର eSOS ମୋଡ ପରୀକ୍ଷା କରନ୍ତୁ (କେବଳ ଡିବଗ ବିଲ୍ଡ)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"ସିମ୍ରେ ଥିବା ଠିକଣା ପୁସ୍ତକ ଦେଖନ୍ତୁ"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"ସ୍ଥାୟୀ ଡାଏଲିଂ ନମ୍ୱରଗୁଡ଼ିକୁ ଦେଖନ୍ତୁ"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"ସର୍ଭିସ୍ ଡାଏଲିଂ ନମ୍ୱରଗୁଡ଼ିକ ଦେଖନ୍ତୁ"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"ଅପ୍ଡେଟ୍ କରନ୍ତୁ"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"ରିଫ୍ରେସ୍ କରନ୍ତୁ"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"DNS ଯାଞ୍ଚ ଟୋଗଲ୍ କରନ୍ତୁ"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM-ନିର୍ଦ୍ଦିଷ୍ଟ ସୂଚନା/ସେଟିଂସ୍"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC ଉପଲବ୍ଧ (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR ପ୍ରତିବନ୍ଧିତ (NSA):"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 859198a..cfe7dfb 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"ਕਾਲ ਸੈਟਿੰਗਾਂ"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"ਕਾਲ ਸੈਟਿੰਗਾਂ ਸਿਰਫ਼ ਪ੍ਰਸ਼ਾਸਕ ਵਰਤੋਂਕਾਰ ਵੱਲੋਂ ਹੀ ਬਦਲੀਆਂ ਜਾ ਸਕਦੀਆਂ ਹਨ।"</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"ਫ਼ੋਨ ਦੀਆਂ ਖਾਤਾ ਸੈਟਿੰਗਾਂ ਸਿਰਫ਼ ਪ੍ਰਸ਼ਾਸਕ ਜਾਂ ਕਾਰਜ-ਸਥਾਨ ਵਰਤੋਂਕਾਰ ਵੱਲੋਂ ਹੀ ਬਦਲੀਆਂ ਜਾ ਸਕਦੀਆਂ ਹਨ।"</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"ਡੀਵਾਈਸ ਦੇ ਮਾਲਕ ਨੇ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਸੈਟਿੰਗਾਂ ਨੂੰ ਬਦਲਣ ਦੀ ਯੋਗਤਾ \'ਤੇ ਪਾਬੰਦੀ ਲਗਾ ਦਿੱਤੀ ਹੈ।"</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"ਸੈਟਿੰਗਾਂ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"ਕਾਲ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਗੜਬੜ"</string>
<string name="reading_settings" msgid="1605904432450871183">"ਸੈਟਿੰਗਾਂ ਪੜ੍ਹ ਰਿਹਾ ਹੈ…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"ਹਟਾਉਣਯੋਗ ਈ-ਸਿਮ ਨੂੰ ਪੂਰਵ-ਨਿਰਧਾਰਿਤ ਵਜੋਂ ਸੈੱਟ ਕਰੋ"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"ਮੋਬਾਈਲ ਰੇਡੀਓ ਪਾਵਰ"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"\'ਸੇਵਾ ਵਿੱਚ ਨਹੀਂ\' ਨੂੰ ਸਿਮੂਲੇਟ ਕਰੋ (ਸਿਰਫ਼ ਡੀਬੱਗ ਬਿਲਡ)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"ਫੋਰਸ ਕੈਂਪ ਸੈਟੇਲਾਈਟ LTE ਚੈਨਲ (ਸਿਰਫ਼ ਡੀਬੱਗ ਬਿਲਡ)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"ਮੌਕ ਕੈਰੀਅਰ ਉਪਗ੍ਰਹਿ ਮੋਡ (ਸਿਰਫ਼ ਡੀਬੱਗ ਬਿਲਡ)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"ਰੀਅਲ ਸੈਟੇਲਾਈਟ eSOS ਮੋਡ ਅਜ਼ਮਾਓ (ਸਿਰਫ਼ ਡੀਬੱਗ ਬਿਲਡ)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"ਰੀਅਲ ਸੈਟੇਲਾਈਟ ਗੈਰ-eSOS ਮੋਡ ਅਜ਼ਮਾਓ (ਸਿਰਫ਼ ਡੀਬੱਗ ਬਿਲਡ)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"ਡੈਮੋ ਸੈਟੇਲਾਈਟ eSOS ਮੋਡ ਅਜ਼ਮਾਓ (ਸਿਰਫ਼ ਡੀਬੱਗ ਬਿਲਡ)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"ਸਿਮ ਦੀ ਪਤਾ ਬੁੱਕ ਦੇਖੋ"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"ਫਿਕਸਡ ਡਾਇਲਿੰਗ ਨੰਬਰ ਦੇਖੋ"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"ਸੇਵਾ ਡਾਇਲਿੰਗ ਨੰਬਰ ਦੇਖੋ"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"ਅੱਪਡੇਟ"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"ਰਿਫ੍ਰੈਸ਼ ਕਰੋ"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"DNS ਜਾਂਚ ਟੌਗਲ ਕਰੋ"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM-ਵਿਸ਼ੇਸ਼ ਜਾਣਕਾਰੀ/ਸੈਟਿੰਗਾਂ"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC ਉਪਲਬਧ (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR ਪ੍ਰਤਿਬੰਧਿਤ (NSA):"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 8bd1c0e..c6de547 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Ustawienia połączeń"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Ustawienia połączeń może zmieniać tylko użytkownik będący administratorem."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Ustawienia konta telefonu zmienia administrator lub użytkownik profilu służbowego."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Właściciel urządzenia ograniczył możliwość zmieniania ustawień sieci komórkowej."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Ustawienia (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Błąd w ustawieniach połączenia"</string>
<string name="reading_settings" msgid="1605904432450871183">"Czytanie ustawień..."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Ustaw wymienną kartę eSIM jako domyślną"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Moc sygnału komórkowego"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Symulowana przerwa w działaniu usługi (tylko w kompilacji do debugowania)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Wymuś kanał LTE satelitarny Force Camp (tylko kompilacja do debugowania)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Symulowany tryb satelitarny operatora (tylko kompilacja do debugowania)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Testowanie rzeczywistego trybu satelitarnego eSOS (tylko kompilacja do debugowania)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Testowanie rzeczywistego trybu satelitarnego innego niż eSOS (tylko kompilacja do debugowania)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Testowanie wersji demonstracyjnej trybu satelitarnego eSOS (tylko kompilacja do debugowania)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Wyświetl książkę adresową z karty SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Wyświetl ustalone numery"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Wyświetl numery usług"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Aktualizacja"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Odśwież"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Przełącz sprawdzanie DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Informacje/ustawienia specyficzne dla producenta OEM"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"Dostępne EN-DC (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"Ograniczenie DCNR (NSA):"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 8bfb02b..ddc06d4 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Definições de chamadas"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"As definições de chamadas só podem ser alteradas pelo utilizador gestor."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"As definições da conta do telemóvel só podem ser alteradas pelo administrador ou utilizador de trabalho."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"O proprietário do dispositivo restringiu a capacidade de alterar as definições de rede móvel."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Definições (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Erro nas definições de chamada"</string>
<string name="reading_settings" msgid="1605904432450871183">"A ler as definições..."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Predefinir eSIM removível"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Potência do rádio móvel"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simule o modo fora de serviço (apenas na versão de depuração)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Canal satélite LTE Force Camp (apenas na versão de depuração)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Modo satélite da operadora fictícia (apenas na versão de depuração)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Testar modo eSOS de satélite real (apenas na versão de depuração)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Teste o modo não eSOS de satélite real (apenas na versão de depuração)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Testar demonstração de modo eSOS de satélite (apenas na versão de depuração)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Ver livro de endereços do SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Ver números autorizados"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Ver números de marcação de serviços"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Atualizar"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Atualizar"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Ativar/desativar verificação de DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Informações/definições específicas de OEM"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC disponível (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR restrito (NSA):"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index c14b710..966aa15 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Configurações de chamadas"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"As configurações de chamada só podem ser alteradas pelo usuário administrador."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"As configurações da conta do smartphone só podem ser alteradas pelo administrador ou usuário no trabalho."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"O proprietário do dispositivo restringiu a opção de fazer mudanças nas configurações de rede móvel."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Configurações (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Erro de configuração da chamada"</string>
<string name="reading_settings" msgid="1605904432450871183">"Lendo as configurações…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Definir eSIM removível como padrão"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Potência do rádio celular"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simular o modo fora de serviço (somente build de depuração)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Forçar o canal LTE de satélite do grupo (somente build de depuração)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Simulação de modo satélite da operadora (somente build de depuração)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Testar o modo eSOS por satélite (somente build de depuração)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Testar o modo sem emergência de satélite real (somente build de depuração)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Testar a demonstração do modo eSOS por satélite (somente build de depuração)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Ver o catálogo de endereços do chip"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Ver números de discagem fixa"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Ver números de discagem do serviço"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Atualizar"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Atualizar"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Ativar/desativar verificação do DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Informações/configurações específicas de OEM"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC disponível (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR restrito (NSA):"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index c855de1..fd5cf37 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Setări pentru apeluri"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Numai administratorul poate să modifice setările pentru apeluri."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Setările contului de pe telefon pot fi modificate numai de administrator sau de un utilizator profesional."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Proprietarul dispozitivului a restricționat posibilitatea de a modifica setările pentru rețelele mobile."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Setări (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Eroare în setările pentru apeluri"</string>
<string name="reading_settings" msgid="1605904432450871183">"Se citesc setările..."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Setează cartela eSIM portabilă drept prestabilită"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Alimentare radio celular"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simulează modul în afara ariei de acoperire (numai în versiunea pentru remedierea erorilor)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Forțează canalul Camp Satellite LTE (numai versiunea pentru remedierea erorilor)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Mod Satelit al operatorului de testare (numai versiune pentru remedierea erorilor)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Testează modul eSOS prin satelit real (numai versiunea pentru remedierea erorilor)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Testează modul non-eSOS prin satelit real (numai versiunea pentru remedierea erorilor)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Testează modul demonstrativ eSOS prin satelit (numai versiunea pentru remedierea erorilor)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Afișează agenda de pe SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Afișează numerele pentru apeluri restricționate"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Vezi numere de apelare de serviciu"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Actualizează"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Actualizează"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Activează/dezactivează verificarea DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Informații/Setări caracteristice OEM"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"Disponibil EN-DC (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"Restricționat DCNR (NSA):"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index becc6aa..a5ceee8 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Настройки вызовов"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Настройки вызовов может изменить только основной пользователь"</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Настройки аккаунта на телефоне может изменить только работающий с ним сотрудник или администратор."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Владелец устройства ограничил возможность изменения настроек мобильной сети."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Настройки (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Ошибка настройки вызовов"</string>
<string name="reading_settings" msgid="1605904432450871183">"Чтение настроек…"</string>
@@ -306,7 +307,7 @@
<string name="carrier_settings_euicc_summary" msgid="2027941166597330117">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> – <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
<string name="mobile_data_settings_title" msgid="7228249980933944101">"Мобильный интернет"</string>
<string name="mobile_data_settings_summary" msgid="5012570152029118471">"Доступ к Интернету по мобильной сети"</string>
- <string name="data_usage_disable_mobile" msgid="5669109209055988308">"Отключить мобильный Интернет?"</string>
+ <string name="data_usage_disable_mobile" msgid="5669109209055988308">"Отключить мобильный интернет?"</string>
<string name="sim_selection_required_pref" msgid="6985901872978341314">"Выберите SIM-карту"</string>
<string name="sim_change_data_title" msgid="9142726786345906606">"Смена SIM-карты"</string>
<string name="sim_change_data_message" msgid="3567358694255933280">"Использовать для передачи данных по мобильной сети SIM-карту \"<xliff:g id="NEW_SIM">%1$s</xliff:g>\" (вместо \"<xliff:g id="OLD_SIM">%2$s</xliff:g>\")?"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Установить съемную eSIM-карту в качестве используемой по умолчанию"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Мощность радиосигнала"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Моделирование нахождения вне зоны обслуживания (только отладочная сборка)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Принудительно использовать спутниковый канал LTE (только для отладочной сборки)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Режим спутниковой связи симуляции оператора (только отладочная сборка)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Проверка спутникового режима eSOS (только отладочная сборка)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Проверка спутниковой связи в режиме, отличном от eSOS (только отладочная сборка)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Проверка демоверсии спутникового режима eSOS (только отладочная сборка)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Посмотреть адресную книгу на SIM-карте"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Список разрешенных номеров"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Посмотреть номера служебного набора"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Обновить"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Обновить"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Включить/отключить проверку DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Информация/настройки OEM"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC доступно (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR с ограничениями (NSA):"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 6fd6ff6..8c90fde 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"ඇමතුම් සැකසීම්"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"ඇමතුම් සැකසීම් වෙනස් කළ හැක්කේ පරිපාලක පරිශීලකයාට පමණි."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"දුරකථන ගිණුම් සැකසීම් වෙනස් කළ හැක්කේ පරිපාලක හෝ කාර්යාල පරිශීලකයාට පමණි."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"උපාංග හිමිකරු ජංගම ජාල සැකසීම් වෙනස් කිරීමේ හැකියාව සීමා කර ඇත."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"සැකසීම් (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"ඇමතුම් සැකසුම් දෝෂය"</string>
<string name="reading_settings" msgid="1605904432450871183">"සැකසුම් කියවමින්…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"ඉවත් කළ හැකි eSIM පෙරනිමිය ලෙස සකසන්න"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"ජංගම රේඩියෝ බලය"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"සේවයෙන් බැහැරව අනුකරණය කරන්න (නිදොස් තැනුම පමණි)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Force Camp Satellite LTE නාලිකාව (නිදොසීමේ තැනුම පමණි)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"ආදර්ශ වාහක චන්ද්රිකා ප්රකාරය (නිදොස් තැනීමට පමණි)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"සැබෑ චන්ද්රිකා eSOS ප්රකාරය පරීක්ෂා කරන්න (නිදොස් තැනීමට පමණි)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"සැබෑ චන්ද්රිකා eSOS නොවන ප්රකාරය පරීක්ෂා කරන්න (නිදොස් තැනීමට පමණි)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"ආදර්ශන චන්ද්රිකා eSOS ප්රකාරය පරීක්ෂා කරන්න (නිදොස් තැනීමට පමණි)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"SIM ලිපින පොත බලන්න"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"ස්ථාවර ඇමතුම් අංක පෙන්වන්න"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"සේවා ඩයල් කිරීමේ අංක පෙන්වන්න"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"යාවත්කාලීන කරන්න"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"නැවුම් කරන්න"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"DNS පරීක්ෂාව ටොගල කරන්න"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM-විශේෂිත තොරතුරු/සැකසීම්"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC තිබේ (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR සීමිතයි (NSA):"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index a0eac8b..9c446a4 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Nastavenia hovorov"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Nastavenia hovorov môže zmeniť iba používateľ s povoleniami správcu."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Nastavenia telefónneho účtu môže zmeniť iba správca alebo spravovaný používateľ."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Vlastník zariadenia obmedzil možnosť zmeny nastavení mobilnej siete."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Nastavenia (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Chyba nastavení hovorov"</string>
<string name="reading_settings" msgid="1605904432450871183">"Nastavenia sa načítavajú…"</string>
@@ -582,7 +583,7 @@
<string name="dialerKeyboardHintText" msgid="1115266533703764049">"Číslo vytočíte pomocou klávesnice."</string>
<string name="onscreenHoldText" msgid="4025348842151665191">"Podržať"</string>
<string name="onscreenEndCallText" msgid="6138725377654842757">"Koniec"</string>
- <string name="onscreenShowDialpadText" msgid="658465753816164079">"Číselná klávesnica"</string>
+ <string name="onscreenShowDialpadText" msgid="658465753816164079">"Číselník"</string>
<string name="onscreenMuteText" msgid="5470306116733843621">"Ignorovať"</string>
<string name="onscreenAddCallText" msgid="9075675082903611677">"Pridať hovor"</string>
<string name="onscreenMergeCallsText" msgid="3692389519611225407">"Zlúčiť hovory"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Nastaviť odoberateľnú eSIM kartu ako predvolenú"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Sila signálu GSM"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simulácia nefungujúceho zariadenia (možné iba v ladiacej zostave)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Vynútenie kanála Camp Satellite LTE (iba ladiaca zostava)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Simulácia satelitného režimu operátora (iba ladiaca zostava)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Testovať režim pomoci v tiesni cez skutočné satelity (iba ladiaca zostava)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Testovať štandardný režim cez skutočné satelity (iba ladiaca zostava)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Testovať režim pomoci v tiesni cez demo satelity (iba ladiaca zostava)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Zobraziť adresár SIM karty"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Zobraziť povolené čísla"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Zobraziť čísla volaní služieb"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Aktualizovať"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Obnoviť"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Prepnúť kontrolu DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Informácie alebo nastavenia špecifické pre výrobcu OEM"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"Dostupné EN-DC (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"Obmedzené DCNR (NSA):"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index ed4f6b3..46383b4 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Nastavitve klicev"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Nastavitve klicanja lahko spremeni samo uporabnik s skrbniškim dostopom."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Nastavitve računa telefona lahko spremeni samo uporabnik s skrbniškim ali službenim dostopom."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Lastnik naprave je omejil možnost spreminjanja nastavitev mobilnega omrežja."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Nastavitve (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Napaka nastavitev klicev"</string>
<string name="reading_settings" msgid="1605904432450871183">"Branje nastavitev …"</string>
@@ -597,8 +598,8 @@
<string name="importToFDNfromContacts" msgid="5068664870738407341">"Uvozi iz stikov"</string>
<string name="singleContactImportedMsg" msgid="3619804066300998934">"Uvožen je bil stik"</string>
<string name="failedToImportSingleContactMsg" msgid="228095510489830266">"Uvoz stika ni uspel"</string>
- <string name="hac_mode_title" msgid="4127986689621125468">"Slušni pripomočki"</string>
- <string name="hac_mode_summary" msgid="7774989500136009881">"Vključi združljivost s slušnimi pripomočki"</string>
+ <string name="hac_mode_title" msgid="4127986689621125468">"Slušni aparati"</string>
+ <string name="hac_mode_summary" msgid="7774989500136009881">"Vključi združljivost s slušnimi aparati"</string>
<string name="rtt_mode_title" msgid="3075948111362818043">"Klic s sprotnim besedilom (RTT)"</string>
<string name="rtt_mode_summary" msgid="8631541375609989562">"Dovoli izmenjavo sporočil v glasovnem klicu"</string>
<string name="rtt_mode_more_information" msgid="587500128658756318">"Funkcija RTT pomaga klicateljem, ki so gluhi, naglušni, imajo govorno motnjo ali potrebujejo več kot samo glas.<br> <a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>>Več o tem</a>\n <br><br> – Klici RTT se shranijo kot prepis sporočila\n <br> – RTT ni na voljo pri videoklicih"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Nastavi izmenljivo kartico e-SIM kot privzeto"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Moč radia mobilne naprave"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simulacija nedelovanja (samo za gradnjo za odpravljanje napak)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Satelitski kanal LTE za Force Camp (samo gradnja za odpravljanje napak)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Lažni satelitski način operaterja (samo gradnja za odpravljanje napak)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Preizkus pravega satelitskega načina eSOS (samo gradnja za odpravljanje napak)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Preizkus pravega satelitskega (nenujnega) načina eSOS (samo gradnja za odpravljanje napak)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Preizkus predstavitvenega satelitskega načina eSOS (samo gradnja za odpravljanje napak)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Prikaži imenik na kartici SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Prikaži številke za zaporo odhodnih klicev"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Prikaži številke za klicanje storitev"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Posodobi"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Osveži"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Preklop preverjanja DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Informacije/nastavitve za OEM"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"Razpoložljivo za EN-DC (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"Omejeno za DCNR (NSA):"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 9ce3ce3..5dc50c4 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Cilësimet e telefonatës"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Cilësimet e telefonatës mund të ndryshohen vetëm nga administratori."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Cilësimet e llogarisë të telefonit mund të ndryshohen vetëm nga administratori ose një përdorues në punë."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Zotëruesi i pajisjes ka kufizuar aftësinë për të ndryshuar cilësimet e rrjetit celular."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Cilësimet (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Gabim në cilësimet e telefonatës"</string>
<string name="reading_settings" msgid="1605904432450871183">"Po lexon cilësimet…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Caktoje kartën e lëvizshme eSIM si të parazgjedhur"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Fuqia e radios së rrjetit celular"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simulo gjendjen jashtë shërbimit (vetëm versioni i korrigjimit)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Detyro kanalin satelitor të LTE-së për kampin (vetëm versioni i korrigjimit)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Simulo modalitetin e satelitit të operatorit celular (vetëm versioni i korrigjimit)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Testo modalitetin real të \"eSOS satelitor\" (vetëm versioni i korrigjimit)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Testo modalitetin real satelitor jo për eSOS (vetëm versioni i korrigjimit)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Testo modalitetin e demonstrimit të \"eSOS satelitor\" (vetëm versioni i korrigjimit)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Shiko librin e adresave të kartës SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Shiko numrat me telefonim të përzgjedhur"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Shiko numrat e telefonit të shërbimit"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Përditëso"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Rifresko"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Ndrysho kontrollin e DNS-së"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Informacion/cilësime specifike për OEM"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC në dispozicion (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR me kufizime (NSA):"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 701cce8..7c70a74 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Подешавања позива"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Само кориснику са администраторским правима је дозвољено да мења подешавања позива."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Подешавања налога телефона може да промени само администратор или пословни корисник."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Власник уређаја је ограничио могућност промене подешавања мобилне мреже."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Подешавања (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Грешка у подешавањима позива"</string>
<string name="reading_settings" msgid="1605904432450871183">"Подешавања се учитавају…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Подеси преносиви eSIM као подразумевани"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Напајање за радио на мобилним уређајима"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Симулација не функционише (само верзија са отклоњеним грешкама)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Принудно примени сателит за камповање на LTE канал (само верзија за отклањање грешака)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Лажни режим мобилног оператера за слање преко сателита (само верзија за отклањање грешака)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Тестирајте стварни сателитски eSOS режим (само верзија са отклоњеним грешкама)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Тестирајте стварни сателитски режим који није eSOS (само верзија са отклоњеним грешкама)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Тестирајте демо верзију сателитског eSOS режима (само верзија са отклоњеним грешкама)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Прикажи адресар SIM-а"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Прикажи бројеве за фиксно бирање"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Прикажи бројеве за сервисно бирање"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Ажурирај"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Освежи"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Укључи/искључи проверу DNS-а"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Информације/подешавања специфична за произвођача оригиналне опреме"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC доступно (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR ограничено (NSA):"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 9f65b29..a5c21a2 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Samtalsinställningar"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Det är bara administratören som kan ändra samtalsinställningar."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Endast administratören eller arbetsanvändaren får ändra telefonens kontoinställningar."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Enhetens ägare har begränsat möjligheten att ändra inställningar för mobilnätverk."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Inställningar (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Felaktiga samtalsinställningar"</string>
<string name="reading_settings" msgid="1605904432450871183">"Läser inställningar…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Ställ in Flyttbart eSIM som standard"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Strömförsörjning för mobilradio"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Simulera ur funktion (endast felsökningsversion)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Force Camp Satellite LTE-kanal (endast felsökningsversion)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Simulering av operatörssatellitläge (version endast för felsökning)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Testa verkligt eSOS-satellitläge (endast felsökningsversion)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Testa verkligt icke-eSOS-satellitläge (endast felsökningsversion)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Testa demoläge för eSOS-satellit (endast felsökningsversion)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Visa SIM-adressbok"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Visa Fasta nummer"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Visa tjänstenummer"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Uppdatera"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Uppdatera"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Aktivera och inaktivera DNS-kontroll"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM-specifik information/inställningar"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC tillgängligt (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR begränsat (NSA):"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 1569803..2f3fdeb 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Mipangilio ya simu"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Mipangilio ya simu inaweza kubadilishwa na mtumiaji wa akaunti ya msimamizi."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Mipangilio ya akaunti ya simu inaweza tu kubadilishwa na msimamizi au mtumiaji wa kazini."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Mmiliki wa kifaa amezuia kubadilisha mipangilio ya mtandao wa simu."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Mipangilio (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Hitilafu ya mipangilio ya kupiga simu"</string>
<string name="reading_settings" msgid="1605904432450871183">"Inasoma mipangilio…."</string>
@@ -565,7 +566,7 @@
<string name="emergency_information_owner_hint" msgid="6256909888049185316">"Mmiliki"</string>
<string name="emergency_information_confirm_hint" msgid="5109017615894918914">"Gusa tena ili uangalie maelezo"</string>
<string name="emergency_enable_radio_dialog_title" msgid="2667568200755388829">"Simu ya dharura"</string>
- <string name="single_emergency_number_title" msgid="8413371079579067196">"Nambari ya dharura"</string>
+ <string name="single_emergency_number_title" msgid="8413371079579067196">"Namba ya dharura"</string>
<string name="numerous_emergency_numbers_title" msgid="8972398932506755510">"Nambari za dharura"</string>
<string name="emergency_call_shortcut_hint" msgid="1290485125107779500">"Gusa tena ili upige <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
<string name="emergency_enable_radio_dialog_message" msgid="1695305158151408629">"Inawasha redio..."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Weka eSIM Inayoweza Kuondolewa kama Chaguomsingi"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Nishati ya Redio ya Vifaa vya Mkononi"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Kifaa cha Kuiga Hakifanyi Kazi (Muundo wa Utatuzi pekee)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Chaneli ya Setilaiti ya LTE ya Force Camp (Muundo wa Utatuzi Pekee)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Hali ya Setilaiti ya Jaribio la Mtoa Huduma (Muundo wa Utatuzi pekee)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Kujaribu hali ya msaada halisi wa mtandaoni kupitia setilaiti (Muundo wa Utatuzi pekee)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Kujaribu hali ya non-eSOS kwenye setilaiti halisi (Muundo wa Utatuzi pekee)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Kujaribu hali ya eSOS kwenye setilaiti ya jaribio (Muundo wa Utatuzi pekee)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Angalia Kitabu cha Anwani katika SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Ona Nambari za Simu Zilizobainishwa"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Angalia Nambari Zilizowekwa na Mtoa Huduma"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Sasisha"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Onyesha upya"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Geuza Ukaguzi wa DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Maelezo/Mipangilio Mahususi kwa Kampuni Inayotengeneza Vifaa (OEM)"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC Inapatikana (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR Imedhibitiwa (NSA):"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index cb4c887..68c9b31 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"அழைப்பு அமைப்பு"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"நிர்வாகிப் பயனர் மட்டுமே அழைப்பிற்கான அமைப்புகளை மாற்ற முடியும்."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"நிர்வாகி/பணிக்கணக்கு பயனர் மட்டுமே அமைப்புகளை மாற்றலாம்."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"மொபைல் நெட்வொர்க் அமைப்புகளை மாற்றும் வசதியைச் சாதன உரிமையாளர் முடக்கியுள்ளார்."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"அமைப்புகள் (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"அழைப்பு அமைப்புகளில் பிழை"</string>
<string name="reading_settings" msgid="1605904432450871183">"அமைப்புகளைப் படிக்கிறது…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"அகற்றக்கூடிய eSIMமை இயல்பாக அமை"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"மொபைல் ரேடியோ பவர்"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"சாதனம் \'வேலை செய்யவில்லை\' என்பதை சிமுலேட் செய்தல் (பிழைதிருத்தப் பதிப்பில் மட்டும்)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"ஃபோர்ஸ் கேம்ப் சாட்டிலைட் LTE சேனல் (பிழைதிருத்தக் கட்டமைப்பு மட்டும்)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Mock மொபைல் நிறுவன சாட்டிலைட் பயன்முறை (பிழைதிருத்த பதிப்பு மட்டும்)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"அசல் சாட்டிலைட் eSOS பயன்முறை (பிழைதிருத்தப் பதிப்பு மட்டும்)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"அசல் சாட்டிலைட் eSOS அல்லாத பயன்முறையைப் பயன்படுத்திப் பாருங்கள் (பிழைதிருத்தப் பதிப்பு மட்டும்)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"டொமோ சாட்டிலைட் eSOS பயன்முறையைப் பரிசோதனை செய்தல் (பிழைதிருத்தப் பதிப்பு மட்டும்)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"சிம் முகவரிப் புத்தகத்தைக் காட்டு"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"நிலையான அழைப்பு எண்களைக் காட்டு"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"சேவை அழைப்பு எண்களைக் காட்டு"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"புதுப்பி"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"புதுப்பி"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"DNS சரிபார்ப்பை நிலைமாற்று"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM சார்ந்த தகவல்/அமைப்புகள்"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC உள்ளது (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR கட்டுப்படுத்தப்பட்டது (NSA):"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index f6acedf..1a7faf6 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"కాల్ సెట్టింగ్లు"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"కాల్ సెట్టింగ్లను నిర్వాహక వినియోగదారు మాత్రమే మార్చగలరు."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"ఫోన్ ఖాతా సెట్టింగ్లను అడ్మిన్ లేదా వర్క్ యూజర్ మాత్రమే మార్చగలరు."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"పరికర ఓనర్ మొబైల్ నెట్వర్క్ సెట్టింగ్లను మార్చగల సామర్థ్యాన్ని పరిమితం చేశారు."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"సెట్టింగ్లు (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"కాల్ సెట్టింగ్ల ఎర్రర్"</string>
<string name="reading_settings" msgid="1605904432450871183">"సెట్టింగ్లను చదువుతోంది…"</string>
@@ -382,9 +383,9 @@
<string name="enable_disable_atr" msgid="821714821057385390">"ప్రాంతపు ట్రాఫిక్ రిపోర్ట్లు"</string>
<string name="atr_enable" msgid="1799097759998768186">"ప్రాంతపు ట్రాఫిక్ రిపోర్ట్లు ప్రారంభించబడ్డాయి"</string>
<string name="atr_disable" msgid="6456758173289065766">"ప్రాంతపు ట్రాఫిక్ రిపోర్ట్లు నిలిపివేయబడ్డాయి"</string>
- <string name="enable_disable_lafs" msgid="7448060358300805661">"స్థానిక విమానాశ్రయ విమాన షెడ్యూల్లు"</string>
- <string name="lafs_enable" msgid="3125783406052655690">"స్థానిక విమానాశ్రయ విమాన షెడ్యూల్లు ప్రారంభించబడ్డాయి"</string>
- <string name="lafs_disable" msgid="7326815066813851447">"స్థానిక విమానాశ్రయ విమాన షెడ్యూల్లు నిలిపివేయబడ్డాయి"</string>
+ <string name="enable_disable_lafs" msgid="7448060358300805661">"స్థానిక విమానాశ్రయ విమాన షెడ్యూళ్లు"</string>
+ <string name="lafs_enable" msgid="3125783406052655690">"స్థానిక విమానాశ్రయ విమాన షెడ్యూళ్లు ప్రారంభించబడ్డాయి"</string>
+ <string name="lafs_disable" msgid="7326815066813851447">"స్థానిక విమానాశ్రయ విమాన షెడ్యూళ్లు నిలిపివేయబడ్డాయి"</string>
<string name="enable_disable_restaurants" msgid="3873247081569423019">"రెస్టారెంట్లు"</string>
<string name="restaurants_enable" msgid="5810452674239139572">"రెస్టారెంట్లు ప్రారంభించబడ్డాయి"</string>
<string name="restaurants_disable" msgid="2733507854548413505">"రెస్టారెంట్లు నిలిపివేయబడ్డాయి"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"తీసివేయగలిగే eSIMని ఆటోమేటిక్ సెట్టింగ్గా సెట్ చేయండి"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"మొబైల్ రేడియో పవర్"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"పరికరాన్ని సిమ్యులేట్ చేయడం అందుబాటులో లేదు (డీబగ్ బిల్డ్ మోడ్లో మాత్రమే)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"ఫోర్స్ క్యాంప్ శాటిలైట్ LTE ఛానెల్ (డీబగ్ బిల్డ్ మోడ్లో మాత్రమే)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"మాక్ క్యారియర్ శాటిలైట్ మోడ్ (డీబగ్ బిల్డ్ మోడ్లో మాత్రమే)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"రియల్ శాటిలైట్ eSOS మోడ్ను టెస్ట్ చేయండి (డీబగ్ బిల్డ్ మోడ్లో మాత్రమే)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"రియల్ శాటిలైట్ eSOS యేతర మోడ్ను టెస్ట్ చేయండి (డీబగ్ బిల్డ్ మోడ్లో మాత్రమే)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"డెమో శాటిలైట్ eSOS మోడ్ను టెస్ట్ చేయండి (డీబగ్ బిల్డ్ మోడ్లో మాత్రమే)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"SIM అడ్రస్ పుస్తకాన్ని చూడండి"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"ఫిక్స్డ్ డయలింగ్ నంబర్లను చూడండి"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"సర్వీస్ డయలింగ్ నంబర్లను చూడండి"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"అప్డేట్ చేయండి"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"రిఫ్రెష్ చేయండి"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"DNS తనిఖీని టోగుల్ చేయండి"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM-నిర్దిష్ట సమాచారం/సెట్టింగ్లు"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC అందుబాటులో ఉన్న (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR పరిమితం చేయబడిన (NSA):"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 8d78212..45b5bcf 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"การตั้งค่าการโทร"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"ผู้ใช้ระดับผู้ดูแลระบบเท่านั้นที่สามารถเปลี่ยนแปลงการตั้งค่าการโทรได้"</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"เฉพาะผู้ดูแลระบบหรือผู้ใช้ที่ทำงานเท่านั้นที่สามารถเปลี่ยนการตั้งค่าบัญชีของโทรศัพท์ได้"</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"เจ้าของอุปกรณ์ได้จำกัดความสามารถในการเปลี่ยนการตั้งค่าเครือข่ายมือถือ"</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"การตั้งค่า (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"ข้อผิดพลาดในการตั้งค่าการโทร"</string>
<string name="reading_settings" msgid="1605904432450871183">"กำลังประมวลการตั้งค่า…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"กำหนดให้ eSIM แบบนำออกได้เป็นค่าเริ่มต้น"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"กำลังส่งของวิทยุเครือข่ายมือถือ"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"จําลองความไม่พร้อมให้บริการ (บิลด์การแก้ไขข้อบกพร่องเท่านั้น)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"บังคับใช้แชนเนล LTE ของ Camp Satellite (บิลด์การแก้ไขข้อบกพร่องเท่านั้น)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"โหมดดาวเทียมของผู้ให้บริการจำลอง (บิลด์การแก้ไขข้อบกพร่องเท่านั้น)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"ทดสอบโหมด eSOS ของดาวเทียมจริง (บิลด์การแก้ไขข้อบกพร่องเท่านั้น)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"ทดสอบโหมด non-eSOS ของดาวเทียมจริง (บิลด์การแก้ไขข้อบกพร่องเท่านั้น)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"ทดสอบโหมด eSOS ของดาวเทียมเดโม (บิลด์การแก้ไขข้อบกพร่องเท่านั้น)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"ดูสมุดที่อยู่ของซิม"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"ดูการจำกัดหมายเลขโทรออก"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"ดูหมายเลขรับบริการโทรออก"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"อัปเดต"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"รีเฟรช"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"สลับการตรวจสอบ DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"ข้อมูล/การตั้งค่าเฉพาะตาม OEM"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC ที่พร้อมใช้งาน (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR ที่จำกัด (NSA):"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 578c3f4..d64fb8f 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Mga setting ng tawag"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Ang admin user lang ang maaaring magbago sa mga setting ng tawag."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Ang admin o user sa trabaho lang ang puwedeng magbago sa mga setting ng account ng telepono."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Pinaghigpitan ng may-ari ng device ang kakayahang baguhin ang mga setting ng mobile network."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Mga Setting (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Error sa mga setting ng tawag"</string>
<string name="reading_settings" msgid="1605904432450871183">"Binabasa ang mga setting…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Itakda na Default ang Naaalis na eSIM"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Mobile Radio Power"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Mag-simulate ng Hindi Gumagana (Build sa Pag-debug lang)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Ipilit ang Camp Satellite LTE Channel (Build sa Pag-debug lang)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Satellite Mode ng Mock Carrier (Debug Build lang)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Test real satellite eSOS mode (Build sa Pag-debug lang)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Test real satellite non-eSOS mode (Build sa Pag-debug lang)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Test demo satellite eSOS mode (Build sa Pag-debug lang)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Tingnan ang Address Book ng SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Tingnan ang Mga Fixed Dialing Number"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Tingnan ang Mga Service Dialing Number"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"I-update"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"I-refresh"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"I-toggle ang DNS Check"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Impormasyon/Mga Setting na partikular sa OEM"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"Available ang EN-DC (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"Pinaghihigpitang DCNR (NSA):"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index a5757ce..c742631 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Çağrı ayarları"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Çağrı ayarları sadece yönetici tarafından değiştirilebilir."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Telefon hesabı ayarları, yalnızca yönetici veya iş kullanıcısı tarafından değiştirilebilir."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Cihaz sahibi, mobil ağ ayarlarını değiştirme özelliğini kısıtladı."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Ayarlar (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Çağrı ayarları hatası"</string>
<string name="reading_settings" msgid="1605904432450871183">"Ayarlar okunuyor..."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Çıkarılabilir eSIM\'i Varsayılan Yap"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Mobil Radyo Gücü"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Hizmet Dışı Simülasyonu (Yalnızca Hata Ayıklama Derlemesi)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Kamp uydusu LTE kanalını zorunlu kılma (yalnızca hata ayıklama derlemesi)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Örnek operatör uydu modu (yalnızca hata ayıklama derlemesi)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Gerçek uydu eSOS modunu test et (yalnızca hata ayıklama derlemesi)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Gerçek uydu üzerinde eSOS olmayan modu test et (yalnızca hata ayıklama derlemesi)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Demo uydu üzerinde eSOS modunu test et (yalnızca hata ayıklama derlemesi)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"SIM Adres Defterini Görüntüle"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Sabit Arama Numaralarını Görüntüle"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Hizmet Arama Numaralarını Görüntüle"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Güncelle"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Yenile"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"DNS Denetimini Aç/Kapat"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM\'e Özgü Bilgiler/Ayarlar"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC Kullanılabilir (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR Kısıtlanmış (NSA):"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index ff4f765..76b2a04 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Налаштування викликів"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Налаштування викликів може змінювати лише адміністратор."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Налаштування облікового запису телефона може змінювати лише співробітник, який із ним працює, або адміністратор."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Власник пристрою заборонив змінювати налаштування мобільної мережі."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Налаштування (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Помилка налаштування викликів"</string>
<string name="reading_settings" msgid="1605904432450871183">"Читання налаштувань…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Установити знімну eSIM-карту як карту за умовчанням"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Потужність мобільного радіо"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Імітація знаходження поза зоною обслуговування (лише складання для налагодження)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Примусово застосувати супутниковий зв’язок із каналом LTE (лише для налагодження)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Режим супутника оператора Mock (лише складання для налагодження)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Тестувати реальний режим супутникового сигналу SOS (лише складання для налагодження)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Тестувати реальний режим супутникового сигналу, відмінного від SOS (лише складання для налагодження)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Тестування демоверсії супутникового сигналу SOS (складання лише для налагодження)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Переглянути адресну книгу SIM-карти"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Переглянути фіксовані номери"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Переглянути службові номери"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Оновити"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Оновити"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Увімк./вимк. перевірку DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Інформація/налаштування OEM"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"З доступом EN-DC (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"З обмеженням DCNR (NSA):"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 1d67bbb..cc704cb 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"کال کی ترتیبات"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"صرف منتظم صارف ہی کال کی ترتیبات تبدیل کر سکتا ہے۔"</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"صرف منتظم یا دفتر کا صارف ہی فون کے اکاؤنٹ کی ترتیبات تبدیل کر سکتا ہے۔"</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"آلہ کے مالک نے موبائل نیٹ ورک کی ترتیبات کو تبدیل کرنے کی صلاحیت کو محدود کر دیا ہے۔"</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"ترتیبات (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"کال کی ترتیبات کی خرابی"</string>
<string name="reading_settings" msgid="1605904432450871183">"ترتیبات کو پڑھ رہا ہے…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"ہٹانے لائق eSIM کو بطور ڈیفالٹ سیٹ کریں"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"موبائل ریڈیو پاور"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"\'سروس دستیاب نہیں ہے\' موڈ کو سمیولیٹ کریں (صرف ڈیبگ بلڈ کیلئے)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"فورس کیمپ سیٹلائٹ LTE چینل (صرف ڈیبگ بلڈ)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"موک کیریئر سیٹلائٹ موڈ (صرف ڈیبگ بلڈ)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"اصل سیٹلائٹ eSOS وضع کی جانچ کریں (صرف ڈیبگ بلڈ)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"اصل سیٹلائٹ غیر eSOS وضع کی جانچ کریں (صرف ڈیبگ بلڈ)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"ڈیمو سیٹلائٹ eSOS وضع کی جانچ کریں (صرف ڈیبگ بلڈ)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"SIM ایڈریس بک دیکھیں"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"فکسڈ ڈائلنگ نمبرز دیکھیں"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"سروس ڈائلنگ نمبرز دیکھیں"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"اپ ڈیٹ کریں"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"ریفریش کریں"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"DNS چیک ٹوگل کریں"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM-کیلئے مخصوص معلومات/ترتیبات"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC دستیاب (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR محدود (NSA):"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 22d7094..346373d 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Chaqiruv sozlamalari"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Faqat administrator qo‘ng‘iroq sozlamalarini o‘zgartirishi mumkin."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Telefondagi hisob sozlamalarini faqat administrator yoki ishxona foydalanuvchisi oʻzgartirishi mumkin."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Qurilma egasi mobil tarmoq sozlamalarini oʻzgartirish imkoniyatini cheklagan."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Sozlamalar (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Chaqiruv sozlamalarida xato"</string>
<string name="reading_settings" msgid="1605904432450871183">"Sozlamalar olinmoqda…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Olinadigan eSIM kartani birlamchi qilib belgilash"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Radio signal quvvati"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Xizmatdan tashqari simulyatsiya (faqat nosozliklarni aniqlash dasturi uchun)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Majburiy Camp sputnik LTE kanali (faqat debag nashrida)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Soxta operator sputnik rejimi (faqat debag nashrida)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Haqiqiy sputnik eSOS rejimini sinash (faqat debag nashrida)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Haqiqiy sputnik non-eSOS rejimini sinash (faqat debag nashrida)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Demo sputnik eSOS rejimini sinash (faqat debag nashrida)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"SIM kartadagi abonentlar ro‘yxatini ochish"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Ruxsat etilgan raqamlar ro‘yxatini ochish"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Xizmatlarni terish raqamlarini ochish"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Yangilash"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Yangilash"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"DNS tekshiruvini yoqish/o‘chirish"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM maxsus axboroti va sozlamalari"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC mavjud (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR: cheklovlar mavjud (NSA):"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 11f8645..ecf73bd 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Cài đặt cuộc gọi"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Chỉ người dùng quản trị mới có thể thay đổi cài đặt cuộc gọi."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Chỉ quản trị viên hoặc người dùng tài khoản cho công việc mới có thể thay đổi chế độ cài đặt tài khoản điện thoại."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Chủ sở hữu thiết bị đã hạn chế khả năng thay đổi chế độ cài đặt mạng di động."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Cài đặt (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Lỗi cài đặt cuộc gọi"</string>
<string name="reading_settings" msgid="1605904432450871183">"Đang đọc các tùy chọn cài đặt…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Đặt eSIM có thể tháo rời là Mặc định"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Cường độ của sóng di động"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Mô phỏng thiết bị không hoạt động (chỉ dành cho bản gỡ lỗi)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Buộc sử dụng kênh LTE vệ tinh khi cắm trại (chỉ dành cho Bản gỡ lỗi)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Mô phỏng chế độ vệ tinh của nhà mạng (chỉ dành cho Bản gỡ lỗi)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Thử nghiệm chế độ eSOS thực tế qua vệ tinh (chỉ bản gỡ lỗi)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Thử nghiệm chế độ không khẩn cấp thực tế qua vệ tinh (chỉ dành cho bản gỡ lỗi)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Thử nghiệm chế độ eSOS minh hoạ qua vệ tinh (chỉ dành cho bản gỡ lỗi)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Xem sổ địa chỉ trên SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Xem số gọi định sẵn"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Xem số quay số dịch vụ"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Cập nhật"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Làm mới"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Bật/tắt chế độ kiểm tra DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Thông tin/Cài đặt dành riêng cho OEM"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"Hỗ trợ EN-DC (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"Hạn chế DCNR (NSA):"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 3bd3f35..fd61507 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"通话设置"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"只有管理员用户才能更改通话设置。"</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"电话账号设置只能由管理员或工作资料用户更改。"</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"设备所有者对更改移动网络设置的功能进行了限制。"</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"设置(<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"通话设置出错"</string>
<string name="reading_settings" msgid="1605904432450871183">"正在读取设置..."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"将可卸载的 eSIM 卡设为默认 eSIM 卡"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"移动无线装置电源"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"模拟服务终止(仅限调试 build)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"强制使用 Camp 卫星 LTE 信道(仅限调试 Build)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"模拟运营商卫星模式(仅限调试 build)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"测试真实的卫星 eSOS 模式(仅限调试 build)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"测试真实的卫星非 eSOS 模式(仅限调试 build)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"测试卫星 eSOS 演示模式(仅限调试 build)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"查看 SIM 卡通讯录"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"查看固定拨号号码"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"查看服务拨号号码"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"更新"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"刷新"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"切换 DNS 检查"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"特定 OEM 的信息/设置"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC 可用 (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR 受限 (NSA):"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index f3e2633..30d09ed 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"通話設定"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"只有管理員可以變更通話設定。"</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"只有管理員或工作設定檔使用者才可以變更手機帳戶設定。"</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"裝置擁有者已限制變更流動網絡設定的能力。"</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"設定 (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"通話設定錯誤"</string>
<string name="reading_settings" msgid="1605904432450871183">"正在讀取設定..."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"將可移除的 eSIM 卡設為預設值"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"流動無線電的電源"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"模擬沒有服務 (僅限偵錯版本)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Force Camp 衛星 LTE 頻道 (僅限偵錯版本)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"模擬流動網絡供應商衛星模式 (僅限偵錯版本)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"測試「緊急衛星連接」真實模式 (僅限偵錯版本)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"測試「非緊急衛星連接」真實模式 (僅限偵錯版本)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"測試「緊急衛星連接」試用模式 (僅限偵錯版本)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"查看 SIM 卡通訊錄"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"查看固定撥號"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"查看服務撥號"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"更新"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"重新整理"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"切換 DNS 檢查"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"OEM 專用資訊/設定"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC 可用 (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR 受限 (NSA):"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 38ab780..838cbe7 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"通話設定"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"只有管理員使用者可以變更通話設定。"</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"只有管理員或公司內部使用者可以變更手機帳戶設定。"</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"裝置擁有者限制了變更行動網路設定的功能。"</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"設定 (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"通話設定錯誤"</string>
<string name="reading_settings" msgid="1605904432450871183">"正在讀取設定…"</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"將可移除的 eSIM 卡設為預設 eSIM 卡"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"行動無線電電源"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"模擬無法使用服務的情況 (僅限偵錯版本)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"強制執行 Camp 衛星 LTE 頻道 (僅限偵錯版本)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"模擬電信業者衛星模式 (僅限偵錯版本)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"實際測試衛星緊急求救模式 (僅限偵錯版本)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"實際測試衛星非緊急求救模式 (僅限偵錯版本)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"測試衛星緊急求救展示模式 (僅限偵錯版本)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"查看 SIM 通訊錄"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"查看固定撥號"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"查看服務撥號號碼"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"更新"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"重新整理"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"切換 DNS 檢查"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"原始設備製造商 (OEM) 專用資訊/設定"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"EN-DC 可使用 (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"DCNR 受限 (NSA):"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 19f0e81..2ec8c18 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -134,6 +134,7 @@
<string name="updating_title" msgid="6130548922615719689">"Izilungiselelo zekholi"</string>
<string name="call_settings_admin_user_only" msgid="7238947387649986286">"Izilungiselelo zekholi zingaguqulwa kuphela ngumsebenzisi oyinhloko."</string>
<string name="phone_account_settings_user_restriction" msgid="9142685151087208396">"Amasethingi e-akhawunti yefoni angashintshwa kuphela umphathi noma umsebenzisi wasemsebenzini."</string>
+ <string name="phone_account_no_config_mobile_networks" msgid="7351062247756521227">"Umnikazi wedivayisi ukhawule amandla okushintsha amasethingi enethiwekhi yeselula."</string>
<string name="call_settings_with_label" msgid="8460230435361579511">"Izilungiselelo (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="2024290892676808965">"Iphutha lokulungiselela ikholi"</string>
<string name="reading_settings" msgid="1605904432450871183">"Ifunda izilungiselelo..."</string>
@@ -844,8 +845,11 @@
<string name="removable_esim_string" msgid="7931369811671787649">"Setha i-eSim Esusekayo Njengezenzakalelayo"</string>
<string name="radio_info_radio_power" msgid="8805595022160471587">"Amandla erediyo yeselula"</string>
<string name="simulate_out_of_service_string" msgid="7787925611727597193">"Lingisa okuthi Ayikho Isevisi (Umakhiwo Wokususa Iphutha kuphela)"</string>
- <!-- no translation found for mock_carrier_roaming_satellite_string (4796300252858292593) -->
- <skip />
+ <string name="enforce_satellite_channel_string" msgid="295306734591329892">"Isiteshi se-Force Camp Satellite LTE (Ukwakhiwa Kokususa Iphutha kuphela)"</string>
+ <string name="mock_carrier_roaming_satellite_string" msgid="4796300252858292593">"Imodi Yesethelayithi Yenkampani Yenethiwekhi ye-Mock (Susa Iphutha Esakhiweni kuphela)"</string>
+ <string name="esos_satellite_string" msgid="7274794226125968657">"Hlola imodi yesathelayithi yangempela ye-eSOS (Ukwakhiwa Kokususa Iphutha kuphela)"</string>
+ <string name="satellite_enable_non_emergency_mode_string" msgid="9005332650950637932">"Hlola imodi yesathelayithi yangempela ekungesiyo ye-eSOS (Ukwakhiwa Kokususa Iphutha kuphela)"</string>
+ <string name="demo_esos_satellite_string" msgid="2941811482168709730">"Hlola imodi yesathelayithi yedemo ye-eSOS (Ukwakhiwa Kokususa Iphutha kuphela)"</string>
<string name="radioInfo_menu_viewADN" msgid="4533179730908559846">"Buka incwadi yekheli le-SIM"</string>
<string name="radioInfo_menu_viewFDN" msgid="1847236480527032061">"Buka Izinombolo Zokudayela Okungaguquki"</string>
<string name="radioInfo_menu_viewSDN" msgid="2613431584522392842">"Buka Izinombolo Zokudayela Isevisi"</string>
@@ -912,7 +916,6 @@
<string name="radio_info_smsc_label" msgid="3749927072726033763">"SMSC:"</string>
<string name="radio_info_smsc_update_label" msgid="5141996256097115753">"Buyekeza"</string>
<string name="radio_info_smsc_refresh_label" msgid="8409923721451604560">"Vuselela"</string>
- <string name="radio_info_toggle_dns_check_label" msgid="1394078554927787350">"Guqula ukuhlola i-DNS"</string>
<string name="oem_radio_info_label" msgid="2914167475119997456">"Ulwazi oucacile kwe-OEM/Izilungiselelo"</string>
<string name="radio_info_endc_available" msgid="2983767110681230019">"I-EN-DC Iyatholakala (NSA):"</string>
<string name="radio_info_dcnr_restricted" msgid="7147511536420148173">"Ikhawulewe nge-DCNR (NSA):"</string>
diff --git a/res/values/config.xml b/res/values/config.xml
index 5dae649..847c4c5 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -157,6 +157,8 @@
<string name="mobile_network_settings_package" translatable="false">com.android.settings</string>
<!-- Class name for the mobile network settings activity [DO NOT TRANSLATE] -->
<string name="mobile_network_settings_class" translatable="false">com.android.settings.Settings$MobileNetworkActivity</string>
+ <!-- Class name for the SIMs settings activity [DO NOT TRANSLATE] -->
+ <string name="sims_settings_class" translatable="false">com.android.settings.Settings$MobileNetworkListActivity</string>
<!-- CDMA activation goes through HFA -->
<!-- DEPRECATED: Use CarrierConfigManager#KEY_USE_HFA_FOR_PROVISIONING_BOOL -->
@@ -328,6 +330,16 @@
<item>sg</item>
<!-- b/198393826 -->
<item>de</item>
+ <!-- b/334773484 -->
+ <item>gb</item>
+ <item>fr</item>
+ <item>be</item>
+ <item>ro</item>
+ <item>si</item>
+ <item>hr</item>
+ <item>gr</item>
+ <item>bg</item>
+ <item>my</item>
</string-array>
<!-- Array of countries that a normal service capable subscription is preferred
@@ -337,6 +349,8 @@
<!-- b/317945295 -->
<item>in</item>
<item>sg</item>
+ <!-- b/341611911 -->
+ <item>my</item>
</string-array>
<!-- Array of countries that a CS preferred scan is preferred after CSFB failure
@@ -348,8 +362,36 @@
<item>us</item>
</string-array>
+ <!-- Array of countries that GERAN is preferred than UTRAN and EUTRAN when SIM is absent.
+ Values should be ISO3166 country codes in lowercase. -->
+ <string-array name="config_countries_prefer_geran_when_sim_absent"
+ translatable="false">
+ <!-- b/335537430 -->
+ <item>cn</item>
+ </string-array>
+
+ <!-- Dynamic routing of emergency calls: trying normal routing if it's available.
+ Otherwise, emergency routing. -->
+ <!-- TODO (b/346398725: temporary code, cleanup) -->
+ <bool name="dynamic_routing_emergency_enabled">false</bool>
+
+ <!-- Array of countries that the dynamic routing is supported.
+ Values should be ISO3166 country codes in lowercase. -->
+ <string-array name="config_countries_dynamic_routing_emergency_enabled"
+ translatable="false">
+ </string-array>
+
+ <!-- Array of emergency numbers for dynamic routing.
+ Values are the tuples of Country ISO, MNC, and numbers. -->
+ <string-array name="config_dynamic_routing_emergency_numbers"
+ translatable="false">
+ </string-array>
+
<!-- The component name(a flattened ComponentName string) for the telephony domain selection
service. The device should fallback to the modem based domain selection architecture
if this is not configured. -->
<string name="config_domain_selection_service_component_name" translatable="false"></string>
+
+ <!-- Whether to turn off OEM-enabled satellite during emergency call -->
+ <bool name="config_turn_off_oem_enabled_satellite_during_emergency_call">false</bool>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 05bcbc1..43fc09e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -291,6 +291,8 @@
<string name="call_settings_admin_user_only">Call settings can only be changed by the admin user.</string>
<!-- Toast in Phone Account settings when asked to launch settings for a secondary/guest user -->
<string name="phone_account_settings_user_restriction">Phone account settings can only be changed by the admin or work user.</string>
+ <!-- Toast in Phone Account settings when asked to launch settings when DISALLOW_CONFIG_MOBILE_NETWORKS is true -->
+ <string name="phone_account_no_config_mobile_networks">The device owner has restricted the ability to change mobile network settings.</string>
<!-- Title of the "Call settings" settings screen, with a text label identifying which SIM the settings are for. -->
<string name="call_settings_with_label">Settings (<xliff:g id="subscriptionlabel" example="Mock Carrier">%s</xliff:g>)</string>
<!-- Title of the alert dialog displayed if an error occurs while updating Call settings -->
@@ -2026,8 +2028,17 @@
<!-- Title for simulating device out of service. -->
<string name="simulate_out_of_service_string">Simulate Out of Service (Debug Build only)</string>
+ <!-- Title for enforcing satellite channels. -->
+ <string name="enforce_satellite_channel_string">Force Camp Satellite LTE Channel (Debug Build only)</string>
+
<!-- Title for simulating SIM capable of satellite. -->
<string name="mock_carrier_roaming_satellite_string">Mock Carrier Satellite Mode (Debug Build only)</string>
+ <!-- Title for trigger real satellite eSOS. -->
+ <string name="esos_satellite_string">Test real satellite eSOS mode (Debug Build only)</string>
+ <!-- Title for enable real satellite non-emergency mode. -->
+ <string name="satellite_enable_non_emergency_mode_string">Test real satellite non-eSOS mode (Debug Build only)</string>
+ <!-- Title for trigger demo satellite eSOS. -->
+ <string name="demo_esos_satellite_string">Test demo satellite eSOS mode (Debug Build only)</string>
<!-- Phone Info screen. Menu item label. Used for diagnostic info screens, precise translation isn't needed -->
<string name="radioInfo_menu_viewADN">View SIM Address Book</string>
@@ -2175,7 +2186,6 @@
<!-- Radio Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed -->
<string name="radio_info_smsc_refresh_label">Refresh</string>
<!-- Radio Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed -->
- <string name="radio_info_toggle_dns_check_label">Toggle DNS Check</string>
<!-- Radio Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed -->
<string name="oem_radio_info_label">OEM-specific Info/Settings</string>
<!-- Radio Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 435e3a6..088a5a7 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -369,4 +369,9 @@
<item name="android:textColor">@android:color/white</item>
<item name="android:textSize">@dimen/emergency_shortcut_tap_hint_text_size</item>
</style>
+
+ <!-- <style name="RadioInfoTheme" parent="@android:style/Theme.DeviceDefault.DayNight">-->
+ <style name="RadioInfoTheme" parent="Theme.AppCompat.DayNight">
+ <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
+ </style>
</resources>
diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index 145df41..1c55256 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -35,6 +35,7 @@
import android.os.HandlerExecutor;
import android.os.Looper;
import android.os.PersistableBundle;
+import android.os.UserHandle;
import android.os.UserManager;
import android.preference.Preference;
import android.preference.PreferenceActivity;
@@ -58,6 +59,7 @@
import com.android.ims.ImsManager;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneConstants;
+import com.android.internal.telephony.flags.Flags;
import com.android.phone.settings.PhoneAccountSettingsFragment;
import com.android.phone.settings.SuppServicesUiUtil;
import com.android.phone.settings.VoicemailSettingsActivity;
@@ -113,6 +115,7 @@
private PreferenceScreen mVoicemailSettingsScreen;
private SwitchPreference mEnableVideoCalling;
private Preference mButtonWifiCalling;
+ private boolean mDisallowedConfig = false;
/*
* Click Listeners, handle click based on objects attached to UI.
@@ -231,7 +234,7 @@
getString(R.string.mobile_network_settings_package),
getString(R.string.mobile_network_settings_class));
intent.setComponent(mobileNetworkSettingsComponent);
- startActivity(intent);
+ startActivityAsUser(intent, UserHandle.CURRENT);
}
};
builder.setMessage(getResourcesForSubId().getString(
@@ -263,6 +266,14 @@
return;
}
+ // Check if mobile network configs are restricted.
+ if (Flags.ensureAccessToCallSettingsIsRestricted() &&
+ userManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)) {
+ mDisallowedConfig = true;
+ Log.i(LOG_TAG, "Mobile network configs are restricted, disabling mobile network "
+ + "settings");
+ }
+
mSubscriptionInfoHelper = new SubscriptionInfoHelper(this, getIntent());
mPhone = mSubscriptionInfoHelper.getPhone();
mSubscriptionInfoHelper.setActionBarTitle(
@@ -467,7 +478,7 @@
if (mImsMgr.isVtEnabledByPlatform() && mImsMgr.isVtProvisionedOnDevice()
&& (carrierConfig.getBoolean(
CarrierConfigManager.KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS)
- || isDataEnabled)) {
+ || isDataEnabled) && !mDisallowedConfig) {
boolean currentValue =
mImsMgr.isEnhanced4gLteModeSettingEnabledByUser()
? mImsMgr.isVtEnabledByUser() : false;
@@ -612,7 +623,7 @@
Intent intent = subscriptionInfoHelper.getIntent(CallFeaturesSetting.class);
intent.setAction(Intent.ACTION_MAIN);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
- activity.startActivity(intent);
+ activity.startActivityAsUser(intent, UserHandle.CURRENT);
activity.finish();
}
diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 9b71919..c6c26b0 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -44,9 +44,9 @@
import android.os.Message;
import android.os.PermissionEnforcer;
import android.os.PersistableBundle;
-import android.os.Process;
import android.os.RemoteException;
import android.os.ResultReceiver;
+import android.os.SystemProperties;
import android.os.UserHandle;
import android.preference.PreferenceManager;
import android.service.carrier.CarrierIdentifier;
@@ -698,6 +698,7 @@
@NonNull private final FeatureFlags mFeatureFlags;
@NonNull private final PackageManager mPackageManager;
+ private final int mVendorApiLevel;
/**
* Constructs a CarrierConfigLoader, registers it as a service, and registers a broadcast
@@ -736,6 +737,8 @@
}
mFeatureFlags = featureFlags;
mPackageManager = context.getPackageManager();
+ mVendorApiLevel = SystemProperties.getInt(
+ "ro.vendor.api_level", Build.VERSION.DEVICE_INITIAL_SDK_INT);
logd("CarrierConfigLoader has started");
PhoneConfigurationManager.registerForMultiSimConfigChange(
@@ -1341,7 +1344,10 @@
return new PersistableBundle();
}
- enforceTelephonyFeatureWithException(callingPackage, "getConfigForSubIdWithFeature");
+ if (!mContext.getResources().getBoolean(
+ com.android.internal.R.bool.config_force_phone_globals_creation)) {
+ enforceTelephonyFeatureWithException(callingPackage, "getConfigForSubIdWithFeature");
+ }
int phoneId = SubscriptionManager.getPhoneId(subscriptionId);
PersistableBundle retConfig = CarrierConfigManager.getDefaultConfig();
@@ -1491,10 +1497,8 @@
if (!SubscriptionManager.isValidPhoneId(phoneId)) {
final String msg =
"Ignore invalid phoneId: " + phoneId + " for subId: " + subscriptionId;
- if (mFeatureFlags.addAnomalyWhenNotifyConfigChangedWithInvalidPhone()) {
- AnomalyReporter.reportAnomaly(
- UUID.fromString(UUID_NOTIFY_CONFIG_CHANGED_WITH_INVALID_PHONE), msg);
- }
+ AnomalyReporter.reportAnomaly(
+ UUID.fromString(UUID_NOTIFY_CONFIG_CHANGED_WITH_INVALID_PHONE), msg);
logd(msg);
throw new IllegalArgumentException(msg);
}
@@ -1754,12 +1758,14 @@
private void enforceCallerIsSystemOrRequestingPackage(@NonNull String requestingPackage)
throws SecurityException {
final int callingUid = Binder.getCallingUid();
- if (callingUid == Process.ROOT_UID || callingUid == Process.SYSTEM_UID
- || callingUid == Process.SHELL_UID || callingUid == Process.PHONE_UID) {
- // Bug reports (dumpstate.cpp) run as SHELL, and let some other privileged UIDs through
- // as well.
+ if (TelephonyPermissions.isRootOrShell(callingUid)
+ || TelephonyPermissions.isSystemOrPhone(
+ callingUid)) {
+ // Bug reports (dumpstate.cpp) run as SHELL, and let some other privileged UIDs
+ // through as well.
return;
}
+
// An app is trying to dump extra detail, block it if they aren't who they claim to be.
AppOpsManager appOps = mContext.getSystemService(AppOpsManager.class);
if (appOps == null) {
@@ -1866,9 +1872,16 @@
*/
@Nullable
private String getCurrentPackageName() {
+ if (mFeatureFlags.hsumPackageManager()) {
+ PackageManager pm = mContext.createContextAsUser(Binder.getCallingUserHandle(), 0)
+ .getPackageManager();
+ if (pm == null) return null;
+ String[] callingPackageNames = pm.getPackagesForUid(Binder.getCallingUid());
+ return (callingPackageNames == null) ? null : callingPackageNames[0];
+ }
if (mPackageManager == null) return null;
- String[] callingUids = mPackageManager.getPackagesForUid(Binder.getCallingUid());
- return (callingUids == null) ? null : callingUids[0];
+ String[] callingPackageNames = mPackageManager.getPackagesForUid(Binder.getCallingUid());
+ return (callingPackageNames == null) ? null : callingPackageNames[0];
}
/**
@@ -1884,7 +1897,11 @@
if (!mFeatureFlags.enforceTelephonyFeatureMappingForPublicApis()
|| !CompatChanges.isChangeEnabled(ENABLE_FEATURE_MAPPING, callingPackage,
- Binder.getCallingUserHandle())) {
+ Binder.getCallingUserHandle())
+ || mVendorApiLevel < Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+ // Skip to check associated telephony feature,
+ // if compatibility change is not enabled for the current process or
+ // the SDK version of vendor partition is less than Android V.
return;
}
diff --git a/src/com/android/phone/EmergencyCallbackModeService.java b/src/com/android/phone/EmergencyCallbackModeService.java
index 464db6f..70eb017 100644
--- a/src/com/android/phone/EmergencyCallbackModeService.java
+++ b/src/com/android/phone/EmergencyCallbackModeService.java
@@ -129,9 +129,9 @@
// Show dialog box
else if (intent.getAction().equals(
TelephonyIntents.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS)) {
- context.startActivity(
+ context.startActivityAsUser(
new Intent(TelephonyIntents.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS)
- .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+ .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK), UserHandle.CURRENT);
}
}
};
diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index a608b1b..d4fdca6 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -40,6 +40,7 @@
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.PersistableBundle;
+import android.os.UserHandle;
import android.provider.Settings;
import android.telecom.PhoneAccount;
import android.telecom.TelecomManager;
@@ -511,7 +512,7 @@
Intent intent = (Intent) button.getTag(R.id.tag_intent);
if (intent != null) {
- startActivity(intent);
+ startActivityAsUser(intent, UserHandle.CURRENT);
}
}
diff --git a/src/com/android/phone/ImsProvisioningController.java b/src/com/android/phone/ImsProvisioningController.java
index d2c720b..ea60633 100644
--- a/src/com/android/phone/ImsProvisioningController.java
+++ b/src/com/android/phone/ImsProvisioningController.java
@@ -49,9 +49,11 @@
import android.os.PersistableBundle;
import android.os.RemoteCallbackList;
import android.os.RemoteException;
+import android.telephony.AnomalyReporter;
import android.telephony.CarrierConfigManager;
import android.telephony.CarrierConfigManager.Ims;
import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
import android.telephony.TelephonyRegistryManager;
import android.telephony.ims.ProvisioningManager;
import android.telephony.ims.aidl.IFeatureProvisioningCallback;
@@ -76,6 +78,7 @@
import java.util.Arrays;
import java.util.Map;
+import java.util.UUID;
import java.util.concurrent.Executor;
/**
@@ -154,6 +157,10 @@
CAPABILITY_TYPE_PRESENCE_UCE, Ims.KEY_CAPABILITY_TYPE_PRESENCE_UCE_INT_ARRAY
);
+ private static final UUID VOLTE_PROVISIONING_ANOMALY =
+ UUID.fromString("f5f90e4d-3d73-4f63-a0f9-cbe1941ca57c");
+ private static final String VOLTE_PROVISIONING_ANOMALY_DESC = "VoLTE is Not Provisioned";
+
/**
* Create a FeatureConnector for this class to use to connect to an ImsManager.
*/
@@ -249,7 +256,7 @@
(FeatureProvisioningData) msg.obj);
} catch (NullPointerException e) {
logw(LOG_PREFIX, msg.arg1,
- "can not find callback manager message" + msg.what);
+ "can not find callback manager, message" + msg.what);
}
break;
case EVENT_MULTI_SIM_CONFIGURATION_CHANGE:
@@ -257,9 +264,11 @@
onMultiSimConfigChanged(activeModemCount);
break;
case EVENT_PROVISIONING_VALUE_CHANGED:
- log("subId " + msg.arg1 + " changed provisioning value item : " + msg.arg2
+ logAttr("ImsConfig", "EVENT_PROVISIONING_VALUE_CHANGED", msg.arg1,
+ "changed provisioning value, item : " + msg.arg2
+ " value : " + (int) msg.obj);
- updateCapabilityTechFromKey(msg.arg1, msg.arg2, (int) msg.obj);
+ updateCapabilityTechFromKey("ImsConfig[" + msg.arg1 + "]",
+ msg.arg1, msg.arg2, (int) msg.obj);
break;
case EVENT_NOTIFY_INIT_PROVISIONED_VALUE:
int slotId = msg.arg1;
@@ -419,7 +428,6 @@
}
mSubId = subId;
- mSlotId = getSlotId(subId);
mConfigCallback.setSubId(subId);
}
@@ -531,7 +539,9 @@
if (mFeatureFlags.notifyInitialImsProvisioningStatus()) {
// Notify MmTel provisioning value based on capability and radio tech.
- if (mProvisioningCallbackManagersSlotMap.get(mSlotId).hasCallblacks()) {
+ ProvisioningCallbackManager p =
+ mProvisioningCallbackManagersSlotMap.get(mSlotId);
+ if (p != null && p.hasCallblacks()) {
notifyMmTelProvisioningStatus(mSlotId, mSubId, null);
}
}
@@ -658,7 +668,6 @@
}
mSubId = subId;
- mSlotId = getSlotId(subId);
mConfigCallback.setSubId(subId);
}
@@ -769,7 +778,9 @@
setInitialProvisioningKeys(mSubId);
if (mFeatureFlags.notifyInitialImsProvisioningStatus()) {
- if (mProvisioningCallbackManagersSlotMap.get(mSlotId).hasCallblacks()) {
+ ProvisioningCallbackManager p =
+ mProvisioningCallbackManagersSlotMap.get(mSlotId);
+ if (p != null && p.hasCallblacks()) {
// Notify RCS provisioning value based on capability and radio tech.
notifyRcsProvisioningStatus(mSlotId, mSubId, null);
}
@@ -1134,11 +1145,12 @@
* return the provisioning status for MmTel capability in specific radio tech
*/
@VisibleForTesting
- public boolean getImsProvisioningStatusForCapability(int subId, int capability, int tech) {
+ public boolean getImsProvisioningStatusForCapability(String attributionPackage, int subId,
+ int capability, int tech) {
boolean mmTelProvisioned = isImsProvisioningRequiredForCapability(subId, capability, tech);
if (!mmTelProvisioned) { // provisioning not required
- log("getImsProvisioningStatusForCapability : not required "
- + " capability " + capability + " tech " + tech);
+ logAttr(attributionPackage, "getImsProvisioningStatusForCapability", subId,
+ " not required, capability " + capability + " tech " + tech);
return true;
}
@@ -1151,14 +1163,15 @@
result = getValueFromImsService(subId, capability, tech);
mmTelProvisioned = getBoolValue(result);
if (result != ProvisioningManager.PROVISIONING_RESULT_UNKNOWN) {
- setAndNotifyMmTelProvisioningValue(subId, capability, tech, mmTelProvisioned);
+ setAndNotifyMmTelProvisioningValue(attributionPackage, subId, capability, tech,
+ mmTelProvisioned);
}
} else {
mmTelProvisioned = getBoolValue(result);
}
- log("getImsProvisioningStatusForCapability : "
- + " capability " + capability
+ logAttr(attributionPackage, "getImsProvisioningStatusForCapability", subId,
+ " capability " + capability
+ " tech " + tech
+ " result " + mmTelProvisioned);
return mmTelProvisioned;
@@ -1168,20 +1181,21 @@
* set MmTel provisioning status in specific tech
*/
@VisibleForTesting
- public void setImsProvisioningStatusForCapability(int subId, int capability, int tech,
- boolean isProvisioned) {
+ public void setImsProvisioningStatusForCapability(String attributionPackage, int subId,
+ int capability, int tech, boolean isProvisioned) {
boolean mmTelProvisioned = isImsProvisioningRequiredForCapability(subId, capability, tech);
if (!mmTelProvisioned) { // provisioning not required
- log("setImsProvisioningStatusForCapability : not required "
- + " capability " + capability + " tech " + tech);
+ logAttr(attributionPackage, "setImsProvisioningStatusForCapability", subId,
+ "not required, capability " + capability + " tech " + tech);
return;
}
// write value to ImsProvisioningLoader
- boolean isChanged = setAndNotifyMmTelProvisioningValue(subId, capability, tech,
- isProvisioned);
+ boolean isChanged = setAndNotifyMmTelProvisioningValue(attributionPackage, subId,
+ capability, tech, isProvisioned);
if (!isChanged) {
- log("status not changed mmtel capability " + capability + " tech " + tech);
+ logAttr(attributionPackage, "setImsProvisioningStatusForCapability", subId,
+ "status not changed, capability " + capability + " tech " + tech);
return;
}
@@ -1190,7 +1204,8 @@
int value = getIntValue(isProvisioned);
int key = getKeyFromCapability(capability, tech);
if (key != INVALID_VALUE) {
- log("setImsProvisioningStatusForCapability : matched key " + key);
+ logAttr(attributionPackage, "setImsProvisioningStatusForCapability", subId,
+ "matched key " + key);
try {
// set key and value to vendor ImsService for MmTel
mMmTelFeatureListenersSlotMap.get(slotId).setProvisioningValue(key, value);
@@ -1289,20 +1304,22 @@
* {@link ImsConfigImplBase#CONFIG_RESULT_SUCCESS} or
*/
@VisibleForTesting
- public int setProvisioningValue(int subId, int key, int value) {
- log("setProvisioningValue");
+ public int setProvisioningValue(String attributionPackage, int subId, int key, int value) {
+ logAttr(attributionPackage, "setProvisioningValue", subId, key + ": " + value);
int retVal = ImsConfigImplBase.CONFIG_RESULT_FAILED;
// check key value
if (!Arrays.stream(LOCAL_IMS_CONFIG_KEYS).anyMatch(keyValue -> keyValue == key)) {
- log("not matched key " + key);
+ logAttr(attributionPackage, "setProvisioningValue", subId,
+ "not matched key " + key);
return ImsConfigImplBase.CONFIG_RESULT_UNKNOWN;
}
// check subId
int slotId = getSlotId(subId);
if (slotId <= SubscriptionManager.INVALID_SIM_SLOT_INDEX || slotId >= mNumSlot) {
- loge("Fail to retrieve slotId from subId");
+ logAttrE(attributionPackage, "setProvisioningValue", subId,
+ "Fail to retrieve slotId from subId");
return ImsConfigImplBase.CONFIG_RESULT_FAILED;
}
@@ -1324,12 +1341,13 @@
retVal = mRcsFeatureListenersSlotMap.get(slotId).setProvisioningValue(key, value);
}
} catch (NullPointerException e) {
- loge("can not access FeatureListener to set provisioning value");
+ logAttrE(attributionPackage, "setProvisioningValue", subId,
+ "can not access FeatureListener to set provisioning value");
return ImsConfigImplBase.CONFIG_RESULT_FAILED;
}
// update and notify provisioning status changed capability and tech from key
- updateCapabilityTechFromKey(subId, key, value);
+ updateCapabilityTechFromKey(attributionPackage, subId, key, value);
return retVal;
}
@@ -1347,17 +1365,19 @@
* {@link ImsConfigImplBase#CONFIG_RESULT_UNKNOWN}
*/
@VisibleForTesting
- public int getProvisioningValue(int subId, int key) {
+ public int getProvisioningValue(String attributionPackage, int subId, int key) {
// check key value
if (!Arrays.stream(LOCAL_IMS_CONFIG_KEYS).anyMatch(keyValue -> keyValue == key)) {
- log("not matched key " + key);
+ logAttr(attributionPackage, "getProvisioningValue", subId,
+ "not matched key " + key);
return ImsConfigImplBase.CONFIG_RESULT_UNKNOWN;
}
// check subId
int slotId = getSlotId(subId);
if (slotId <= SubscriptionManager.INVALID_SIM_SLOT_INDEX || slotId >= mNumSlot) {
- loge("Fail to retrieve slotId from subId");
+ logAttrE(attributionPackage, "getProvisioningValue", subId,
+ "Fail to retrieve slotId from subId");
return ImsConfigImplBase.CONFIG_RESULT_UNKNOWN;
}
@@ -1374,7 +1394,8 @@
capability, tech);
}
if (result != ImsProvisioningLoader.STATUS_NOT_SET) {
- log("getProvisioningValue from loader : key " + key + " result " + result);
+ logAttr(attributionPackage, "getProvisioningValue", subId,
+ "cache hit : key=" + key + ": value=" + result);
return result;
}
}
@@ -1383,24 +1404,27 @@
if (key == KEY_EAB_PROVISIONING_STATUS) {
result = getRcsValueFromImsService(subId, capability);
if (result == ImsConfigImplBase.CONFIG_RESULT_UNKNOWN) {
- logw("getProvisioningValue : fail to get data from ImsService capability"
- + capability);
+ logAttrW(attributionPackage, "getProvisioningValue", subId,
+ "fail to get data from ImsService, capability=" + capability);
return result;
}
- log("getProvisioningValue from vendor : key " + key + " result " + result);
+ logAttr(attributionPackage, "getProvisioningValue", subId,
+ "cache miss, get from RCS - key=" + key + ": value=" + result);
setAndNotifyRcsProvisioningValueForAllTech(subId, capability, getBoolValue(result));
return result;
} else {
result = getValueFromImsService(subId, capability, tech);
if (result == ImsConfigImplBase.CONFIG_RESULT_UNKNOWN) {
- logw("getProvisioningValue : fail to get data from ImsService capability"
- + capability);
+ logAttrW(attributionPackage, "getProvisioningValue", subId,
+ "fail to get data from ImsService, capability=" + capability);
return result;
}
- log("getProvisioningValue from vendor : key " + key + " result " + result);
+ logAttr(attributionPackage, "getProvisioningValue", subId,
+ "cache miss, get from MMTEL - key=" + key + ": value=" + result);
- setAndNotifyMmTelProvisioningValue(subId, capability, tech, getBoolValue(result));
+ setAndNotifyMmTelProvisioningValue(attributionPackage, subId, capability, tech,
+ getBoolValue(result));
return result;
}
}
@@ -1529,20 +1553,23 @@
}
}
- private void updateCapabilityTechFromKey(int subId, int key, int value) {
+ private void updateCapabilityTechFromKey(String attributionPackage, int subId, int key,
+ int value) {
boolean isProvisioned = getBoolValue(value);
int capability = getCapabilityFromKey(key);
int tech = getTechFromKey(key);
if (capability == INVALID_VALUE || tech == INVALID_VALUE) {
- logw("updateCapabilityTechFromKey : unknown key " + key);
+ logAttrW(attributionPackage, "updateCapabilityTechFromKey", subId,
+ "unknown key " + key);
return;
}
if (key == KEY_VOLTE_PROVISIONING_STATUS
|| key == KEY_VT_PROVISIONING_STATUS
|| key == KEY_VOICE_OVER_WIFI_ENABLED_OVERRIDE) {
- setAndNotifyMmTelProvisioningValue(subId, capability, tech, isProvisioned);
+ setAndNotifyMmTelProvisioningValue(attributionPackage, subId, capability, tech,
+ isProvisioned);
}
if (key == KEY_EAB_PROVISIONING_STATUS) {
setAndNotifyRcsProvisioningValueForAllTech(subId, capability, isProvisioned);
@@ -1629,12 +1656,33 @@
return value == ProvisioningManager.PROVISIONING_VALUE_ENABLED ? true : false;
}
- private boolean setAndNotifyMmTelProvisioningValue(int subId, int capability, int tech,
+ // If VoLTE is not provisioned, generate an anomaly report as this is not expected.
+ private void checkProvisioningValueForAnomaly(String attributionPackage, int subId,
+ int capability, int tech, boolean isProvisioned) {
+ if (isProvisioned) return;
+ boolean isVolte = capability == CAPABILITY_TYPE_VOICE && tech == REGISTRATION_TECH_LTE;
+ if (!isVolte) return;
+ // We have hit the condition where VoLTE has been de-provisioned
+ int carrierId = TelephonyManager.UNKNOWN_CARRIER_ID;
+ TelephonyManager manager = mApp.getSystemService(TelephonyManager.class);
+ if (manager != null) {
+ carrierId = manager.createForSubscriptionId(subId).getSimCarrierId();
+ }
+ logAttrW(attributionPackage, "checkProvisioningValueForAnomaly", subId,
+ "VoLTE provisioning disabled");
+ AnomalyReporter.reportAnomaly(VOLTE_PROVISIONING_ANOMALY,
+ VOLTE_PROVISIONING_ANOMALY_DESC, carrierId);
+ }
+
+ private boolean setAndNotifyMmTelProvisioningValue(String attributionPackage, int subId,
+ int capability, int tech,
boolean isProvisioned) {
boolean changed = mImsProvisioningLoader.setProvisioningStatus(subId, FEATURE_MMTEL,
capability, tech, isProvisioned);
// notify MmTel capability changed
if (changed) {
+ checkProvisioningValueForAnomaly(attributionPackage, subId, capability, tech,
+ isProvisioned);
mHandler.sendMessage(mHandler.obtainMessage(EVENT_PROVISIONING_CAPABILITY_CHANGED,
getSlotId(subId), 0, (Object) new FeatureProvisioningData(
capability, tech, isProvisioned, /*isMmTel*/true)));
@@ -1764,6 +1812,18 @@
}
}
+ private void logAttr(String attr, String prefix, int subId, String log) {
+ Rlog.d(TAG, prefix + "[" + subId + "]: " + log + ", attr = [" + attr + "]");
+ }
+
+ private void logAttrW(String attr, String prefix, int subId, String log) {
+ Rlog.w(TAG, prefix + "[" + subId + "]: " + log + ", attr = [" + attr + "]");
+ }
+
+ private void logAttrE(String attr, String prefix, int subId, String log) {
+ Rlog.e(TAG, prefix + "[" + subId + "]: " + log + ", attr = [" + attr + "]");
+ }
+
private void log(String s) {
Rlog.d(TAG, s);
}
diff --git a/src/com/android/phone/ImsProvisioningLoader.java b/src/com/android/phone/ImsProvisioningLoader.java
index 1238b9a..8d63463 100644
--- a/src/com/android/phone/ImsProvisioningLoader.java
+++ b/src/com/android/phone/ImsProvisioningLoader.java
@@ -113,7 +113,7 @@
logd("check UT provisioning status " + UtProvisioningStatus);
if (STATUS_PROVISIONED == UtProvisioningStatus) {
- setProvisioningStatusToSubIdBundle(ImsFeature.FEATURE_MMTEL, tech,
+ setProvisioningStatusToSubIdBundle(subId, ImsFeature.FEATURE_MMTEL, tech,
MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_UT, subIdBundle,
UtProvisioningStatus);
}
@@ -130,7 +130,7 @@
subIdBundle = mSubIdBundleArray.get(subId, null);
}
- return getProvisioningStatusFromSubIdBundle(imsFeature, tech,
+ return getProvisioningStatusFromSubIdBundle(subId, imsFeature, tech,
capability, subIdBundle);
}
@@ -146,42 +146,44 @@
}
PersistableBundle subIdBundle = mSubIdBundleArray.get(subId, null);
- setProvisioningStatusToSubIdBundle(imsFeature, tech, capability, subIdBundle,
+ setProvisioningStatusToSubIdBundle(subId, imsFeature, tech, capability, subIdBundle,
newValue);
saveSubIdBundleToXml(subId, subIdBundle);
}
return true;
}
- private int getProvisioningStatusFromSubIdBundle(int imsFeature, int tech,
+ private int getProvisioningStatusFromSubIdBundle(int subId, int imsFeature, int tech,
int capability, PersistableBundle subIdBundle) {
// If it doesn't exist in xml, return STATUS_NOT_SET
if (subIdBundle == null || subIdBundle.isEmpty()) {
- logd("xml is empty");
+ logd("getProvisioningStatusFromSubIdBundle", subId, "xml is empty");
return STATUS_NOT_SET;
}
PersistableBundle regTechBundle = subIdBundle.getPersistableBundle(
String.valueOf(imsFeature));
if (regTechBundle == null) {
- logd("ImsFeature " + imsFeature + " is not exist in xml");
+ logd("getProvisioningStatusFromSubIdBundle", subId,
+ "ImsFeature " + imsFeature + " does not exist in xml");
return STATUS_NOT_SET;
}
PersistableBundle capabilityBundle = regTechBundle.getPersistableBundle(
String.valueOf(tech));
if (capabilityBundle == null) {
- logd("RegistrationTech " + tech + " is not exist in xml");
+ logd("getProvisioningStatusFromSubIdBundle", subId,
+ "RegistrationTech " + tech + " does not exist in xml");
return STATUS_NOT_SET;
}
- return getIntValueFromBundle(String.valueOf(capability), capabilityBundle);
+ return getIntValueFromBundle(subId, tech, String.valueOf(capability), capabilityBundle);
}
- private void setProvisioningStatusToSubIdBundle(int imsFeature, int tech,
+ private void setProvisioningStatusToSubIdBundle(int subId, int imsFeature, int tech,
int capability, PersistableBundle subIdBundle, int newStatus) {
- logd("set provisioning status " + newStatus + " ImsFeature "
- + imsFeature + " tech " + tech + " capa " + capability);
+ logd("setProvisioningStatusToSubIdBundle", subId, "set provisioning status " + newStatus
+ + " ImsFeature " + imsFeature + " tech " + tech + " capa " + capability);
PersistableBundle regTechBundle = subIdBundle.getPersistableBundle(
String.valueOf(imsFeature));
@@ -201,9 +203,10 @@
}
// Default value is STATUS_NOT_SET
- private int getIntValueFromBundle(String key, PersistableBundle bundle) {
+ private int getIntValueFromBundle(int subId, int tech, String key, PersistableBundle bundle) {
int value = bundle.getInt(key, STATUS_NOT_SET);
- logd("get value " + value);
+ logd("getIntValueFromBundle", subId,
+ "Cache hit, tech=" + tech + " capability=" + key + ": returning " + value);
return value;
}
@@ -293,7 +296,7 @@
String[] infoArray) {
for (String info : infoArray) {
String[] paramArray = info.split(",");
- setProvisioningStatusToSubIdBundle(Integer.valueOf(paramArray[0]),
+ setProvisioningStatusToSubIdBundle(subId, Integer.valueOf(paramArray[0]),
Integer.valueOf(paramArray[1]), Integer.valueOf(paramArray[2]),
subIdBundle, Integer.valueOf(paramArray[3]));
}
@@ -304,6 +307,10 @@
Log.e(LOG_TAG, contents);
}
+ private void logd(String prefix, int subId, String contents) {
+ Log.d(LOG_TAG, prefix + "[" + subId + "]: " + contents);
+ }
+
private void logd(String contents) {
Log.d(LOG_TAG, contents);
}
diff --git a/src/com/android/phone/ImsRcsController.java b/src/com/android/phone/ImsRcsController.java
index a778f6a..e2ae343 100644
--- a/src/com/android/phone/ImsRcsController.java
+++ b/src/com/android/phone/ImsRcsController.java
@@ -32,6 +32,7 @@
import android.os.Build;
import android.os.RemoteException;
import android.os.ServiceSpecificException;
+import android.os.SystemProperties;
import android.os.UserHandle;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyFrameworkInitializer;
@@ -85,6 +86,7 @@
private PackageManager mPackageManager;
// set by shell cmd phone src set-device-enabled true/false
private Boolean mSingleRegistrationOverride;
+ private final int mVendorApiLevel;
/**
* For apps targeting Android T and above, support the publishing state on APIs, such as
@@ -119,6 +121,8 @@
TelephonyFrameworkInitializer
.getTelephonyServiceManager().getTelephonyImsServiceRegisterer().register(this);
mImsResolver = ImsResolver.getInstance();
+ mVendorApiLevel = SystemProperties.getInt(
+ "ro.vendor.api_level", Build.VERSION.DEVICE_INITIAL_SDK_INT);
}
/**
@@ -982,9 +986,16 @@
*/
@Nullable
private String getCurrentPackageName() {
+ if (mFeatureFlags.hsumPackageManager()) {
+ PackageManager pm = mApp.getBaseContext().createContextAsUser(
+ Binder.getCallingUserHandle(), 0).getPackageManager();
+ if (pm == null) return null;
+ String[] callingPackageNames = pm.getPackagesForUid(Binder.getCallingUid());
+ return (callingPackageNames == null) ? null : callingPackageNames[0];
+ }
if (mPackageManager == null) return null;
- String[] callingUids = mPackageManager.getPackagesForUid(Binder.getCallingUid());
- return (callingUids == null) ? null : callingUids[0];
+ String[] callingPackageNames = mPackageManager.getPackagesForUid(Binder.getCallingUid());
+ return (callingPackageNames == null) ? null : callingPackageNames[0];
}
/**
@@ -1000,7 +1011,11 @@
if (!mFeatureFlags.enforceTelephonyFeatureMappingForPublicApis()
|| !CompatChanges.isChangeEnabled(ENABLE_FEATURE_MAPPING, callingPackage,
- Binder.getCallingUserHandle())) {
+ Binder.getCallingUserHandle())
+ || mVendorApiLevel < Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+ // Skip to check associated telephony feature,
+ // if compatibility change is not enabled for the current process or
+ // the SDK version of vendor partition is less than Android V.
return;
}
diff --git a/src/com/android/phone/ImsStateCallbackController.java b/src/com/android/phone/ImsStateCallbackController.java
index 019c1ca..2dca102 100644
--- a/src/com/android/phone/ImsStateCallbackController.java
+++ b/src/com/android/phone/ImsStateCallbackController.java
@@ -59,6 +59,7 @@
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneConfigurationManager;
import com.android.internal.telephony.PhoneFactory;
+import com.android.internal.telephony.flags.FeatureFlags;
import com.android.internal.telephony.ims.ImsResolver;
import com.android.internal.telephony.util.HandlerExecutor;
import com.android.internal.util.IndentingPrintWriter;
@@ -159,6 +160,8 @@
private int mNumSlots;
+ private final FeatureFlags mFeatureFlags;
+
private BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
@@ -287,11 +290,13 @@
if (mSubId == subId) return;
logd(mLogPrefix + "setSubId changed subId=" + subId);
- // subId changed from valid to invalid
- if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
- if (VDBG) logv(mLogPrefix + "setSubId remove ImsManager " + mSubId);
- // remove ImsManager reference associated with subId
- mSubIdToImsManagerCache.remove(mSubId);
+ if (!mFeatureFlags.avoidDeletingImsObjectFromCache()) {
+ // subId changed from valid to invalid
+ if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+ if (VDBG) logv(mLogPrefix + "setSubId remove ImsManager " + mSubId);
+ // remove ImsManager reference associated with subId
+ mSubIdToImsManagerCache.remove(mSubId);
+ }
}
mSubId = subId;
@@ -709,7 +714,8 @@
/**
* create an instance
*/
- public static ImsStateCallbackController make(PhoneGlobals app, int numSlots) {
+ public static ImsStateCallbackController make(PhoneGlobals app, int numSlots,
+ FeatureFlags featureFlags) {
synchronized (ImsStateCallbackController.class) {
if (sInstance == null) {
logd("ImsStateCallbackController created");
@@ -718,7 +724,7 @@
handlerThread.start();
sInstance = new ImsStateCallbackController(app, handlerThread.getLooper(), numSlots,
ImsManager::getConnector, RcsFeatureManager::getConnector,
- ImsResolver.getInstance());
+ ImsResolver.getInstance(), featureFlags);
}
}
return sInstance;
@@ -727,7 +733,7 @@
@VisibleForTesting
public ImsStateCallbackController(PhoneGlobals app, Looper looper, int numSlots,
MmTelFeatureConnectorFactory mmTelFactory, RcsFeatureConnectorFactory rcsFactory,
- ImsResolver imsResolver) {
+ ImsResolver imsResolver, FeatureFlags featureFlags) {
mApp = app;
mHandler = new MyHandler(looper);
mImsResolver = imsResolver;
@@ -735,6 +741,7 @@
mTelephonyRegistryManager = mApp.getSystemService(TelephonyRegistryManager.class);
mMmTelFeatureFactory = mmTelFactory;
mRcsFeatureFactory = rcsFactory;
+ mFeatureFlags = featureFlags;
updateFeatureControllerSize(numSlots);
diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index 3cd9a8b..3c7b321 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -519,8 +519,14 @@
return false;
}
- List<ResolveInfo> receivers = mContext.getPackageManager()
- .queryBroadcastReceivers(intent, 0);
+ List<ResolveInfo> receivers;
+ if (mFeatureFlags.hsumPackageManager()) {
+ receivers = mContext.createContextAsUser(userHandle, 0)
+ .getPackageManager().queryBroadcastReceivers(intent, 0);
+ } else {
+ receivers = mContext.getPackageManager()
+ .queryBroadcastReceivers(intent, 0);
+ }
return receivers.size() > 0;
}
diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index 0c97cc2..0433a33 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -84,6 +84,7 @@
import com.android.internal.util.IndentingPrintWriter;
import com.android.phone.settings.SettingsConstants;
import com.android.phone.vvm.CarrierVvmPackageInstalledReceiver;
+import com.android.services.telephony.domainselection.DynamicRoutingController;
import com.android.services.telephony.rcs.TelephonyRcsService;
import java.io.FileDescriptor;
@@ -518,7 +519,9 @@
ContentResolver resolver = getContentResolver();
- if (mFeatureFlags.enforceTelephonyFeatureMappingForPublicApis()) {
+ if (mFeatureFlags.enforceTelephonyFeatureMappingForPublicApis()
+ && !getResources().getBoolean(
+ com.android.internal.R.bool.config_force_phone_globals_creation)) {
if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
Log.v(LOG_TAG, "onCreate()... but not defined FEATURE_TELEPHONY");
return;
@@ -564,6 +567,7 @@
boolean isSuplDdsSwitchRequiredForEmergencyCall = getResources()
.getBoolean(R.bool.config_gnss_supl_requires_default_data_for_emergency);
EmergencyStateTracker.make(this, isSuplDdsSwitchRequiredForEmergencyCall);
+ DynamicRoutingController.getInstance().initialize(this);
}
// Only bring up ImsResolver if the device supports having an IMS stack.
@@ -576,7 +580,7 @@
R.string.config_ims_rcs_package);
ImsResolver.make(this, defaultImsMmtelPackage,
defaultImsRcsPackage, PhoneFactory.getPhones().length,
- new ImsFeatureBinderRepository());
+ new ImsFeatureBinderRepository(), mFeatureFlags);
ImsResolver.getInstance().initialize();
// With the IMS phone created, load static config.xml values from the phone process
@@ -596,7 +600,7 @@
}
}
}
- RcsProvisioningMonitor.make(this);
+ RcsProvisioningMonitor.make(this, mFeatureFlags);
}
// Start TelephonyDebugService After the default phone is created.
@@ -634,7 +638,8 @@
if (getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY_IMS)) {
mImsStateCallbackController =
- ImsStateCallbackController.make(this, PhoneFactory.getPhones().length);
+ ImsStateCallbackController.make(this, PhoneFactory.getPhones().length,
+ mFeatureFlags);
mTelephonyRcsService = new TelephonyRcsService(this,
PhoneFactory.getPhones().length, mFeatureFlags);
mTelephonyRcsService.initialize();
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index b3bd131..559effa 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -25,7 +25,6 @@
import static android.telephony.TelephonyManager.HAL_SERVICE_RADIO;
import static android.telephony.satellite.SatelliteManager.KEY_SATELLITE_COMMUNICATION_ALLOWED;
import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_ACCESS_BARRED;
-import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_REQUEST_NOT_SUPPORTED;
import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_SUCCESS;
import static com.android.internal.telephony.PhoneConstants.PHONE_TYPE_CDMA;
@@ -76,6 +75,7 @@
import android.os.ResultReceiver;
import android.os.ServiceSpecificException;
import android.os.SystemClock;
+import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.UserManager;
import android.os.WorkSource;
@@ -156,6 +156,7 @@
import android.telephony.ims.stub.ImsRegistrationImplBase;
import android.telephony.satellite.INtnSignalStrengthCallback;
import android.telephony.satellite.ISatelliteCapabilitiesCallback;
+import android.telephony.satellite.ISatelliteCommunicationAllowedStateCallback;
import android.telephony.satellite.ISatelliteDatagramCallback;
import android.telephony.satellite.ISatelliteModemStateCallback;
import android.telephony.satellite.ISatelliteProvisionStateCallback;
@@ -168,6 +169,7 @@
import android.telephony.satellite.SatelliteDatagramCallback;
import android.telephony.satellite.SatelliteManager;
import android.telephony.satellite.SatelliteProvisionStateCallback;
+import android.telephony.satellite.SatelliteSubscriberInfo;
import android.text.TextUtils;
import android.util.ArraySet;
import android.util.EventLog;
@@ -261,6 +263,7 @@
import com.android.server.feature.flags.Flags;
import com.android.services.telephony.TelecomAccountRegistry;
import com.android.services.telephony.TelephonyConnectionService;
+import com.android.services.telephony.domainselection.TelephonyDomainSelectionService;
import com.android.telephony.Rlog;
import java.io.ByteArrayOutputStream;
@@ -437,6 +440,10 @@
private final RadioInterfaceCapabilityController mRadioInterfaceCapabilities;
private AppOpsManager mAppOps;
private PackageManager mPackageManager;
+ private final int mVendorApiLevel;
+
+ @Nullable
+ private ComponentName mTestEuiccUiComponent;
/** User Activity */
private final AtomicBoolean mNotifyUserActivity;
@@ -475,6 +482,8 @@
private static final int MODEM_ACTIVITY_TIME_OFFSET_CORRECTION_MS = 50;
+ private static final int LINE1_NUMBER_MAX_LEN = 50;
+
/**
* With support for MEP(multiple enabled profile) in Android T, a SIM card can have more than
* one ICCID active at the same time.
@@ -2482,6 +2491,9 @@
mPackageManager = app.getPackageManager();
mSatelliteAccessController = SatelliteAccessController.getOrCreateInstance(
getDefaultPhone().getContext(), featureFlags);
+ mVendorApiLevel = SystemProperties.getInt(
+ "ro.vendor.api_level", Build.VERSION.DEVICE_INITIAL_SDK_INT);
+
PropertyInvalidatedCache.invalidateCache(TelephonyManager.CACHE_KEY_PHONE_ACCOUNT_TO_SUBID);
publish();
CarrierAllowListInfo.loadInstance(mApp);
@@ -2604,7 +2616,7 @@
if (state != PhoneConstants.State.OFFHOOK && state != PhoneConstants.State.RINGING) {
Intent intent = new Intent(Intent.ACTION_DIAL, Uri.parse(url));
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- mApp.startActivity(intent);
+ mApp.startActivityAsUser(intent, UserHandle.CURRENT);
}
} finally {
Binder.restoreCallingIdentity(identity);
@@ -2619,7 +2631,7 @@
if (DBG) log("call: " + number);
// This is just a wrapper around the ACTION_CALL intent, but we still
- // need to do a permission check since we're calling startActivity()
+ // need to do a permission check since we're calling startActivityAsUser()
// from the context of the phone app.
enforceCallPermission();
@@ -2655,7 +2667,7 @@
Intent intent = new Intent(Intent.ACTION_CALL, Uri.parse(url));
intent.putExtra(SUBSCRIPTION_KEY, subId);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- mApp.startActivity(intent);
+ mApp.startActivityAsUser(intent, UserHandle.CURRENT);
} finally {
Binder.restoreCallingIdentity(identity);
}
@@ -2724,6 +2736,10 @@
// For async handler to identify request type
private static final int SUPPLY_PIN_COMPLETE = 100;
+ private static final int SUPPLY_PIN_DELAYED = 101;
+ private static final int SUPPLY_PIN_DELAYED_TIMER_IN_MILLIS = 10000;
+ private static final UUID SUPPLY_PIN_UUID = UUID.fromString(
+ "d3768135-4323-491d-a6c8-bda01fc89040");
UnlockSim(int phoneId, IccCard simCard) {
mPhoneId = phoneId;
@@ -2762,9 +2778,17 @@
mResult = PhoneConstants.PIN_RESULT_SUCCESS;
}
mDone = true;
+ removeMessages(SUPPLY_PIN_DELAYED);
UnlockSim.this.notifyAll();
}
break;
+ case SUPPLY_PIN_DELAYED:
+ if(!mDone) {
+ String logStr = "Delay in receiving SIM PIN response ";
+ if (DBG) log(logStr);
+ AnomalyReporter.reportAnomaly(SUPPLY_PIN_UUID, logStr);
+ }
+ break;
}
}
};
@@ -2803,6 +2827,8 @@
while (!mDone) {
try {
Log.d(LOG_TAG, "wait for done");
+ mHandler.sendEmptyMessageDelayed(SUPPLY_PIN_DELAYED,
+ SUPPLY_PIN_DELAYED_TIMER_IN_MILLIS);
wait();
} catch (InterruptedException e) {
// Restore the interrupted status
@@ -2971,8 +2997,11 @@
public boolean needMobileRadioShutdown() {
enforceReadPrivilegedPermission("needMobileRadioShutdown");
- enforceTelephonyFeatureWithException(getCurrentPackageName(),
- PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS, "needMobileRadioShutdown");
+ if (!mApp.getResources().getBoolean(
+ com.android.internal.R.bool.config_force_phone_globals_creation)) {
+ enforceTelephonyFeatureWithException(getCurrentPackageName(),
+ PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS, "needMobileRadioShutdown");
+ }
/*
* If any of the Radios are available, it will need to be
@@ -3177,7 +3206,7 @@
try {
int subId = SubscriptionManager.getDefaultDataSubscriptionId();
final Phone phone = getPhone(subId);
- if (phone != null) {
+ if (phone != null && phone.getDataSettingsManager() != null) {
phone.getDataSettingsManager().setDataEnabled(
TelephonyManager.DATA_ENABLED_REASON_USER, true, callingPackage);
return true;
@@ -3201,7 +3230,7 @@
try {
int subId = SubscriptionManager.getDefaultDataSubscriptionId();
final Phone phone = getPhone(subId);
- if (phone != null) {
+ if (phone != null && phone.getDataSettingsManager() != null) {
phone.getDataSettingsManager().setDataEnabled(
TelephonyManager.DATA_ENABLED_REASON_USER, false, callingPackage);
return true;
@@ -3407,8 +3436,11 @@
@Override
public String getNetworkCountryIsoForPhone(int phoneId) {
- enforceTelephonyFeatureWithException(getCurrentPackageName(),
- PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS, "getNetworkCountryIsoForPhone");
+ if (!mApp.getResources().getBoolean(
+ com.android.internal.R.bool.config_force_phone_globals_creation)) {
+ enforceTelephonyFeatureWithException(getCurrentPackageName(),
+ PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS, "getNetworkCountryIsoForPhone");
+ }
// Reporting the correct network country is ambiguous when IWLAN could conflict with
// registered cell info, so return a NULL country instead.
@@ -3779,8 +3811,11 @@
@Override
public int getSubscriptionCarrierId(int subId) {
- enforceTelephonyFeatureWithException(getCurrentPackageName(),
- PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION, "getSubscriptionCarrierId");
+ if (!mApp.getResources().getBoolean(
+ com.android.internal.R.bool.config_force_phone_globals_creation)) {
+ enforceTelephonyFeatureWithException(getCurrentPackageName(),
+ PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION, "getSubscriptionCarrierId");
+ }
final long identity = Binder.clearCallingIdentity();
try {
@@ -3941,6 +3976,15 @@
mApp.enforceCallingOrSelfPermission(permission.SATELLITE_COMMUNICATION, message);
}
+ /**
+ * Make sure the caller has PACKAGE_USAGE_STATS permission.
+ * @param message - log message to print.
+ * @throws SecurityException if the caller does not have the required permission
+ */
+ private void enforcePackageUsageStatsPermission(String message) {
+ mApp.enforceCallingOrSelfPermission(permission.PACKAGE_USAGE_STATS, message);
+ }
+
private String createTelUrl(String number) {
if (TextUtils.isEmpty(number)) {
return null;
@@ -3968,8 +4012,11 @@
@Override
public int getActivePhoneTypeForSlot(int slotIndex) {
- enforceTelephonyFeatureWithException(getCurrentPackageName(),
- PackageManager.FEATURE_TELEPHONY, "getActivePhoneTypeForSlot");
+ if (!mApp.getResources().getBoolean(
+ com.android.internal.R.bool.config_force_phone_globals_creation)) {
+ enforceTelephonyFeatureWithException(getCurrentPackageName(),
+ PackageManager.FEATURE_TELEPHONY, "getActivePhoneTypeForSlot");
+ }
final long identity = Binder.clearCallingIdentity();
try {
@@ -4250,10 +4297,9 @@
public void enableVisualVoicemailSmsFilter(String callingPackage, int subId,
VisualVoicemailSmsFilterSettings settings) {
mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);
-
+ enforceVisualVoicemailPackage(callingPackage, subId);
enforceTelephonyFeatureWithException(callingPackage,
PackageManager.FEATURE_TELEPHONY_CALLING, "enableVisualVoicemailSmsFilter");
-
final long identity = Binder.clearCallingIdentity();
try {
VisualVoicemailSmsFilterConfig.enableVisualVoicemailSmsFilter(
@@ -4266,7 +4312,7 @@
@Override
public void disableVisualVoicemailSmsFilter(String callingPackage, int subId) {
mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);
-
+ enforceVisualVoicemailPackage(callingPackage, subId);
enforceTelephonyFeatureWithException(callingPackage,
PackageManager.FEATURE_TELEPHONY_CALLING, "disableVisualVoicemailSmsFilter");
@@ -4318,8 +4364,9 @@
PackageManager.FEATURE_TELEPHONY_CALLING, "sendVisualVoicemailSmsForSubscriber");
SmsController smsController = PhoneFactory.getSmsController();
- smsController.sendVisualVoicemailSmsForSubscriber(callingPackage, callingAttributionTag,
- subId, number, port, text, sentIntent);
+ smsController.sendVisualVoicemailSmsForSubscriber(callingPackage,
+ Binder.getCallingUserHandle().getIdentifier(), callingAttributionTag, subId, number,
+ port, text, sentIntent);
}
/**
@@ -5432,6 +5479,7 @@
enforceTelephonyFeatureWithException(getCurrentPackageName(),
FEATURE_TELEPHONY_IMS, "setImsProvisioningStatusForCapability");
+ String displayPackageName = getCurrentPackageNameOrPhone();
final long identity = Binder.clearCallingIdentity();
try {
ImsProvisioningController controller = ImsProvisioningController.getInstance();
@@ -5439,7 +5487,7 @@
loge("setImsProvisioningStatusForCapability: Device does not support IMS");
return;
}
- controller.setImsProvisioningStatusForCapability(
+ controller.setImsProvisioningStatusForCapability(displayPackageName,
subId, capability, tech, isProvisioned);
} finally {
Binder.restoreCallingIdentity(identity);
@@ -5454,6 +5502,7 @@
enforceTelephonyFeatureWithException(getCurrentPackageName(),
FEATURE_TELEPHONY_IMS, "getImsProvisioningStatusForCapability");
+ String displayPackageName = getCurrentPackageNameOrPhone();
final long identity = Binder.clearCallingIdentity();
try {
ImsProvisioningController controller = ImsProvisioningController.getInstance();
@@ -5463,7 +5512,8 @@
// device does not support IMS, this method will return true always.
return true;
}
- return controller.getImsProvisioningStatusForCapability(subId, capability, tech);
+ return controller.getImsProvisioningStatusForCapability(displayPackageName,
+ subId, capability, tech);
} finally {
Binder.restoreCallingIdentity(identity);
}
@@ -5526,6 +5576,7 @@
enforceTelephonyFeatureWithException(getCurrentPackageName(),
FEATURE_TELEPHONY_IMS, "getImsProvisioningInt");
+ String displayPackageName = getCurrentPackageNameOrPhone();
final long identity = Binder.clearCallingIdentity();
try {
// TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
@@ -5543,7 +5594,8 @@
// device does not support IMS, this method will return CONFIG_RESULT_UNKNOWN.
return ImsConfigImplBase.CONFIG_RESULT_UNKNOWN;
}
- int retVal = controller.getProvisioningValue(subId, key);
+ int retVal = controller.getProvisioningValue(displayPackageName, subId,
+ key);
if (retVal != ImsConfigImplBase.CONFIG_RESULT_UNKNOWN) {
return retVal;
}
@@ -5599,6 +5651,7 @@
enforceTelephonyFeatureWithException(getCurrentPackageName(),
FEATURE_TELEPHONY_IMS, "setImsProvisioningInt");
+ String displayPackageName = getCurrentPackageNameOrPhone();
final long identity = Binder.clearCallingIdentity();
try {
// TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
@@ -5616,7 +5669,8 @@
// device does not support IMS, this method will return CONFIG_RESULT_FAILED.
return ImsConfigImplBase.CONFIG_RESULT_FAILED;
}
- int retVal = controller.setProvisioningValue(subId, key, value);
+ int retVal = controller.setProvisioningValue(displayPackageName, subId, key,
+ value);
if (retVal != ImsConfigImplBase.CONFIG_RESULT_UNKNOWN) {
return retVal;
}
@@ -5816,8 +5870,11 @@
*/
@Override
public boolean hasIccCardUsingSlotIndex(int slotIndex) {
- enforceTelephonyFeatureWithException(getCurrentPackageName(),
- PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION, "hasIccCardUsingSlotIndex");
+ if (!mApp.getResources().getBoolean(
+ com.android.internal.R.bool.config_force_phone_globals_creation)) {
+ enforceTelephonyFeatureWithException(getCurrentPackageName(),
+ PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION, "hasIccCardUsingSlotIndex");
+ }
final long identity = Binder.clearCallingIdentity();
try {
@@ -7230,8 +7287,12 @@
TelephonyPermissions.enforceCallingOrSelfReadPrecisePhoneStatePermissionOrCarrierPrivilege(
mApp, subId, "getAllowedNetworkTypesForReason");
- enforceTelephonyFeatureWithException(getCurrentPackageName(),
- PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS, "getAllowedNetworkTypesForReason");
+ if (!mApp.getResources().getBoolean(
+ com.android.internal.R.bool.config_force_phone_globals_creation)) {
+ enforceTelephonyFeatureWithException(getCurrentPackageName(),
+ PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS,
+ "getAllowedNetworkTypesForReason");
+ }
final long identity = Binder.clearCallingIdentity();
try {
@@ -7376,8 +7437,11 @@
public boolean isTetheringApnRequiredForSubscriber(int subId) {
enforceModifyPermission();
- enforceTelephonyFeatureWithException(getCurrentPackageName(),
- PackageManager.FEATURE_TELEPHONY_DATA, "isTetheringApnRequiredForSubscriber");
+ if (!mApp.getResources().getBoolean(
+ com.android.internal.R.bool.config_force_phone_globals_creation)) {
+ enforceTelephonyFeatureWithException(getCurrentPackageName(),
+ PackageManager.FEATURE_TELEPHONY_DATA, "isTetheringApnRequiredForSubscriber");
+ }
final long identity = Binder.clearCallingIdentity();
final Phone phone = getPhone(subId);
@@ -7488,12 +7552,15 @@
try {
int phoneId = SubscriptionManager.getPhoneId(subId);
Phone phone = PhoneFactory.getPhone(phoneId);
- if (phone != null) {
+ if (phone != null && phone.getDataSettingsManager() != null) {
boolean retVal = phone.getDataSettingsManager().isDataEnabled();
if (DBG) log("isDataEnabled: " + retVal + ", subId=" + subId);
return retVal;
} else {
- if (DBG) loge("isDataEnabled: no phone subId=" + subId + " retVal=false");
+ if (DBG) {
+ loge("isDataEnabled: no phone or no DataSettingsManager subId="
+ + subId + " retVal=false");
+ }
return false;
}
} finally {
@@ -7530,8 +7597,11 @@
}
}
- enforceTelephonyFeatureWithException(getCurrentPackageName(),
- PackageManager.FEATURE_TELEPHONY_DATA, "isDataEnabledForReason");
+ if (!mApp.getResources().getBoolean(
+ com.android.internal.R.bool.config_force_phone_globals_creation)) {
+ enforceTelephonyFeatureWithException(getCurrentPackageName(),
+ PackageManager.FEATURE_TELEPHONY_DATA, "isDataEnabledForReason");
+ }
final long identity = Binder.clearCallingIdentity();
try {
@@ -7541,14 +7611,14 @@
+ " reason=" + reason);
}
Phone phone = PhoneFactory.getPhone(phoneId);
- if (phone != null) {
+ if (phone != null && phone.getDataSettingsManager() != null) {
boolean retVal;
retVal = phone.getDataSettingsManager().isDataEnabledForReason(reason);
if (DBG) log("isDataEnabledForReason: retVal=" + retVal);
return retVal;
} else {
if (DBG) {
- loge("isDataEnabledForReason: no phone subId="
+ loge("isDataEnabledForReason: no phone or no DataSettingsManager subId="
+ subId + " retVal=false");
}
return false;
@@ -7571,8 +7641,12 @@
public int getCarrierPrivilegeStatusForUid(int subId, int uid) {
enforceReadPrivilegedPermission("getCarrierPrivilegeStatusForUid");
- enforceTelephonyFeatureWithException(getCurrentPackageName(),
- PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION, "getCarrierPrivilegeStatusForUid");
+ if (!mApp.getResources().getBoolean(
+ com.android.internal.R.bool.config_force_phone_globals_creation)) {
+ enforceTelephonyFeatureWithException(getCurrentPackageName(),
+ PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION,
+ "getCarrierPrivilegeStatusForUid");
+ }
return getCarrierPrivilegeStatusForUidWithPermission(subId, uid);
}
@@ -7618,9 +7692,12 @@
public int checkCarrierPrivilegesForPackageAnyPhone(String pkgName) {
enforceReadPrivilegedPermission("checkCarrierPrivilegesForPackageAnyPhone");
- enforceTelephonyFeatureWithException(getCurrentPackageName(),
- PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION,
- "checkCarrierPrivilegesForPackageAnyPhone");
+ if (!mApp.getResources().getBoolean(
+ com.android.internal.R.bool.config_force_phone_globals_creation)) {
+ enforceTelephonyFeatureWithException(getCurrentPackageName(),
+ PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION,
+ "checkCarrierPrivilegesForPackageAnyPhone");
+ }
return checkCarrierPrivilegesForPackageAnyPhoneWithPermission(pkgName);
}
@@ -7704,9 +7781,12 @@
public @Nullable String getCarrierServicePackageNameForLogicalSlot(int logicalSlotIndex) {
enforceReadPrivilegedPermission("getCarrierServicePackageNameForLogicalSlot");
- enforceTelephonyFeatureWithException(getCurrentPackageName(),
- PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION,
- "getCarrierServicePackageNameForLogicalSlot");
+ if (!mApp.getResources().getBoolean(
+ com.android.internal.R.bool.config_force_phone_globals_creation)) {
+ enforceTelephonyFeatureWithException(getCurrentPackageName(),
+ PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION,
+ "getCarrierServicePackageNameForLogicalSlot");
+ }
final Phone phone = PhoneFactory.getPhone(logicalSlotIndex);
if (phone == null) {
@@ -7798,6 +7878,10 @@
if (phone == null) {
return false;
}
+ if (!TextUtils.isEmpty(number) && number.length() > LINE1_NUMBER_MAX_LEN) {
+ Rlog.e(LOG_TAG, "Number is too long");
+ return false;
+ }
final String subscriberId = phone.getSubscriberId();
if (DBG_MERGE) {
@@ -7847,8 +7931,11 @@
return null;
}
- enforceTelephonyFeatureWithException(callingPackage,
- PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION, "getLine1NumberForDisplay");
+ if (!mApp.getResources().getBoolean(
+ com.android.internal.R.bool.config_force_phone_globals_creation)) {
+ enforceTelephonyFeatureWithException(callingPackage,
+ PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION, "getLine1NumberForDisplay");
+ }
final long identity = Binder.clearCallingIdentity();
try {
@@ -8074,8 +8161,11 @@
throw e;
}
- enforceTelephonyFeatureWithException(callingPackage,
- PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS, "getRadioAccessFamily");
+ if (!mApp.getResources().getBoolean(
+ com.android.internal.R.bool.config_force_phone_globals_creation)) {
+ enforceTelephonyFeatureWithException(callingPackage,
+ PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS, "getRadioAccessFamily");
+ }
final long identity = Binder.clearCallingIdentity();
try {
@@ -8089,20 +8179,15 @@
@Override
public void uploadCallComposerPicture(int subscriptionId, String callingPackage,
String contentType, ParcelFileDescriptor fd, ResultReceiver callback) {
- try {
- if (!Objects.equals(mApp.getPackageManager().getPackageUid(callingPackage, 0),
- Binder.getCallingUid())) {
- throw new SecurityException("Invalid package:" + callingPackage);
- }
- } catch (PackageManager.NameNotFoundException e) {
- throw new SecurityException("Invalid package:" + callingPackage);
- }
-
+ enforceCallingPackage(callingPackage, Binder.getCallingUid(),
+ "Invalid package:" + callingPackage);
enforceTelephonyFeatureWithException(callingPackage,
PackageManager.FEATURE_TELEPHONY_CALLING, "uploadCallComposerPicture");
RoleManager rm = mApp.getSystemService(RoleManager.class);
- List<String> dialerRoleHolders = rm.getRoleHolders(RoleManager.ROLE_DIALER);
+ List<String> dialerRoleHolders;
+ dialerRoleHolders = rm.getRoleHoldersAsUser(RoleManager.ROLE_DIALER,
+ UserHandle.of(ActivityManager.getCurrentUser()));
if (!dialerRoleHolders.contains(callingPackage)) {
throw new SecurityException("App must be the dialer role holder to"
+ " upload a call composer pic");
@@ -8525,7 +8610,7 @@
cleanUpSmsRawTable(getDefaultPhone().getContext());
// Clean up IMS settings as well here.
int slotId = getSlotIndex(subId);
- if (slotId > SubscriptionManager.INVALID_SIM_SLOT_INDEX) {
+ if (isImsAvailableOnDevice() && slotId > SubscriptionManager.INVALID_SIM_SLOT_INDEX) {
ImsManager.getInstance(mApp, slotId).factoryReset();
}
@@ -8656,8 +8741,11 @@
public void requestModemActivityInfo(ResultReceiver result) {
enforceModifyPermission();
- enforceTelephonyFeatureWithException(getCurrentPackageName(),
- PackageManager.FEATURE_TELEPHONY, "requestModemActivityInfo");
+ if (!mApp.getResources().getBoolean(
+ com.android.internal.R.bool.config_force_phone_globals_creation)) {
+ enforceTelephonyFeatureWithException(getCurrentPackageName(),
+ PackageManager.FEATURE_TELEPHONY, "requestModemActivityInfo");
+ }
WorkSource workSource = getWorkSource(Binder.getCallingUid());
@@ -8792,12 +8880,18 @@
}
/**
- * Returns the service state information on specified subscription.
+ * Returns the service state information on specified SIM slot.
*/
@Override
- public ServiceState getServiceStateForSubscriber(int subId,
- boolean renounceFineLocationAccess, boolean renounceCoarseLocationAccess,
- String callingPackage, String callingFeatureId) {
+ public ServiceState getServiceStateForSlot(int slotIndex, boolean renounceFineLocationAccess,
+ boolean renounceCoarseLocationAccess, String callingPackage, String callingFeatureId) {
+ Phone phone = PhoneFactory.getPhone(slotIndex);
+ if (phone == null) {
+ loge("getServiceStateForSlot retuning null for invalid slotIndex=" + slotIndex);
+ return null;
+ }
+
+ int subId = phone.getSubId();
if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
mApp, subId, callingPackage, callingFeatureId, "getServiceStateForSubscriber")) {
return null;
@@ -8816,7 +8910,7 @@
.setCallingFeatureId(callingFeatureId)
.setCallingPid(Binder.getCallingPid())
.setCallingUid(Binder.getCallingUid())
- .setMethod("getServiceStateForSubscriber")
+ .setMethod("getServiceStateForSlot")
.setLogAsInfo(true)
.setMinSdkVersionForFine(Build.VERSION_CODES.Q)
.setMinSdkVersionForCoarse(Build.VERSION_CODES.Q)
@@ -8834,7 +8928,7 @@
.setCallingFeatureId(callingFeatureId)
.setCallingPid(Binder.getCallingPid())
.setCallingUid(Binder.getCallingUid())
- .setMethod("getServiceStateForSubscriber")
+ .setMethod("getServiceStateForSlot")
.setLogAsInfo(true)
.setMinSdkVersionForCoarse(Build.VERSION_CODES.Q)
.setMinSdkVersionForFine(Integer.MAX_VALUE)
@@ -8844,26 +8938,18 @@
coarseLocationResult == LocationAccessPolicy.LocationPermissionResult.ALLOWED;
}
- final Phone phone = getPhone(subId);
- if (phone == null) {
- return null;
- }
-
final long identity = Binder.clearCallingIdentity();
-
- boolean isCallingPackageDataService = phone.getDataServicePackages()
- .contains(callingPackage);
try {
- // isActiveSubId requires READ_PHONE_STATE, which we already check for above
SubscriptionInfoInternal subInfo = getSubscriptionManagerService()
.getSubscriptionInfoInternal(subId);
- if (subInfo == null || !subInfo.isActive()) {
- Rlog.d(LOG_TAG, "getServiceStateForSubscriber returning null for inactive "
- + "subId=" + subId);
+ if (subInfo != null && !subInfo.isActive()) {
+ log("getServiceStateForSlot returning null for inactive subId=" + subId);
return null;
}
ServiceState ss = phone.getServiceState();
+ boolean isCallingPackageDataService = phone.getDataServicePackages()
+ .contains(callingPackage);
// Scrub out the location info in ServiceState depending on what level of access
// the caller has.
@@ -9243,11 +9329,17 @@
*/
@Override
public void getCarrierRestrictionStatus(IIntegerConsumer callback, String packageName) {
- enforceReadPermission("getCarrierRestrictionStatus");
-
+ String functionName = "getCarrierRestrictionStatus";
enforceTelephonyFeatureWithException(packageName,
- PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION, "getCarrierRestrictionStatus");
-
+ PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION, functionName);
+ try {
+ mApp.enforceCallingOrSelfPermission(
+ android.Manifest.permission.READ_BASIC_PHONE_STATE,
+ functionName);
+ } catch (SecurityException e) {
+ mApp.enforceCallingOrSelfPermission(permission.READ_PHONE_STATE,
+ functionName);
+ }
Set<Integer> carrierIds = validateCallerAndGetCarrierIds(packageName);
if (carrierIds.contains(CarrierAllowListInfo.INVALID_CARRIER_ID)) {
Rlog.e(LOG_TAG, "getCarrierRestrictionStatus: caller is not registered");
@@ -9430,7 +9522,11 @@
+ android.Manifest.permission.DUMP);
return;
}
- DumpsysHandler.dump(mApp, fd, writer, args);
+ try {
+ DumpsysHandler.dump(mApp, fd, writer, args);
+ } catch (Exception e) {
+ writer.println("Failed to dump phone information: " + e);
+ }
}
@Override
@@ -9480,7 +9576,7 @@
if (phone != null) {
if (reason == TelephonyManager.DATA_ENABLED_REASON_CARRIER) {
phone.carrierActionSetMeteredApnsEnabled(enabled);
- } else {
+ } else if (phone.getDataSettingsManager() != null) {
phone.getDataSettingsManager().setDataEnabled(
reason, enabled, callingPackage);
}
@@ -9517,8 +9613,16 @@
}
private WorkSource getWorkSource(int uid) {
- String packageName = mApp.getPackageManager().getNameForUid(uid);
- if (uid == Process.ROOT_UID && packageName == null) {
+ PackageManager pm;
+ if (mFeatureFlags.hsumPackageManager()) {
+ pm = mApp.getBaseContext().createContextAsUser(UserHandle.getUserHandleForUid(uid), 0)
+ .getPackageManager();
+ } else {
+ pm = mApp.getPackageManager();
+ }
+
+ String packageName = pm.getNameForUid(uid);
+ if (UserHandle.isSameApp(uid, Process.ROOT_UID) && packageName == null) {
// Downstream WorkSource attribution inside the RIL requires both a UID and package name
// to be set for wakelock tracking, otherwise RIL requests fail with a runtime
// exception. ROOT_UID seems not to have a valid package name returned by
@@ -10321,8 +10425,11 @@
mApp, defaultPhone.getSubId(), "isEmergencyNumber(Potential)");
}
- enforceTelephonyFeatureWithException(getCurrentPackageName(),
- PackageManager.FEATURE_TELEPHONY_CALLING, "isEmergencyNumber");
+ if (!mApp.getResources().getBoolean(
+ com.android.internal.R.bool.config_force_phone_globals_creation)) {
+ enforceTelephonyFeatureWithException(getCurrentPackageName(),
+ PackageManager.FEATURE_TELEPHONY_CALLING, "isEmergencyNumber");
+ }
final long identity = Binder.clearCallingIdentity();
try {
@@ -10784,9 +10891,35 @@
*/
@Override
public @Nullable String getCurrentPackageName() {
- PackageManager pm = mApp.getPackageManager();
- String[] packageNames = pm == null ? null : pm.getPackagesForUid(Binder.getCallingUid());
- return packageNames == null ? null : packageNames[0];
+ if (mFeatureFlags.hsumPackageManager()) {
+ PackageManager pm = mApp.getBaseContext().createContextAsUser(
+ Binder.getCallingUserHandle(), 0).getPackageManager();
+ if (pm == null) return null;
+ String[] callingUids = pm.getPackagesForUid(Binder.getCallingUid());
+ return (callingUids == null) ? null : callingUids[0];
+ }
+ if (mPackageManager == null) return null;
+ String[] callingUids = mPackageManager.getPackagesForUid(Binder.getCallingUid());
+ return (callingUids == null) ? null : callingUids[0];
+ }
+
+ /**
+ * @return The calling package name or "phone" if the caller is the phone process. This is done
+ * because multiple Phone has multiple packages in it and the first element in the array is not
+ * actually always the caller.
+ * Note: This is for logging purposes only and should not be used for security checks.
+ */
+ private String getCurrentPackageNameOrPhone() {
+ PackageManager pm;
+ if (mFeatureFlags.hsumPackageManager()) {
+ pm = mApp.getBaseContext().createContextAsUser(
+ Binder.getCallingUserHandle(), 0).getPackageManager();
+ } else {
+ pm = mApp.getPackageManager();
+ }
+ String uidName = pm == null ? null : pm.getNameForUid(Binder.getCallingUid());
+ if (uidName != null && !uidName.isEmpty()) return uidName;
+ return getCurrentPackageName();
}
/**
@@ -10822,7 +10955,8 @@
isMetered = phone.getDataNetworkController().getDataConfigManager()
.isMeteredCapability(DataUtils.apnTypeToNetworkCapability(apnType),
phone.getServiceState().getDataRoaming());
- isDataEnabled = phone.getDataSettingsManager().isDataEnabled(apnType);
+ isDataEnabled = (phone.getDataSettingsManager() != null)
+ ? phone.getDataSettingsManager().isDataEnabled(apnType) : false;
return !isMetered || isDataEnabled;
} finally {
Binder.restoreCallingIdentity(identity);
@@ -10939,7 +11073,7 @@
// Bring up choose default SMS subscription dialog right now
intent.putExtra(PickSmsSubscriptionActivity.DIALOG_TYPE_KEY,
PickSmsSubscriptionActivity.SMS_PICK_FOR_MESSAGE);
- mApp.startActivity(intent);
+ mApp.startActivityAsUser(intent, UserHandle.CURRENT);
}
@Override
@@ -10952,13 +11086,13 @@
Intent intent = new Intent(Intent.ACTION_SENDTO);
intent.setData(Uri.parse("smsto:"));
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- mApp.startActivity(intent);
+ mApp.startActivityAsUser(intent, UserHandle.CURRENT);
} catch (ActivityNotFoundException e) {
Log.w(LOG_TAG, "Unable to show intent forwarder, try showing error dialog instead");
Intent intent = new Intent();
intent.setClass(mApp, ErrorDialogActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- mApp.startActivity(intent);
+ mApp.startActivityAsUser(intent, UserHandle.CURRENT);
}
}
@@ -11012,7 +11146,7 @@
final long identity = Binder.clearCallingIdentity();
try {
Phone phone = getPhone(subscriptionId);
- if (phone == null) return false;
+ if (phone == null || phone.getDataSettingsManager() == null) return false;
return phone.getDataSettingsManager().isMobileDataPolicyEnabled(policy);
} finally {
@@ -11031,7 +11165,7 @@
final long identity = Binder.clearCallingIdentity();
try {
Phone phone = getPhone(subscriptionId);
- if (phone == null) return;
+ if (phone == null || phone.getDataSettingsManager() == null) return;
phone.getDataSettingsManager().setMobileDataPolicy(policy, enabled);
} finally {
@@ -11226,7 +11360,7 @@
// In fact, the current code acquires way too many,
// and probably has lurking deadlocks.
- if (Binder.getCallingUid() != Process.SYSTEM_UID) {
+ if (!UserHandle.isSameApp(Binder.getCallingUid(), Process.SYSTEM_UID)) {
throw new SecurityException("Only the OS may call notifyUserActivity()");
}
@@ -11268,9 +11402,12 @@
@Override
public boolean isRadioInterfaceCapabilitySupported(
final @NonNull @TelephonyManager.RadioInterfaceCapability String capability) {
- enforceTelephonyFeatureWithException(getCurrentPackageName(),
- PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS,
- "isRadioInterfaceCapabilitySupported");
+ if (!mApp.getResources().getBoolean(
+ com.android.internal.R.bool.config_force_phone_globals_creation)) {
+ enforceTelephonyFeatureWithException(getCurrentPackageName(),
+ PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS,
+ "isRadioInterfaceCapabilitySupported");
+ }
Set<String> radioInterfaceCapabilities =
mRadioInterfaceCapabilities.getCapabilities();
@@ -12265,7 +12402,7 @@
private static void validateSignalStrengthUpdateRequest(Context context,
SignalStrengthUpdateRequest request, int callingUid) {
- if (callingUid == Process.PHONE_UID || callingUid == Process.SYSTEM_UID) {
+ if (TelephonyPermissions.isSystemOrPhone(callingUid)) {
// phone/system process do not have further restriction on request
return;
}
@@ -12455,8 +12592,13 @@
String callingProcess;
try {
- callingProcess = mApp.getPackageManager().getApplicationInfo(
- getCurrentPackageName(), 0).processName;
+ if (mFeatureFlags.hsumPackageManager()) {
+ callingProcess = mApp.getPackageManager().getApplicationInfoAsUser(
+ getCurrentPackageName(), 0, Binder.getCallingUserHandle()).processName;
+ } else {
+ callingProcess = mApp.getPackageManager().getApplicationInfo(
+ getCurrentPackageName(), 0).processName;
+ }
} catch (PackageManager.NameNotFoundException e) {
callingProcess = getCurrentPackageName();
}
@@ -12744,15 +12886,31 @@
Context context = getPhoneFromSubIdOrDefault(subId).getContext();
- UserHandle userHandle = null;
- final long identity = Binder.clearCallingIdentity();
- try {
- userHandle = TelephonyUtils.getSubscriptionUserHandle(context, subId);
- } finally {
- Binder.restoreCallingIdentity(identity);
+ if (mTelecomFeatureFlags.telecomMainUserInGetRespondMessageApp()){
+ UserHandle mainUser = null;
+ Context userContext = null;
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ mainUser = mUserManager.getMainUser();
+ userContext = context.createContextAsUser(mainUser, 0);
+ Log.d(LOG_TAG, "getDefaultRespondViaMessageApplication: mainUser = " + mainUser);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+ return SmsApplication.getDefaultRespondViaMessageApplicationAsUser(userContext,
+ updateIfNeeded, mainUser);
+ } else {
+ UserHandle userHandle = null;
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ userHandle = TelephonyUtils.getSubscriptionUserHandle(context, subId);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+ return SmsApplication.getDefaultRespondViaMessageApplicationAsUser(context,
+ updateIfNeeded, userHandle);
}
- return SmsApplication.getDefaultRespondViaMessageApplicationAsUser(context,
- updateIfNeeded, userHandle);
+
}
/**
@@ -12842,8 +13000,11 @@
@Override
@SimState
public int getSimStateForSlotIndex(int slotIndex) {
- enforceTelephonyFeatureWithException(getCurrentPackageName(),
- PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION, "getSimStateForSlotIndex");
+ if (!mApp.getResources().getBoolean(
+ com.android.internal.R.bool.config_force_phone_globals_creation)) {
+ enforceTelephonyFeatureWithException(getCurrentPackageName(),
+ PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION, "getSimStateForSlotIndex");
+ }
IccCardConstants.State simState;
if (slotIndex < 0) {
@@ -12998,11 +13159,38 @@
}
/**
+ * Returns whether the AOSP domain selection service is supported.
+ *
+ * @return {@code true} if the AOSP domain selection service is supported,
+ * {@code false} otherwise.
+ */
+ @Override
+ public boolean isAospDomainSelectionService() {
+ mApp.enforceCallingOrSelfPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
+ "isAospDomainSelectionService");
+
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ if (DomainSelectionResolver.getInstance().isDomainSelectionSupported()) {
+ String dssComponentName = mApp.getResources().getString(
+ R.string.config_domain_selection_service_component_name);
+ ComponentName componentName = ComponentName.createRelative(mApp.getPackageName(),
+ TelephonyDomainSelectionService.class.getName());
+ Log.i(LOG_TAG, "isAospDomainSelectionService dss=" + dssComponentName
+ + ", aosp=" + componentName.flattenToString());
+ return TextUtils.equals(componentName.flattenToString(), dssComponentName);
+ }
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+ return false;
+ }
+
+ /**
* Request to enable or disable the satellite modem and demo mode. If the satellite modem is
* enabled, this may also disable the cellular modem, and if the satellite modem is disabled,
* this may also re-enable the cellular modem.
*
- * @param subId The subId of the subscription to set satellite enabled for.
* @param enableSatellite {@code true} to enable the satellite modem and
* {@code false} to disable.
* @param enableDemoMode {@code true} to enable demo mode and {@code false} to disable.
@@ -13012,7 +13200,7 @@
* @throws SecurityException if the caller doesn't have the required permission.
*/
@Override
- public void requestSatelliteEnabled(int subId, boolean enableSatellite, boolean enableDemoMode,
+ public void requestSatelliteEnabled(boolean enableSatellite, boolean enableDemoMode,
boolean isEmergency, @NonNull IIntegerConsumer callback) {
enforceSatelliteCommunicationPermission("requestSatelliteEnabled");
if (enableSatellite) {
@@ -13037,93 +13225,86 @@
}
if (isAllowed) {
mSatelliteController.requestSatelliteEnabled(
- subId, enableSatellite, enableDemoMode, isEmergency, callback);
+ enableSatellite, enableDemoMode, isEmergency, callback);
} else {
result.accept(SATELLITE_RESULT_ACCESS_BARRED);
}
}
};
mSatelliteAccessController.requestIsCommunicationAllowedForCurrentLocation(
- subId, resultReceiver);
+ resultReceiver, true);
} else {
// No need to check if satellite is allowed at current location when disabling satellite
mSatelliteController.requestSatelliteEnabled(
- subId, enableSatellite, enableDemoMode, isEmergency, callback);
+ enableSatellite, enableDemoMode, isEmergency, callback);
}
}
/**
* Request to get whether the satellite modem is enabled.
*
- * @param subId The subId of the subscription to check whether satellite is enabled for.
* @param result The result receiver that returns whether the satellite modem is enabled
* if the request is successful or an error code if the request failed.
*
* @throws SecurityException if the caller doesn't have the required permission.
*/
@Override
- public void requestIsSatelliteEnabled(int subId, @NonNull ResultReceiver result) {
+ public void requestIsSatelliteEnabled(@NonNull ResultReceiver result) {
enforceSatelliteCommunicationPermission("requestIsSatelliteEnabled");
- mSatelliteController.requestIsSatelliteEnabled(subId, result);
+ mSatelliteController.requestIsSatelliteEnabled(result);
}
/**
* Request to get whether the satellite service demo mode is enabled.
*
- * @param subId The subId of the subscription to check whether the satellite demo mode
- * is enabled for.
* @param result The result receiver that returns whether the satellite demo mode is enabled
* if the request is successful or an error code if the request failed.
*
* @throws SecurityException if the caller doesn't have the required permission.
*/
@Override
- public void requestIsDemoModeEnabled(int subId, @NonNull ResultReceiver result) {
+ public void requestIsDemoModeEnabled(@NonNull ResultReceiver result) {
enforceSatelliteCommunicationPermission("requestIsDemoModeEnabled");
- mSatelliteController.requestIsDemoModeEnabled(subId, result);
+ mSatelliteController.requestIsDemoModeEnabled(result);
}
/**
* Request to get whether the satellite service is enabled with emergency mode.
*
- * @param subId The subId of the subscription to check whether the satellite demo mode
- * is enabled for.
* @param result The result receiver that returns whether the satellite emergency mode is
* enabled if the request is successful or an error code if the request failed.
*
* @throws SecurityException if the caller doesn't have the required permission.
*/
@Override
- public void requestIsEmergencyModeEnabled(int subId, @NonNull ResultReceiver result) {
+ public void requestIsEmergencyModeEnabled(@NonNull ResultReceiver result) {
enforceSatelliteCommunicationPermission("requestIsEmergencyModeEnabled");
- result.send(SATELLITE_RESULT_REQUEST_NOT_SUPPORTED, null);
+ mSatelliteController.requestIsEmergencyModeEnabled(result);
}
/**
* Request to get whether the satellite service is supported on the device.
*
- * @param subId The subId of the subscription to check satellite service support for.
* @param result The result receiver that returns whether the satellite service is supported on
* the device if the request is successful or an error code if the request failed.
*/
@Override
- public void requestIsSatelliteSupported(int subId, @NonNull ResultReceiver result) {
- mSatelliteController.requestIsSatelliteSupported(subId, result);
+ public void requestIsSatelliteSupported(@NonNull ResultReceiver result) {
+ mSatelliteController.requestIsSatelliteSupported(result);
}
/**
* Request to get the {@link SatelliteCapabilities} of the satellite service.
*
- * @param subId The subId of the subscription to get the satellite capabilities for.
* @param result The result receiver that returns the {@link SatelliteCapabilities}
* if the request is successful or an error code if the request failed.
*
* @throws SecurityException if the caller doesn't have required permission.
*/
@Override
- public void requestSatelliteCapabilities(int subId, @NonNull ResultReceiver result) {
+ public void requestSatelliteCapabilities(@NonNull ResultReceiver result) {
enforceSatelliteCommunicationPermission("requestSatelliteCapabilities");
- mSatelliteController.requestSatelliteCapabilities(subId, result);
+ mSatelliteController.requestSatelliteCapabilities(result);
}
/**
@@ -13131,44 +13312,41 @@
* This can be called by the pointing UI when the user starts pointing to the satellite.
* Modem should continue to report the pointing input as the device or satellite moves.
*
- * @param subId The subId of the subscription to start satellite transmission updates for.
* @param resultCallback The callback to get the result of the request.
* @param callback The callback to notify of satellite transmission updates.
*
* @throws SecurityException if the caller doesn't have the required permission.
*/
@Override
- public void startSatelliteTransmissionUpdates(int subId,
+ public void startSatelliteTransmissionUpdates(
@NonNull IIntegerConsumer resultCallback,
@NonNull ISatelliteTransmissionUpdateCallback callback) {
enforceSatelliteCommunicationPermission("startSatelliteTransmissionUpdates");
- mSatelliteController.startSatelliteTransmissionUpdates(subId, resultCallback, callback);
+ mSatelliteController.startSatelliteTransmissionUpdates(resultCallback, callback);
}
/**
* Stop receiving satellite transmission updates.
* This can be called by the pointing UI when the user stops pointing to the satellite.
*
- * @param subId The subId of the subscription to stop satellite transmission updates for.
* @param resultCallback The callback to get the result of the request.
* @param callback The callback that was passed to {@link #startSatelliteTransmissionUpdates(
- * int, IIntegerConsumer, ISatelliteTransmissionUpdateCallback)}.
+ * IIntegerConsumer, ISatelliteTransmissionUpdateCallback)}.
*
* @throws SecurityException if the caller doesn't have the required permission.
*/
@Override
- public void stopSatelliteTransmissionUpdates(int subId,
+ public void stopSatelliteTransmissionUpdates(
@NonNull IIntegerConsumer resultCallback,
@NonNull ISatelliteTransmissionUpdateCallback callback) {
enforceSatelliteCommunicationPermission("stopSatelliteTransmissionUpdates");
- mSatelliteController.stopSatelliteTransmissionUpdates(subId, resultCallback, callback);
+ mSatelliteController.stopSatelliteTransmissionUpdates(resultCallback, callback);
}
/**
* Register the subscription with a satellite provider.
* This is needed to register the subscription if the provider allows dynamic registration.
*
- * @param subId The subId of the subscription to be provisioned.
* @param token The token to be used as a unique identifier for provisioning with satellite
* gateway.
* @param provisionData Data from the provisioning app that can be used by provisioning server
@@ -13180,11 +13358,11 @@
* @throws SecurityException if the caller doesn't have the required permission.
*/
@Override
- @Nullable public ICancellationSignal provisionSatelliteService(int subId,
+ @Nullable public ICancellationSignal provisionSatelliteService(
@NonNull String token, @NonNull byte[] provisionData,
@NonNull IIntegerConsumer callback) {
enforceSatelliteCommunicationPermission("provisionSatelliteService");
- return mSatelliteController.provisionSatelliteService(subId, token, provisionData,
+ return mSatelliteController.provisionSatelliteService(token, provisionData,
callback);
}
@@ -13194,23 +13372,21 @@
* {@link SatelliteProvisionStateCallback#onSatelliteProvisionStateChanged(boolean)}
* should report as deprovisioned.
*
- * @param subId The subId of the subscription to be deprovisioned.
* @param token The token of the device/subscription to be deprovisioned.
* @param callback The callback to get the result of the request.
*
* @throws SecurityException if the caller doesn't have the required permission.
*/
@Override
- public void deprovisionSatelliteService(int subId,
+ public void deprovisionSatelliteService(
@NonNull String token, @NonNull IIntegerConsumer callback) {
enforceSatelliteCommunicationPermission("deprovisionSatelliteService");
- mSatelliteController.deprovisionSatelliteService(subId, token, callback);
+ mSatelliteController.deprovisionSatelliteService(token, callback);
}
/**
* Registers for the satellite provision state changed.
*
- * @param subId The subId of the subscription to register for provision state changed.
* @param callback The callback to handle the satellite provision state changed event.
*
* @return The {@link SatelliteManager.SatelliteResult} result of the operation.
@@ -13219,32 +13395,30 @@
*/
@Override
@SatelliteManager.SatelliteResult public int registerForSatelliteProvisionStateChanged(
- int subId, @NonNull ISatelliteProvisionStateCallback callback) {
+ @NonNull ISatelliteProvisionStateCallback callback) {
enforceSatelliteCommunicationPermission("registerForSatelliteProvisionStateChanged");
- return mSatelliteController.registerForSatelliteProvisionStateChanged(subId, callback);
+ return mSatelliteController.registerForSatelliteProvisionStateChanged(callback);
}
/**
* Unregisters for the satellite provision state changed.
* If callback was not registered before, the request will be ignored.
*
- * @param subId The subId of the subscription to unregister for provision state changed.
* @param callback The callback that was passed to
- * {@link #registerForSatelliteProvisionStateChanged(int, ISatelliteProvisionStateCallback)}.
+ * {@link #registerForSatelliteProvisionStateChanged(ISatelliteProvisionStateCallback)}.
*
* @throws SecurityException if the caller doesn't have the required permission.
*/
@Override
public void unregisterForSatelliteProvisionStateChanged(
- int subId, @NonNull ISatelliteProvisionStateCallback callback) {
+ @NonNull ISatelliteProvisionStateCallback callback) {
enforceSatelliteCommunicationPermission("unregisterForSatelliteProvisionStateChanged");
- mSatelliteController.unregisterForSatelliteProvisionStateChanged(subId, callback);
+ mSatelliteController.unregisterForSatelliteProvisionStateChanged(callback);
}
/**
* Request to get whether the device is provisioned with a satellite provider.
*
- * @param subId The subId of the subscription to get whether the device is provisioned for.
* @param result The result receiver that returns whether the device is provisioned with a
* satellite provider if the request is successful or an error code if the
* request failed.
@@ -13252,15 +13426,14 @@
* @throws SecurityException if the caller doesn't have the required permission.
*/
@Override
- public void requestIsSatelliteProvisioned(int subId, @NonNull ResultReceiver result) {
+ public void requestIsSatelliteProvisioned(@NonNull ResultReceiver result) {
enforceSatelliteCommunicationPermission("requestIsSatelliteProvisioned");
- mSatelliteController.requestIsSatelliteProvisioned(subId, result);
+ mSatelliteController.requestIsSatelliteProvisioned(result);
}
/**
* Registers for modem state changed from satellite modem.
*
- * @param subId The subId of the subscription to register for satellite modem state changed.
* @param callback The callback to handle the satellite modem state changed event.
*
* @return The {@link SatelliteManager.SatelliteResult} result of the operation.
@@ -13268,33 +13441,30 @@
* @throws SecurityException if the caller doesn't have the required permission.
*/
@Override
- @SatelliteManager.SatelliteResult public int registerForSatelliteModemStateChanged(int subId,
+ @SatelliteManager.SatelliteResult public int registerForSatelliteModemStateChanged(
@NonNull ISatelliteModemStateCallback callback) {
enforceSatelliteCommunicationPermission("registerForSatelliteModemStateChanged");
- return mSatelliteController.registerForSatelliteModemStateChanged(subId, callback);
+ return mSatelliteController.registerForSatelliteModemStateChanged(callback);
}
/**
* Unregisters for modem state changed from satellite modem.
* If callback was not registered before, the request will be ignored.
*
- * @param subId The subId of the subscription to unregister for satellite modem state changed.
* @param callback The callback that was passed to
* {@link #registerForModemStateChanged(int, ISatelliteModemStateCallback)}.
*
* @throws SecurityException if the caller doesn't have the required permission.
*/
@Override
- public void unregisterForModemStateChanged(int subId,
- @NonNull ISatelliteModemStateCallback callback) {
+ public void unregisterForModemStateChanged(@NonNull ISatelliteModemStateCallback callback) {
enforceSatelliteCommunicationPermission("unregisterForModemStateChanged");
- mSatelliteController.unregisterForModemStateChanged(subId, callback);
+ mSatelliteController.unregisterForModemStateChanged(callback);
}
/**
* Register to receive incoming datagrams over satellite.
*
- * @param subId The subId of the subscription to register for incoming satellite datagrams.
* @param callback The callback to handle incoming datagrams over satellite.
*
* @return The {@link SatelliteManager.SatelliteResult} result of the operation.
@@ -13302,27 +13472,25 @@
* @throws SecurityException if the caller doesn't have the required permission.
*/
@Override
- @SatelliteManager.SatelliteResult public int registerForIncomingDatagram(int subId,
+ @SatelliteManager.SatelliteResult public int registerForIncomingDatagram(
@NonNull ISatelliteDatagramCallback callback) {
enforceSatelliteCommunicationPermission("registerForIncomingDatagram");
- return mSatelliteController.registerForIncomingDatagram(subId, callback);
+ return mSatelliteController.registerForIncomingDatagram(callback);
}
/**
* Unregister to stop receiving incoming datagrams over satellite.
* If callback was not registered before, the request will be ignored.
*
- * @param subId The subId of the subscription to unregister for incoming satellite datagrams.
* @param callback The callback that was passed to
- * {@link #registerForIncomingDatagram(int, ISatelliteDatagramCallback)}.
+ * {@link #registerForIncomingDatagram(ISatelliteDatagramCallback)}.
*
* @throws SecurityException if the caller doesn't have the required permission.
*/
@Override
- public void unregisterForIncomingDatagram(int subId,
- @NonNull ISatelliteDatagramCallback callback) {
+ public void unregisterForIncomingDatagram(@NonNull ISatelliteDatagramCallback callback) {
enforceSatelliteCommunicationPermission("unregisterForIncomingDatagram");
- mSatelliteController.unregisterForIncomingDatagram(subId, callback);
+ mSatelliteController.unregisterForIncomingDatagram(callback);
}
/**
@@ -13332,14 +13500,13 @@
* satellite. If there are any incoming datagrams, they will be received via
* {@link SatelliteDatagramCallback#onSatelliteDatagramReceived(long, SatelliteDatagram, int, Consumer)})}
*
- * @param subId The subId of the subscription used for receiving datagrams.
* @param callback The callback to get {@link SatelliteManager.SatelliteResult} of the request.
*
* @throws SecurityException if the caller doesn't have required permission.
*/
- public void pollPendingDatagrams(int subId, IIntegerConsumer callback) {
+ public void pollPendingDatagrams(IIntegerConsumer callback) {
enforceSatelliteCommunicationPermission("pollPendingDatagrams");
- mSatelliteController.pollPendingDatagrams(subId, callback);
+ mSatelliteController.pollPendingDatagrams(callback);
}
/**
@@ -13349,7 +13516,6 @@
* input to this method. Datagram received here will be passed down to modem without any
* encoding or encryption.
*
- * @param subId The subId of the subscription to send satellite datagrams for.
* @param datagramType datagram type indicating whether the datagram is of type
* SOS_SMS or LOCATION_SHARING.
* @param datagram encoded gateway datagram which is encrypted by the caller.
@@ -13361,11 +13527,11 @@
* @throws SecurityException if the caller doesn't have required permission.
*/
@Override
- public void sendDatagram(int subId, @SatelliteManager.DatagramType int datagramType,
+ public void sendDatagram(@SatelliteManager.DatagramType int datagramType,
@NonNull SatelliteDatagram datagram, boolean needFullScreenPointingUI,
@NonNull IIntegerConsumer callback) {
enforceSatelliteCommunicationPermission("sendDatagram");
- mSatelliteController.sendDatagram(subId, datagramType, datagram, needFullScreenPointingUI,
+ mSatelliteController.sendDatagram(datagramType, datagram, needFullScreenPointingUI,
callback);
}
@@ -13384,29 +13550,26 @@
public void requestIsCommunicationAllowedForCurrentLocation(int subId,
@NonNull ResultReceiver result) {
enforceSatelliteCommunicationPermission("requestIsCommunicationAllowedForCurrentLocation");
- mSatelliteAccessController.requestIsCommunicationAllowedForCurrentLocation(subId,
- result);
+ mSatelliteAccessController.requestIsCommunicationAllowedForCurrentLocation(result, false);
}
/**
* Request to get the time after which the satellite will be visible.
*
- * @param subId The subId to get the time after which the satellite will be visible for.
* @param result The result receiver that returns the time after which the satellite will
* be visible if the request is successful or an error code if the request failed.
*
* @throws SecurityException if the caller doesn't have the required permission.
*/
@Override
- public void requestTimeForNextSatelliteVisibility(int subId, @NonNull ResultReceiver result) {
+ public void requestTimeForNextSatelliteVisibility(@NonNull ResultReceiver result) {
enforceSatelliteCommunicationPermission("requestTimeForNextSatelliteVisibility");
- mSatelliteController.requestTimeForNextSatelliteVisibility(subId, result);
+ mSatelliteController.requestTimeForNextSatelliteVisibility(result);
}
/**
* Inform that Device is aligned to satellite for demo mode.
*
- * @param subId The subId to get the time after which the satellite will be visible for.
* @param isAligned {@code true} Device is aligned with the satellite for demo mode
* {@code false} Device fails to align with the satellite for demo mode.
*
@@ -13414,9 +13577,9 @@
*/
@RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)
- public void setDeviceAlignedWithSatellite(int subId, @NonNull boolean isAligned) {
+ public void setDeviceAlignedWithSatellite(@NonNull boolean isAligned) {
enforceSatelliteCommunicationPermission("informDeviceAlignedToSatellite");
- mSatelliteController.setDeviceAlignedWithSatellite(subId, isAligned);
+ mSatelliteController.setDeviceAlignedWithSatellite(isAligned);
}
/**
@@ -13491,18 +13654,17 @@
/**
* Request to get the signal strength of the satellite connection.
*
- * @param subId The subId of the subscription to request for.
* @param result Result receiver to get the error code of the request and the current signal
* strength of the satellite connection.
*
* @throws SecurityException if the caller doesn't have required permission.
*/
@Override
- public void requestNtnSignalStrength(int subId, @NonNull ResultReceiver result) {
+ public void requestNtnSignalStrength(@NonNull ResultReceiver result) {
enforceSatelliteCommunicationPermission("requestNtnSignalStrength");
final long identity = Binder.clearCallingIdentity();
try {
- mSatelliteController.requestNtnSignalStrength(subId, result);
+ mSatelliteController.requestNtnSignalStrength(result);
} finally {
Binder.restoreCallingIdentity(identity);
}
@@ -13513,7 +13675,6 @@
* is not successful, a {@link ServiceSpecificException} that contains
* {@link SatelliteManager.SatelliteResult} will be thrown.
*
- * @param subId The subId of the subscription to request for.
* @param callback The callback to handle the NTN signal strength changed event. If the
* operation is successful, {@link NtnSignalStrengthCallback#onNtnSignalStrengthChanged(
* NtnSignalStrength)} will return an instance of {@link NtnSignalStrength} with a value of
@@ -13524,12 +13685,12 @@
* @throws ServiceSpecificException If the callback registration operation fails.
*/
@Override
- public void registerForNtnSignalStrengthChanged(int subId,
+ public void registerForNtnSignalStrengthChanged(
@NonNull INtnSignalStrengthCallback callback) throws RemoteException {
enforceSatelliteCommunicationPermission("registerForNtnSignalStrengthChanged");
final long identity = Binder.clearCallingIdentity();
try {
- mSatelliteController.registerForNtnSignalStrengthChanged(subId, callback);
+ mSatelliteController.registerForNtnSignalStrengthChanged(callback);
} finally {
Binder.restoreCallingIdentity(identity);
}
@@ -13539,20 +13700,19 @@
* Unregisters for NTN signal strength changed from satellite modem.
* If callback was not registered before, the request will be ignored.
*
- * @param subId The subId of the subscription to unregister for listening NTN signal strength
* changed event.
* @param callback The callback that was passed to
- * {@link #registerForNtnSignalStrengthChanged(int, INtnSignalStrengthCallback)}
+ * {@link #registerForNtnSignalStrengthChanged(INtnSignalStrengthCallback)}
*
* @throws SecurityException if the caller doesn't have the required permission.
*/
@Override
public void unregisterForNtnSignalStrengthChanged(
- int subId, @NonNull INtnSignalStrengthCallback callback) {
+ @NonNull INtnSignalStrengthCallback callback) {
enforceSatelliteCommunicationPermission("unregisterForNtnSignalStrengthChanged");
final long identity = Binder.clearCallingIdentity();
try {
- mSatelliteController.unregisterForNtnSignalStrengthChanged(subId, callback);
+ mSatelliteController.unregisterForNtnSignalStrengthChanged(callback);
} finally {
Binder.restoreCallingIdentity(identity);
}
@@ -13561,7 +13721,6 @@
/**
* Registers for satellite capabilities change event from the satellite service.
*
- * @param subId The subId of the subscription to request for.
* @param callback The callback to handle the satellite capabilities changed event.
*
* @return The {@link SatelliteManager.SatelliteResult} result of the operation.
@@ -13570,11 +13729,11 @@
*/
@Override
@SatelliteManager.SatelliteResult public int registerForCapabilitiesChanged(
- int subId, @NonNull ISatelliteCapabilitiesCallback callback) {
+ @NonNull ISatelliteCapabilitiesCallback callback) {
enforceSatelliteCommunicationPermission("registerForCapabilitiesChanged");
final long identity = Binder.clearCallingIdentity();
try {
- return mSatelliteController.registerForCapabilitiesChanged(subId, callback);
+ return mSatelliteController.registerForCapabilitiesChanged(callback);
} finally {
Binder.restoreCallingIdentity(identity);
}
@@ -13584,19 +13743,18 @@
* Unregisters for satellite capabilities change event from the satellite service.
* If callback was not registered before, the request will be ignored.
*
- * @param subId The subId of the subscription to unregister for satellite capabilities change.
* @param callback The callback that was passed to.
- * {@link #registerForCapabilitiesChanged(int, ISatelliteCapabilitiesCallback)}.
+ * {@link #registerForCapabilitiesChanged(ISatelliteCapabilitiesCallback)}.
*
* @throws SecurityException if the caller doesn't have required permission.
*/
@Override
- public void unregisterForCapabilitiesChanged(int subId,
+ public void unregisterForCapabilitiesChanged(
@NonNull ISatelliteCapabilitiesCallback callback) {
enforceSatelliteCommunicationPermission("unregisterForCapabilitiesChanged");
final long identity = Binder.clearCallingIdentity();
try {
- mSatelliteController.unregisterForCapabilitiesChanged(subId, callback);
+ mSatelliteController.unregisterForCapabilitiesChanged(callback);
} finally {
Binder.restoreCallingIdentity(identity);
}
@@ -13605,7 +13763,6 @@
/**
* Registers for the satellite supported state changed.
*
- * @param subId The subId of the subscription to register for supported state changed.
* @param callback The callback to handle the satellite supported state changed event.
*
* @return The {@link SatelliteManager.SatelliteResult} result of the operation.
@@ -13614,43 +13771,47 @@
*/
@Override
@SatelliteManager.SatelliteResult public int registerForSatelliteSupportedStateChanged(
- int subId, @NonNull ISatelliteSupportedStateCallback callback) {
+ @NonNull ISatelliteSupportedStateCallback callback) {
enforceSatelliteCommunicationPermission("registerForSatelliteSupportedStateChanged");
- return mSatelliteController.registerForSatelliteSupportedStateChanged(subId, callback);
+ return mSatelliteController.registerForSatelliteSupportedStateChanged(callback);
}
/**
* Unregisters for the satellite supported state changed.
* If callback was not registered before, the request will be ignored.
*
- * @param subId The subId of the subscription to unregister for supported state changed.
* @param callback The callback that was passed to
- * {@link #registerForSatelliteSupportedStateChanged(int, ISatelliteSupportedStateCallback)}.
+ * {@link #registerForSatelliteSupportedStateChanged(ISatelliteSupportedStateCallback)}.
*
* @throws SecurityException if the caller doesn't have the required permission.
*/
@Override
public void unregisterForSatelliteSupportedStateChanged(
- int subId, @NonNull ISatelliteSupportedStateCallback callback) {
+ @NonNull ISatelliteSupportedStateCallback callback) {
enforceSatelliteCommunicationPermission("unregisterForSatelliteSupportedStateChanged");
- mSatelliteController.unregisterForSatelliteSupportedStateChanged(subId, callback);
+ mSatelliteController.unregisterForSatelliteSupportedStateChanged(callback);
}
/**
* This API can be used by only CTS to update satellite vendor service package name.
*
* @param servicePackageName The package name of the satellite vendor service.
+ * @param provisioned Whether satellite should be provisioned or not.
+ *
* @return {@code true} if the satellite vendor service is set successfully,
* {@code false} otherwise.
*/
- public boolean setSatelliteServicePackageName(String servicePackageName) {
- Log.d(LOG_TAG, "setSatelliteServicePackageName - " + servicePackageName);
+ public boolean setSatelliteServicePackageName(String servicePackageName,
+ String provisioned) {
+ Log.d(LOG_TAG, "setSatelliteServicePackageName - " + servicePackageName
+ + ", provisioned=" + provisioned);
TelephonyPermissions.enforceShellOnly(
Binder.getCallingUid(), "setSatelliteServicePackageName");
TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp,
SubscriptionManager.INVALID_SUBSCRIPTION_ID,
"setSatelliteServicePackageName");
- return mSatelliteController.setSatelliteServicePackageName(servicePackageName);
+ return mSatelliteController.setSatelliteServicePackageName(servicePackageName,
+ provisioned);
}
/**
@@ -13709,6 +13870,22 @@
}
/**
+ * This API can be used by only CTS to control ingoring cellular service state event.
+ *
+ * @param enabled Whether to enable boolean config.
+ * @return {@code true} if the value is set successfully, {@code false} otherwise.
+ */
+ public boolean setSatelliteIgnoreCellularServiceState(boolean enabled) {
+ Log.d(LOG_TAG, "setSatelliteIgnoreServiceState - " + enabled);
+ TelephonyPermissions.enforceShellOnly(
+ Binder.getCallingUid(), "setSatelliteIgnoreServiceState");
+ TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp,
+ SubscriptionManager.INVALID_SUBSCRIPTION_ID,
+ "setSatelliteIgnoreServiceState");
+ return mSatelliteController.setSatelliteIgnoreCellularServiceState(enabled);
+ }
+
+ /**
* This API can be used by only CTS to override the timeout durations used by the
* DatagramController module.
*
@@ -13729,6 +13906,26 @@
}
/**
+ * This API can be used by only CTS to override the boolean configs used by the
+ * DatagramController module.
+ *
+ * @param enable Whether to enable or disable boolean config.
+ * @return {@code true} if the boolean config is set successfully, {@code false} otherwise.
+ */
+ public boolean setDatagramControllerBooleanConfig(
+ boolean reset, int booleanType, boolean enable) {
+ Log.d(LOG_TAG, "setDatagramControllerBooleanConfig: booleanType=" + booleanType
+ + ", reset=" + reset + ", enable=" + enable);
+ TelephonyPermissions.enforceShellOnly(
+ Binder.getCallingUid(), "setDatagramControllerBooleanConfig");
+ TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp,
+ SubscriptionManager.INVALID_SUBSCRIPTION_ID,
+ "ssetDatagramControllerBooleanConfig");
+ return mSatelliteController.setDatagramControllerBooleanConfig(reset, booleanType, enable);
+ }
+
+
+ /**
* This API can be used by only CTS to override the timeout durations used by the
* SatelliteController module.
*
@@ -13810,9 +14007,9 @@
TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp,
SubscriptionManager.INVALID_SUBSCRIPTION_ID,
"setCachedLocationCountryCode");
- return TelephonyCountryDetector.getInstance(getDefaultPhone().getContext()).setCountryCodes(
- reset, currentNetworkCountryCodes, cachedNetworkCountryCodes, locationCountryCode,
- locationCountryCodeTimestampNanos);
+ return TelephonyCountryDetector.getInstance(getDefaultPhone().getContext(), mFeatureFlags)
+ .setCountryCodes(reset, currentNetworkCountryCodes, cachedNetworkCountryCodes,
+ locationCountryCode, locationCountryCodeTimestampNanos);
}
/**
@@ -13867,6 +14064,32 @@
}
/**
+ * This API can be used by only CTS to set the cache whether satellite communication is allowed.
+ *
+ * @param state a state indicates whether satellite access allowed state should be cached and
+ * the allowed state.
+ * @return {@code true} if the setting is successful, {@code false} otherwise.
+ */
+ public boolean setIsSatelliteCommunicationAllowedForCurrentLocationCache(String state) {
+ if (!mFeatureFlags.oemEnabledSatelliteFlag()) {
+ Log.d(LOG_TAG, "setIsSatelliteCommunicationAllowedForCurrentLocationCache: "
+ + "oemEnabledSatelliteFlag is disabled");
+ return false;
+ }
+
+ Log.d(LOG_TAG, "setIsSatelliteCommunicationAllowedForCurrentLocationCache: "
+ + "state=" + state);
+ TelephonyPermissions.enforceShellOnly(
+ Binder.getCallingUid(),
+ "setIsSatelliteCommunicationAllowedForCurrentLocationCache");
+ TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp,
+ SubscriptionManager.INVALID_SUBSCRIPTION_ID,
+ "setIsSatelliteCommunicationAllowedForCurrentLocationCache");
+ return mSatelliteAccessController.setIsSatelliteCommunicationAllowedForCurrentLocationCache(
+ state);
+ }
+
+ /**
* Sets the service defined in ComponentName to be bound.
*
* This should only be used for testing.
@@ -14100,7 +14323,11 @@
if (!mFeatureFlags.enforceTelephonyFeatureMappingForPublicApis()
|| !CompatChanges.isChangeEnabled(ENABLE_FEATURE_MAPPING, callingPackage,
- Binder.getCallingUserHandle())) {
+ Binder.getCallingUserHandle())
+ || mVendorApiLevel < Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+ // Skip to check associated telephony feature,
+ // if compatibility change is not enabled for the current process or
+ // the SDK version of vendor partition is less than Android V.
return;
}
@@ -14109,4 +14336,173 @@
methodName + " is unsupported without " + telephonyFeature);
}
}
+
+ /**
+ * Registers for the satellite communication allowed state changed.
+ *
+ * @param subId The subId of the subscription to register for the satellite communication
+ * allowed state changed.
+ * @param callback The callback to handle the satellite communication allowed
+ * state changed event.
+ *
+ * @return The {@link SatelliteManager.SatelliteResult} result of the operation.
+ *
+ * @throws SecurityException if the caller doesn't have the required permission.
+ */
+ @Override
+ @SatelliteManager.SatelliteResult public int registerForCommunicationAllowedStateChanged(
+ int subId, @NonNull ISatelliteCommunicationAllowedStateCallback callback) {
+ enforceSatelliteCommunicationPermission("registerForCommunicationAllowedStateChanged");
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ return mSatelliteAccessController.registerForCommunicationAllowedStateChanged(
+ subId, callback);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+ }
+
+ /**
+ * Unregisters for the satellite communication allowed state changed.
+ * If callback was not registered before, the request will be ignored.
+ *
+ * @param subId The subId of the subscription to unregister for the satellite communication
+ * allowed state changed.
+ * @param callback The callback that was passed to
+ * {@link #registerForCommunicationAllowedStateChanged(int,
+ * ISatelliteCommunicationAllowedStateCallback)}. *
+ * @throws SecurityException if the caller doesn't have the required permission.
+ */
+ @Override
+ public void unregisterForCommunicationAllowedStateChanged(
+ int subId, @NonNull ISatelliteCommunicationAllowedStateCallback callback) {
+ enforceSatelliteCommunicationPermission("unregisterForCommunicationAllowedStateChanged");
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ mSatelliteAccessController.unregisterForCommunicationAllowedStateChanged(subId,
+ callback);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+ }
+
+ /**
+ * Request to get the {@link SatelliteSessionStats} of the satellite service.
+ *
+ * @param subId The subId of the subscription to the satellite session stats for.
+ * @param result The result receiver that returns the {@link SatelliteSessionStats}
+ * if the request is successful or an error code if the request failed.
+ *
+ * @throws SecurityException if the caller doesn't have required permission.
+ */
+ @Override
+ public void requestSatelliteSessionStats(int subId, @NonNull ResultReceiver result) {
+ enforceModifyPermission();
+ enforcePackageUsageStatsPermission("requestSatelliteSessionStats");
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ mSatelliteController.requestSatelliteSessionStats(subId, result);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+ }
+
+ /**
+ * Request to get list of prioritized satellite subscriber ids to be used for provision.
+ *
+ * @param result The result receiver, which returns the list of prioritized satellite tokens
+ * to be used for provision if the request is successful or an error code if the request failed.
+ *
+ * @throws SecurityException if the caller doesn't have the required permission.
+ */
+ @Override
+ public void requestSatelliteSubscriberProvisionStatus(@NonNull ResultReceiver result) {
+ enforceSatelliteCommunicationPermission("requestSatelliteSubscriberProvisionStatus");
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ mSatelliteController.requestSatelliteSubscriberProvisionStatus(result);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+ }
+
+ /**
+ * Deliver the list of provisioned satellite subscriber ids.
+ *
+ * @param list List of provisioned satellite subscriber ids.
+ * @param result The result receiver that returns whether deliver success or fail.
+ *
+ * @throws SecurityException if the caller doesn't have the required permission.
+ */
+ @Override
+ public void provisionSatellite(@NonNull List<SatelliteSubscriberInfo> list,
+ @NonNull ResultReceiver result) {
+ enforceSatelliteCommunicationPermission("provisionSatellite");
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ mSatelliteController.provisionSatellite(list, result);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+ }
+
+ /**
+ * This API can be used by only CTS to override the cached value for the device overlay config
+ * value :
+ * config_satellite_gateway_service_package and
+ * config_satellite_carrier_roaming_esos_provisioned_class.
+ * These values are set before sending an intent to broadcast there are any change to list of
+ * subscriber informations.
+ *
+ * @param name the name is one of the following that constitute an intent.
+ * Component package name, or component class name.
+ * @return {@code true} if the setting is successful, {@code false} otherwise.
+ */
+ @Override
+ public boolean setSatelliteSubscriberIdListChangedIntentComponent(String name) {
+ if (!mFeatureFlags.carrierRoamingNbIotNtn()) {
+ Log.d(LOG_TAG, "setSatelliteSubscriberIdListChangedIntentComponent:"
+ + " carrierRoamingNbIotNtn is disabled");
+ return false;
+ }
+ Log.d(LOG_TAG, "setSatelliteSubscriberIdListChangedIntentComponent");
+ TelephonyPermissions.enforceShellOnly(
+ Binder.getCallingUid(), "setSatelliteSubscriberIdListChangedIntentComponent");
+ TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp,
+ SubscriptionManager.INVALID_SUBSCRIPTION_ID,
+ "setSatelliteSubscriberIdListChangedIntentComponent");
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ return mSatelliteController.setSatelliteSubscriberIdListChangedIntentComponent(name);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+ }
+
+ /**
+ * This API can be used by only CTS to override the Euicc UI component.
+ *
+ * @param componentName ui component to be launched for testing. {@code null} to reset.
+ *
+ * @hide
+ */
+ @Override
+ public void setTestEuiccUiComponent(@Nullable ComponentName componentName) {
+ enforceModifyPermission();
+ log("setTestEuiccUiComponent: " + componentName);
+ mTestEuiccUiComponent = componentName;
+ }
+
+ /**
+ * This API can be used by only CTS to retrieve the Euicc UI component.
+ *
+ * @return Euicc UI component. {@code null} if not available.
+ * @hide
+ */
+ @Override
+ @Nullable
+ public ComponentName getTestEuiccUiComponent() {
+ enforceReadPrivilegedPermission("getTestEuiccUiComponent");
+ return mTestEuiccUiComponent;
+ }
}
diff --git a/src/com/android/phone/RcsProvisioningMonitor.java b/src/com/android/phone/RcsProvisioningMonitor.java
index 87a2869..eac8034 100644
--- a/src/com/android/phone/RcsProvisioningMonitor.java
+++ b/src/com/android/phone/RcsProvisioningMonitor.java
@@ -21,6 +21,7 @@
import static com.android.internal.telephony.TelephonyStatsLog.RCS_CLIENT_PROVISIONING_STATS__EVENT__TRIGGER_RCS_RECONFIGURATION;
import android.Manifest;
+import android.annotation.NonNull;
import android.app.role.OnRoleHoldersChangedListener;
import android.app.role.RoleManager;
import android.content.BroadcastReceiver;
@@ -51,6 +52,7 @@
import com.android.ims.FeatureUpdates;
import com.android.ims.RcsFeatureManager;
import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.telephony.flags.FeatureFlags;
import com.android.internal.telephony.metrics.RcsStats;
import com.android.internal.telephony.metrics.RcsStats.RcsProvisioningCallback;
import com.android.internal.telephony.util.HandlerExecutor;
@@ -110,6 +112,9 @@
private static RcsProvisioningMonitor sInstance;
+ @NonNull
+ private final FeatureFlags mFeatureFlags;
+
private final SubscriptionManager.OnSubscriptionsChangedListener mSubChangedListener =
new SubscriptionManager.OnSubscriptionsChangedListener() {
@Override
@@ -481,8 +486,10 @@
@VisibleForTesting
public RcsProvisioningMonitor(PhoneGlobals app, Looper looper, RoleManagerAdapter roleManager,
- FeatureConnectorFactory<RcsFeatureManager> factory, RcsStats rcsStats) {
+ FeatureConnectorFactory<RcsFeatureManager> factory, RcsStats rcsStats,
+ @NonNull FeatureFlags flags) {
mPhone = app;
+ mFeatureFlags = flags;
mHandler = new MyHandler(looper);
mCarrierConfigManager = mPhone.getSystemService(CarrierConfigManager.class);
mSubscriptionManager = mPhone.getSystemService(SubscriptionManager.class);
@@ -499,14 +506,15 @@
/**
* create an instance
*/
- public static RcsProvisioningMonitor make(PhoneGlobals app) {
+ public static RcsProvisioningMonitor make(@NonNull PhoneGlobals app,
+ @NonNull FeatureFlags flags) {
if (sInstance == null) {
logd("RcsProvisioningMonitor created.");
HandlerThread handlerThread = new HandlerThread(TAG);
handlerThread.start();
sInstance = new RcsProvisioningMonitor(app, handlerThread.getLooper(),
new RoleManagerAdapterImpl(app), RcsFeatureManager::getConnector,
- RcsStats.getInstance());
+ RcsStats.getInstance(), flags);
}
return sInstance;
}
@@ -871,9 +879,18 @@
// Only send permission to the default sms app if it has the correct permissions
// except test mode enabled
if (!mTestModeEnabled) {
- mPhone.sendBroadcast(intent, Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION);
+ if (mFeatureFlags.hsumBroadcast()) {
+ mPhone.sendBroadcastAsUser(intent, UserHandle.ALL,
+ Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION);
+ } else {
+ mPhone.sendBroadcast(intent, Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION);
+ }
} else {
- mPhone.sendBroadcast(intent);
+ if (mFeatureFlags.hsumBroadcast()) {
+ mPhone.sendBroadcastAsUser(intent, UserHandle.ALL);
+ } else {
+ mPhone.sendBroadcast(intent);
+ }
}
}
diff --git a/src/com/android/phone/SimContacts.java b/src/com/android/phone/SimContacts.java
index 4229482..d5f7840 100644
--- a/src/com/android/phone/SimContacts.java
+++ b/src/com/android/phone/SimContacts.java
@@ -33,6 +33,7 @@
import android.net.Uri;
import android.os.Bundle;
import android.os.RemoteException;
+import android.os.UserHandle;
import android.provider.ContactsContract;
import android.provider.ContactsContract.CommonDataKinds.Email;
import android.provider.ContactsContract.CommonDataKinds.GroupMembership;
@@ -372,7 +373,7 @@
Uri.fromParts(PhoneAccount.SCHEME_TEL, phoneNumber, null));
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
| Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
- startActivity(intent);
+ startActivityAsUser(intent, UserHandle.CURRENT);
finish();
return true;
}
diff --git a/src/com/android/phone/SimPhonebookProvider.java b/src/com/android/phone/SimPhonebookProvider.java
index 3917d83..d912389 100644
--- a/src/com/android/phone/SimPhonebookProvider.java
+++ b/src/com/android/phone/SimPhonebookProvider.java
@@ -30,6 +30,7 @@
import android.database.Cursor;
import android.database.MatrixCursor;
import android.net.Uri;
+import android.os.Binder;
import android.os.Bundle;
import android.os.CancellationSignal;
import android.os.RemoteException;
@@ -677,8 +678,14 @@
String callingPackage = getCallingPackage();
int granted = PackageManager.PERMISSION_DENIED;
if (callingPackage != null) {
- granted = getContext().getPackageManager().checkPermission(
- Manifest.permission.MODIFY_PHONE_STATE, callingPackage);
+ if (Flags.hsumPackageManager()) {
+ granted = getContext().createContextAsUser(Binder.getCallingUserHandle(), 0)
+ .getPackageManager().checkPermission(
+ Manifest.permission.MODIFY_PHONE_STATE, callingPackage);
+ } else {
+ granted = getContext().getPackageManager().checkPermission(
+ Manifest.permission.MODIFY_PHONE_STATE, callingPackage);
+ }
}
return granted == PackageManager.PERMISSION_GRANTED
|| telephonyManager.hasCarrierPrivileges(args.subscriptionId);
diff --git a/src/com/android/phone/SpecialCharSequenceMgr.java b/src/com/android/phone/SpecialCharSequenceMgr.java
index 8fe084b..d0fe2c1 100644
--- a/src/com/android/phone/SpecialCharSequenceMgr.java
+++ b/src/com/android/phone/SpecialCharSequenceMgr.java
@@ -21,6 +21,7 @@
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
+import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
import android.telephony.PhoneNumberUtils;
@@ -186,7 +187,7 @@
"com.android.phone.SimContacts");
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.putExtra("index", index);
- PhoneGlobals.getInstance().startActivity(intent);
+ PhoneGlobals.getInstance().startActivityAsUser(intent, UserHandle.CURRENT);
return true;
} catch (NumberFormatException ex) {}
@@ -313,9 +314,9 @@
log("handleRegulatoryInfoDisplay() sending intent to settings app");
Intent showRegInfoIntent = new Intent(Settings.ACTION_SHOW_REGULATORY_INFO);
try {
- context.startActivity(showRegInfoIntent);
+ context.startActivityAsUser(showRegInfoIntent, UserHandle.CURRENT);
} catch (ActivityNotFoundException e) {
- Log.e(TAG, "startActivity() failed: " + e);
+ Log.e(TAG, "startActivityAsUser() failed: " + e);
}
return true;
}
diff --git a/src/com/android/phone/TelephonyShellCommand.java b/src/com/android/phone/TelephonyShellCommand.java
index 80304b2..b9b2f58 100644
--- a/src/com/android/phone/TelephonyShellCommand.java
+++ b/src/com/android/phone/TelephonyShellCommand.java
@@ -34,6 +34,7 @@
import android.os.Process;
import android.os.RemoteException;
import android.os.ServiceSpecificException;
+import android.os.UserHandle;
import android.provider.BlockedNumberContract;
import android.telephony.BarringInfo;
import android.telephony.CarrierConfigManager;
@@ -55,12 +56,12 @@
import com.android.internal.telephony.ITelephony;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneFactory;
+import com.android.internal.telephony.TelephonyPermissions;
import com.android.internal.telephony.d2d.Communicator;
import com.android.internal.telephony.emergency.EmergencyNumberTracker;
import com.android.internal.telephony.util.TelephonyUtils;
import com.android.modules.utils.BasicShellCommandHandler;
import com.android.phone.callcomposer.CallComposerPictureManager;
-import com.android.phone.euicc.EuiccUiDispatcherActivity;
import com.android.phone.utils.CarrierAllowListInfo;
import java.io.IOException;
@@ -130,9 +131,6 @@
private static final String CC_SET_VALUES_FROM_XML = "set-values-from-xml";
private static final String CC_CLEAR_VALUES = "clear-values";
- private static final String EUICC_SUBCOMMAND = "euicc";
- private static final String EUICC_SET_UI_COMPONENT = "set-euicc-uicomponent";
-
private static final String GBA_SUBCOMMAND = "gba";
private static final String GBA_SET_SERVICE = "set-service";
private static final String GBA_GET_SERVICE = "get-service";
@@ -189,10 +187,14 @@
"set-satellite-gateway-service-package-name";
private static final String SET_SATELLITE_LISTENING_TIMEOUT_DURATION =
"set-satellite-listening-timeout-duration";
+ private static final String SET_SATELLITE_IGNORE_CELLULAR_SERVICE_STATE =
+ "set-satellite-ignore-cellular-service-state";
private static final String SET_SATELLITE_POINTING_UI_CLASS_NAME =
"set-satellite-pointing-ui-class-name";
private static final String SET_DATAGRAM_CONTROLLER_TIMEOUT_DURATION =
"set-datagram-controller-timeout-duration";
+ private static final String SET_DATAGRAM_CONTROLLER_BOOLEAN_CONFIG =
+ "set-datagram-controller-boolean-config";
private static final String SET_SATELLITE_CONTROLLER_TIMEOUT_DURATION =
"set-satellite-controller-timeout-duration";
@@ -205,6 +207,10 @@
"set-oem-enabled-satellite-provision-status";
private static final String SET_SHOULD_SEND_DATAGRAM_TO_MODEM_IN_DEMO_MODE =
"set-should-send-datagram-to-modem-in-demo-mode";
+ private static final String SET_IS_SATELLITE_COMMUNICATION_ALLOWED_FOR_CURRENT_LOCATION_CACHE =
+ "set-is-satellite-communication-allowed-for-current-location-cache";
+ private static final String SET_SATELLITE_SUBSCRIBERID_LIST_CHANGED_INTENT_COMPONENT =
+ "set-satellite-subscriberid-list-changed-intent-component";
private static final String DOMAIN_SELECTION_SUBCOMMAND = "domainselection";
private static final String DOMAIN_SELECTION_SET_SERVICE_OVERRIDE = "set-dss-override";
@@ -351,8 +357,6 @@
return handleDataTestModeCommand();
case END_BLOCK_SUPPRESSION:
return handleEndBlockSuppressionCommand();
- case EUICC_SUBCOMMAND:
- return handleEuiccCommand();
case GBA_SUBCOMMAND:
return handleGbaCommand();
case D2D_SUBCOMMAND:
@@ -398,10 +402,14 @@
return handleSetSatelliteGatewayServicePackageNameCommand();
case SET_SATELLITE_LISTENING_TIMEOUT_DURATION:
return handleSetSatelliteListeningTimeoutDuration();
+ case SET_SATELLITE_IGNORE_CELLULAR_SERVICE_STATE:
+ return handleSetSatelliteIgnoreCellularServiceState();
case SET_SATELLITE_POINTING_UI_CLASS_NAME:
return handleSetSatellitePointingUiClassNameCommand();
case SET_DATAGRAM_CONTROLLER_TIMEOUT_DURATION:
return handleSetDatagramControllerTimeoutDuration();
+ case SET_DATAGRAM_CONTROLLER_BOOLEAN_CONFIG:
+ return handleSetDatagramControllerBooleanConfig();
case SET_SATELLITE_CONTROLLER_TIMEOUT_DURATION:
return handleSetSatelliteControllerTimeoutDuration();
case SET_EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE:
@@ -414,6 +422,10 @@
return handleSetCountryCodes();
case SET_OEM_ENABLED_SATELLITE_PROVISION_STATUS:
return handleSetOemEnabledSatelliteProvisionStatus();
+ case SET_IS_SATELLITE_COMMUNICATION_ALLOWED_FOR_CURRENT_LOCATION_CACHE:
+ return handleSetIsSatelliteCommunicationAllowedForCurrentLocationCache();
+ case SET_SATELLITE_SUBSCRIBERID_LIST_CHANGED_INTENT_COMPONENT:
+ return handleSetSatelliteSubscriberIdListChangedIntentComponent();
default: {
return handleDefaultCommands(cmd);
}
@@ -678,15 +690,6 @@
pw.println(" is specified, it will choose the default voice SIM slot.");
}
- private void onHelpEuicc() {
- PrintWriter pw = getOutPrintWriter();
- pw.println("Euicc Commands:");
- pw.println(" euicc set-euicc-uicomponent COMPONENT_NAME PACKAGE_NAME");
- pw.println(" Sets the Euicc Ui-Component which handles EuiccService Actions.");
- pw.println(" COMPONENT_NAME: The component name which handles UI Actions.");
- pw.println(" PACKAGE_NAME: THe package name in which ui component belongs.");
- }
-
private void onHelpGba() {
PrintWriter pw = getOutPrintWriter();
pw.println("Gba Commands:");
@@ -1107,7 +1110,8 @@
}
// Verify that the user is allowed to run the command. Only allowed in rooted device in a
// non user build.
- if (Binder.getCallingUid() != Process.ROOT_UID || TelephonyUtils.IS_USER) {
+ if (!UserHandle.isSameApp(Binder.getCallingUid(), Process.ROOT_UID)
+ || TelephonyUtils.IS_USER) {
errPw.println("cc: Permission denied.");
return -1;
}
@@ -1672,15 +1676,14 @@
}
private boolean checkShellUid() {
- // adb can run as root or as shell, depending on whether the device is rooted.
- return Binder.getCallingUid() == Process.SHELL_UID
- || Binder.getCallingUid() == Process.ROOT_UID;
+ return TelephonyPermissions.isRootOrShell(Binder.getCallingUid());
}
private int handleCcCommand() {
// Verify that the user is allowed to run the command. Only allowed in rooted device in a
// non user build.
- if (Binder.getCallingUid() != Process.ROOT_UID || TelephonyUtils.IS_USER) {
+ if (!UserHandle.isSameApp(Binder.getCallingUid(), Process.ROOT_UID)
+ || TelephonyUtils.IS_USER) {
getErrPrintWriter().println("cc: Permission denied.");
return -1;
}
@@ -2204,39 +2207,11 @@
return 0;
}
- private int handleEuiccCommand() {
- String arg = getNextArg();
- if (arg == null) {
- onHelpEuicc();
- return 0;
- }
-
- switch (arg) {
- case EUICC_SET_UI_COMPONENT: {
- return handleEuiccServiceCommand();
- }
- }
- return -1;
- }
-
- private int handleEuiccServiceCommand() {
- String uiComponent = getNextArg();
- String packageName = getNextArg();
- if (packageName == null || uiComponent == null) {
- return -1;
- }
- EuiccUiDispatcherActivity.setTestEuiccUiComponent(packageName, uiComponent);
- if (VDBG) {
- Log.v(LOG_TAG, "euicc set-euicc-uicomponent " + uiComponent +" "
- + packageName);
- }
- return 0;
- }
-
private int handleRestartModemCommand() {
// Verify that the user is allowed to run the command. Only allowed in rooted device in a
// non user build.
- if (Binder.getCallingUid() != Process.ROOT_UID || TelephonyUtils.IS_USER) {
+ if (!UserHandle.isSameApp(Binder.getCallingUid(), Process.ROOT_UID)
+ || TelephonyUtils.IS_USER) {
getErrPrintWriter().println("RestartModem: Permission denied.");
return -1;
}
@@ -2250,7 +2225,8 @@
private int handleGetImei() {
// Verify that the user is allowed to run the command. Only allowed in rooted device in a
// non user build.
- if (Binder.getCallingUid() != Process.ROOT_UID || TelephonyUtils.IS_USER) {
+ if (!UserHandle.isSameApp(Binder.getCallingUid(), Process.ROOT_UID)
+ || TelephonyUtils.IS_USER) {
getErrPrintWriter().println("Device IMEI: Permission denied.");
return -1;
}
@@ -2281,7 +2257,8 @@
private int handleUnattendedReboot() {
// Verify that the user is allowed to run the command. Only allowed in rooted device in a
// non user build.
- if (Binder.getCallingUid() != Process.ROOT_UID || TelephonyUtils.IS_USER) {
+ if (!UserHandle.isSameApp(Binder.getCallingUid(), Process.ROOT_UID)
+ || TelephonyUtils.IS_USER) {
getErrPrintWriter().println("UnattendedReboot: Permission denied.");
return -1;
}
@@ -2295,7 +2272,8 @@
private int handleGetSimSlotsMapping() {
// Verify that the user is allowed to run the command. Only allowed in rooted device in a
// non user build.
- if (Binder.getCallingUid() != Process.ROOT_UID || TelephonyUtils.IS_USER) {
+ if (!UserHandle.isSameApp(Binder.getCallingUid(), Process.ROOT_UID)
+ || TelephonyUtils.IS_USER) {
getErrPrintWriter().println("GetSimSlotsMapping: Permission denied.");
return -1;
}
@@ -3195,6 +3173,7 @@
private int handleSetSatelliteServicePackageNameCommand() {
PrintWriter errPw = getErrPrintWriter();
String serviceName = null;
+ String provisioned = null;
String opt;
while ((opt = getNextOption()) != null) {
@@ -3203,24 +3182,31 @@
serviceName = getNextArgRequired();
break;
}
+
+ case "-p": {
+ provisioned = getNextArgRequired();
+ break;
+ }
}
}
Log.d(LOG_TAG, "handleSetSatelliteServicePackageNameCommand: serviceName="
- + serviceName);
+ + serviceName + ", provisioned=" + provisioned);
try {
- boolean result = mInterface.setSatelliteServicePackageName(serviceName);
+ boolean result = mInterface.setSatelliteServicePackageName(serviceName, provisioned);
if (VDBG) {
- Log.v(LOG_TAG, "SetSatelliteServicePackageName " + serviceName
- + ", result = " + result);
+ Log.v(LOG_TAG,
+ "SetSatelliteServicePackageName " + serviceName + ", provisioned="
+ + provisioned + ", result = " + result);
}
getOutPrintWriter().println(result);
} catch (RemoteException e) {
- Log.w(LOG_TAG, "SetSatelliteServicePackageName: " + serviceName
- + ", error = " + e.getMessage());
+ Log.w(LOG_TAG, "SetSatelliteServicePackageName: " + serviceName + ", provisioned="
+ + provisioned + ", error = " + e.getMessage());
errPw.println("Exception: " + e.getMessage());
return -1;
}
+
return 0;
}
@@ -3373,6 +3359,37 @@
return 0;
}
+ private int handleSetSatelliteIgnoreCellularServiceState() {
+ PrintWriter errPw = getErrPrintWriter();
+ boolean enabled = false;
+
+ String opt;
+ while ((opt = getNextOption()) != null) {
+ switch (opt) {
+ case "-d": {
+ enabled = Boolean.parseBoolean(getNextArgRequired());
+ break;
+ }
+ }
+ }
+ Log.d(LOG_TAG, "handleSetSatelliteIgnoreCellularServiceState: enabled =" + enabled);
+
+ try {
+ boolean result = mInterface.setSatelliteIgnoreCellularServiceState(enabled);
+ if (VDBG) {
+ Log.v(LOG_TAG, "handleSetSatelliteIgnoreCellularServiceState " + enabled
+ + ", result = " + result);
+ }
+ getOutPrintWriter().println(result);
+ } catch (RemoteException e) {
+ Log.w(LOG_TAG, "handleSetSatelliteIgnoreCellularServiceState: " + enabled
+ + ", error = " + e.getMessage());
+ errPw.println("Exception: " + e.getMessage());
+ return -1;
+ }
+ return 0;
+ }
+
private int handleSetDatagramControllerTimeoutDuration() {
PrintWriter errPw = getErrPrintWriter();
boolean reset = false;
@@ -3416,6 +3433,47 @@
return 0;
}
+ private int handleSetDatagramControllerBooleanConfig() {
+ PrintWriter errPw = getErrPrintWriter();
+ boolean reset = false;
+ int booleanType = 0;
+ boolean enable = false;
+
+ String opt;
+ while ((opt = getNextOption()) != null) {
+ switch (opt) {
+ case "-d": {
+ enable = Boolean.parseBoolean(getNextArgRequired());
+ break;
+ }
+ case "-r": {
+ reset = true;
+ break;
+ }
+ case "-t": {
+ booleanType = Integer.parseInt(getNextArgRequired());
+ break;
+ }
+ }
+ }
+ Log.d(LOG_TAG, "setDatagramControllerBooleanConfig: enable="
+ + enable + ", reset=" + reset + ", booleanType=" + booleanType);
+
+ try {
+ boolean result = mInterface.setDatagramControllerBooleanConfig(
+ reset, booleanType, enable);
+ if (VDBG) {
+ Log.v(LOG_TAG, "setDatagramControllerBooleanConfig result = " + result);
+ }
+ getOutPrintWriter().println(result);
+ } catch (RemoteException e) {
+ Log.w(LOG_TAG, "setDatagramControllerBooleanConfig: error = " + e.getMessage());
+ errPw.println("Exception: " + e.getMessage());
+ return -1;
+ }
+ return 0;
+ }
+
private int handleSetSatelliteControllerTimeoutDuration() {
PrintWriter errPw = getErrPrintWriter();
boolean reset = false;
@@ -3654,6 +3712,113 @@
return 0;
}
+ private int handleSetIsSatelliteCommunicationAllowedForCurrentLocationCache() {
+ PrintWriter errPw = getErrPrintWriter();
+ String opt;
+ String state;
+
+ if ((opt = getNextArg()) == null) {
+ errPw.println(
+ "adb shell cmd phone set-is-satellite-communication-allowed-for-current"
+ + "-location-cache :"
+ + " Invalid Argument");
+ return -1;
+ } else {
+ switch (opt) {
+ case "-a": {
+ state = "cache_allowed";
+ break;
+ }
+ case "-na": {
+ state = "cache_not_allowed";
+ break;
+ }
+ case "-n": {
+ state = "cache_clear_and_not_allowed";
+ break;
+ }
+ case "-c": {
+ state = "clear_cache_only";
+ break;
+ }
+ default:
+ errPw.println(
+ "adb shell cmd phone set-is-satellite-communication-allowed-for-current"
+ + "-location-cache :"
+ + " Invalid Argument");
+ return -1;
+ }
+ }
+
+ Log.d(LOG_TAG, "handleSetIsSatelliteCommunicationAllowedForCurrentLocationCache("
+ + state + ")");
+
+ try {
+ boolean result = mInterface.setIsSatelliteCommunicationAllowedForCurrentLocationCache(
+ state);
+ if (VDBG) {
+ Log.v(LOG_TAG, "setIsSatelliteCommunicationAllowedForCurrentLocationCache "
+ + "returns: "
+ + result);
+ }
+ getOutPrintWriter().println(result);
+ } catch (RemoteException e) {
+ Log.w(LOG_TAG, "setIsSatelliteCommunicationAllowedForCurrentLocationCache("
+ + state + "), error = " + e.getMessage());
+ errPw.println("Exception: " + e.getMessage());
+ return -1;
+ }
+ return 0;
+ }
+
+ private int handleSetSatelliteSubscriberIdListChangedIntentComponent() {
+ final String cmd = SET_SATELLITE_SUBSCRIBERID_LIST_CHANGED_INTENT_COMPONENT;
+ PrintWriter errPw = getErrPrintWriter();
+ String opt;
+ String name;
+
+ if ((opt = getNextArg()) == null) {
+ errPw.println("adb shell cmd phone " + cmd + ": Invalid Argument");
+ return -1;
+ } else {
+ switch (opt) {
+ case "-p": {
+ name = opt + "/" + "android.telephony.cts";
+ break;
+ }
+ case "-c": {
+ name = opt + "/" + "android.telephony.cts.SatelliteReceiver";
+ break;
+ }
+ case "-r": {
+ name = "reset";
+ break;
+ }
+ default:
+ errPw.println("adb shell cmd phone " + cmd + ": Invalid Argument");
+ return -1;
+ }
+ }
+
+ Log.d(LOG_TAG, "handleSetSatelliteSubscriberIdListChangedIntentComponent("
+ + name + ")");
+
+ try {
+ boolean result = mInterface.setSatelliteSubscriberIdListChangedIntentComponent(name);
+ if (VDBG) {
+ Log.v(LOG_TAG, "handleSetSatelliteSubscriberIdListChangedIntentComponent "
+ + "returns: " + result);
+ }
+ getOutPrintWriter().println(result);
+ } catch (RemoteException e) {
+ Log.w(LOG_TAG, "handleSetSatelliteSubscriberIdListChangedIntentComponent("
+ + name + "), error = " + e.getMessage());
+ errPw.println("Exception: " + e.getMessage());
+ return -1;
+ }
+ return 0;
+ }
+
/**
* Sample inputStr = "US,UK,CA;2,1,3"
* Sample output: {[US,2], [UK,1], [CA,3]}
diff --git a/src/com/android/phone/euicc/EuiccUiDispatcherActivity.java b/src/com/android/phone/euicc/EuiccUiDispatcherActivity.java
index 3e44062..9632329 100644
--- a/src/com/android/phone/euicc/EuiccUiDispatcherActivity.java
+++ b/src/com/android/phone/euicc/EuiccUiDispatcherActivity.java
@@ -28,8 +28,8 @@
import android.os.UserHandle;
import android.permission.LegacyPermissionManager;
import android.service.euicc.EuiccService;
+import android.telephony.TelephonyManager;
import android.telephony.euicc.EuiccManager;
-import android.text.TextUtils;
import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
@@ -59,8 +59,6 @@
private LegacyPermissionManager mPermissionManager;
private boolean mGrantPermissionDone = false;
private ThreadPoolExecutor mExecutor;
- // Used for CTS EuiccManager action verification
- private static ComponentName mTestEuiccUiComponentName;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -90,25 +88,13 @@
}
euiccUiIntent.setFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
- startActivity(euiccUiIntent);
+ startActivityAsUser(euiccUiIntent, UserHandle.CURRENT);
} finally {
// Since we're using Theme.NO_DISPLAY, we must always finish() at the end of onCreate().
finish();
}
}
- /**
- * This API used to set the Test EuiccUiComponent for CTS
- * @param packageName package which handles the intent
- * @param componentName ui component to be launched for testing
- */
- public static void setTestEuiccUiComponent(String packageName, String componentName) {
- mTestEuiccUiComponentName = null;
- if (!TextUtils.isEmpty(packageName) && !TextUtils.isEmpty(componentName)) {
- mTestEuiccUiComponentName = new ComponentName(packageName, componentName);
- }
- }
-
@VisibleForTesting
@Nullable
Intent resolveEuiccUiIntent() {
@@ -124,10 +110,11 @@
return null;
}
- if (mTestEuiccUiComponentName != null) {
- Log.i(TAG, "Test mode");
- euiccUiIntent.setComponent(mTestEuiccUiComponentName);
- mTestEuiccUiComponentName = null;
+ ComponentName testEuiccUiComponent = ((TelephonyManager)
+ getSystemService(Context.TELEPHONY_SERVICE)).getTestEuiccUiComponent();
+ if (testEuiccUiComponent != null) {
+ Log.i(TAG, "Test mode: " + testEuiccUiComponent);
+ euiccUiIntent.setComponent(testEuiccUiComponent);
return euiccUiIntent;
}
diff --git a/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java b/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java
index 8353861..f9bf0e8 100644
--- a/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java
+++ b/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java
@@ -17,16 +17,27 @@
package com.android.phone.satellite.accesscontrol;
import static android.telephony.satellite.SatelliteManager.KEY_SATELLITE_COMMUNICATION_ALLOWED;
+import static android.telephony.satellite.SatelliteManager.KEY_SATELLITE_PROVISIONED;
import static android.telephony.satellite.SatelliteManager.KEY_SATELLITE_SUPPORTED;
+import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_LOCATION_DISABLED;
+import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_LOCATION_NOT_AVAILABLE;
+import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_NOT_SUPPORTED;
import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_REQUEST_NOT_SUPPORTED;
import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_SUCCESS;
+import static com.android.internal.telephony.satellite.SatelliteConstants.TRIGGERING_EVENT_EXTERNAL_REQUEST;
+import static com.android.internal.telephony.satellite.SatelliteConstants.TRIGGERING_EVENT_LOCATION_SETTINGS_ENABLED;
+import static com.android.internal.telephony.satellite.SatelliteConstants.TRIGGERING_EVENT_MCC_CHANGED;
+import static com.android.internal.telephony.satellite.SatelliteConstants.TRIGGERING_EVENT_UNKNOWN;
import static com.android.internal.telephony.satellite.SatelliteController.SATELLITE_SHARED_PREF;
import android.annotation.ArrayRes;
import android.annotation.NonNull;
import android.annotation.Nullable;
+import android.content.BroadcastReceiver;
import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
import android.content.SharedPreferences;
import android.content.res.Resources;
import android.location.Location;
@@ -38,19 +49,29 @@
import android.os.CancellationSignal;
import android.os.Handler;
import android.os.HandlerThread;
+import android.os.IBinder;
import android.os.Looper;
import android.os.Message;
+import android.os.RemoteException;
import android.os.ResultReceiver;
import android.os.SystemClock;
import android.os.SystemProperties;
import android.provider.DeviceConfig;
import android.telecom.TelecomManager;
import android.telephony.AnomalyReporter;
+import android.telephony.DropBoxManagerLoggerBackend;
+import android.telephony.PersistentLogger;
import android.telephony.Rlog;
+import android.telephony.SubscriptionManager;
+import android.telephony.satellite.ISatelliteCommunicationAllowedStateCallback;
+import android.telephony.satellite.ISatelliteProvisionStateCallback;
+import android.telephony.satellite.ISatelliteSupportedStateCallback;
import android.telephony.satellite.SatelliteManager;
+import android.telephony.satellite.SatelliteSubscriberProvisionStatus;
import android.text.TextUtils;
import android.util.Pair;
+import com.android.internal.R;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.telephony.Phone;
@@ -58,7 +79,11 @@
import com.android.internal.telephony.TelephonyCountryDetector;
import com.android.internal.telephony.flags.FeatureFlags;
import com.android.internal.telephony.satellite.SatelliteConfig;
+import com.android.internal.telephony.satellite.SatelliteConstants;
import com.android.internal.telephony.satellite.SatelliteController;
+import com.android.internal.telephony.satellite.metrics.AccessControllerMetricsStats;
+import com.android.internal.telephony.satellite.metrics.ConfigUpdaterMetricsStats;
+import com.android.internal.telephony.satellite.metrics.ControllerMetricsStats;
import com.android.internal.telephony.util.TelephonyUtils;
import com.android.phone.PhoneGlobals;
@@ -79,6 +104,7 @@
import java.util.Map;
import java.util.Set;
import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -112,10 +138,12 @@
private static final boolean DEBUG = !"user".equals(Build.TYPE);
private static final int MAX_CACHE_SIZE = 50;
- private static final int CMD_IS_SATELLITE_COMMUNICATION_ALLOWED = 1;
+ protected static final int CMD_IS_SATELLITE_COMMUNICATION_ALLOWED = 1;
protected static final int EVENT_WAIT_FOR_CURRENT_LOCATION_TIMEOUT = 2;
protected static final int EVENT_KEEP_ON_DEVICE_ACCESS_CONTROLLER_RESOURCES_TIMEOUT = 3;
protected static final int EVENT_CONFIG_DATA_UPDATED = 4;
+ protected static final int EVENT_COUNTRY_CODE_CHANGED = 5;
+ protected static final int EVENT_LOCATION_SETTINGS_ENABLED = 6;
private static SatelliteAccessController sInstance;
@@ -134,8 +162,18 @@
@NonNull
private final SatelliteController mSatelliteController;
@NonNull
+ private final ControllerMetricsStats mControllerMetricsStats;
+ @NonNull
+ private final AccessControllerMetricsStats mAccessControllerMetricsStats;
+ @NonNull
private final ResultReceiver mInternalSatelliteSupportedResultReceiver;
@NonNull
+ private final ResultReceiver mInternalSatelliteProvisionedResultReceiver;
+ @NonNull
+ private final ISatelliteSupportedStateCallback mInternalSatelliteSupportedStateCallback;
+ @NonNull
+ private final ISatelliteProvisionStateCallback mInternalSatelliteProvisionStateCallback;
+ @NonNull
protected final Object mLock = new Object();
@GuardedBy("mLock")
@NonNull
@@ -158,15 +196,15 @@
@NonNull
private final Map<SatelliteOnDeviceAccessController.LocationToken, Boolean>
mCachedAccessRestrictionMap = new LinkedHashMap<>() {
- @Override
- protected boolean removeEldestEntry(
- Entry<SatelliteOnDeviceAccessController.LocationToken, Boolean> eldest) {
- return size() > MAX_CACHE_SIZE;
- }
- };
+ @Override
+ protected boolean removeEldestEntry(
+ Entry<SatelliteOnDeviceAccessController.LocationToken, Boolean> eldest) {
+ return size() > MAX_CACHE_SIZE;
+ }
+ };
@GuardedBy("mLock")
@Nullable
- CancellationSignal mLocationRequestCancellationSignal = null;
+ protected CancellationSignal mLocationRequestCancellationSignal = null;
private int mS2Level = DEFAULT_S2_LEVEL;
@GuardedBy("mLock")
@Nullable
@@ -185,7 +223,72 @@
"config_updater_satellite_country_codes";
private static final String CONFIG_UPDATER_SATELLITE_IS_ALLOW_ACCESS_CONTROL_KEY =
"config_updater_satellite_is_allow_access_control";
+
+ private static final String LATEST_SATELLITE_COMMUNICATION_ALLOWED_SET_TIME_KEY =
+ "latest_satellite_communication_allowed_set_time";
+ private static final String LATEST_SATELLITE_COMMUNICATION_ALLOWED_KEY =
+ "latest_satellite_communication_allowed";
+
private SharedPreferences mSharedPreferences;
+ private final ConfigUpdaterMetricsStats mConfigUpdaterMetricsStats;
+ @Nullable
+ private PersistentLogger mPersistentLogger = null;
+
+ private final Object mPossibleChangeInSatelliteAllowedRegionLock = new Object();
+ @GuardedBy("mPossibleChangeInSatelliteAllowedRegionLock")
+ private boolean mIsSatelliteAllowedRegionPossiblyChanged = false;
+ protected long mLastLocationQueryForPossibleChangeInAllowedRegionTimeNanos = 0;
+
+ protected int mRetryCountForValidatingPossibleChangeInAllowedRegion;
+ protected static final int
+ DEFAULT_DELAY_MINUTES_BEFORE_VALIDATING_POSSIBLE_CHANGE_IN_ALLOWED_REGION = 10;
+ protected static final int
+ DEFAULT_MAX_RETRY_COUNT_FOR_VALIDATING_POSSIBLE_CHANGE_IN_ALLOWED_REGION = 3;
+ protected static final int DEFAULT_THROTTLE_INTERVAL_FOR_LOCATION_QUERY_MINUTES = 10;
+
+ private long mRetryIntervalToEvaluateUserInSatelliteAllowedRegion = 0;
+ private int mMaxRetryCountForValidatingPossibleChangeInAllowedRegion = 0;
+ private long mLocationQueryThrottleIntervalNanos = 0;
+
+ @NonNull
+ protected ResultReceiver mHandlerForSatelliteAllowedResult;
+
+ /**
+ * Map key: binder of the callback, value: callback to receive the satellite communication
+ * allowed state changed events.
+ */
+ private final ConcurrentHashMap<IBinder, ISatelliteCommunicationAllowedStateCallback>
+ mSatelliteCommunicationAllowedStateChangedListeners = new ConcurrentHashMap<>();
+ protected final Object mSatelliteCommunicationAllowStateLock = new Object();
+ @GuardedBy("mSatelliteCommunicationAllowStateLock")
+ protected boolean mCurrentSatelliteAllowedState = false;
+
+ protected static final long ALLOWED_STATE_CACHE_VALID_DURATION_NANOS =
+ TimeUnit.HOURS.toNanos(4);
+
+ private boolean mLatestSatelliteCommunicationAllowed;
+ protected long mLatestSatelliteCommunicationAllowedSetTime;
+
+ private long mLocationQueryStartTimeMillis;
+ private long mOnDeviceLookupStartTimeMillis;
+ private long mTotalCheckingStartTimeMillis;
+
+ protected BroadcastReceiver mLocationModeChangedBroadcastReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ if (intent.getAction().equals(LocationManager.MODE_CHANGED_ACTION)) {
+ plogd("LocationManager mode is changed");
+ if (mLocationManager.isLocationEnabled()) {
+ plogd("Location settings is just enabled");
+ sendRequestAsync(EVENT_LOCATION_SETTINGS_ENABLED, null);
+ }
+ }
+ }
+ };
+
+ private final Object mIsAllowedCheckBeforeEnablingSatelliteLock = new Object();
+ @GuardedBy("mIsAllowedCheckBeforeEnablingSatelliteLock")
+ private boolean mIsAllowedCheckBeforeEnablingSatellite;
/**
* Create a SatelliteAccessController instance.
@@ -193,10 +296,13 @@
* @param context The context associated with the
* {@link SatelliteAccessController} instance.
* @param featureFlags The FeatureFlags that are supported.
- * @param locationManager The LocationManager for querying current location of
+ * @param locationManager The LocationManager for querying current
+ * location of
* the device.
- * @param looper The Looper to run the SatelliteAccessController on.
- * @param satelliteOnDeviceAccessController The on-device satellite access controller instance.
+ * @param looper The Looper to run the SatelliteAccessController
+ * on.
+ * @param satelliteOnDeviceAccessController The on-device satellite access controller
+ * instance.
*/
@VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)
protected SatelliteAccessController(@NonNull Context context,
@@ -205,12 +311,24 @@
@Nullable SatelliteOnDeviceAccessController satelliteOnDeviceAccessController,
@Nullable File s2CellFile) {
super(looper);
+ if (isSatellitePersistentLoggingEnabled(context, featureFlags)) {
+ mPersistentLogger = new PersistentLogger(
+ DropBoxManagerLoggerBackend.getInstance(context));
+ }
mFeatureFlags = featureFlags;
mLocationManager = locationManager;
mTelecomManager = telecomManager;
mSatelliteOnDeviceAccessController = satelliteOnDeviceAccessController;
- mCountryDetector = TelephonyCountryDetector.getInstance(context);
+
+ mCountryDetector = TelephonyCountryDetector.getInstance(context, mFeatureFlags);
+ mCountryDetector.registerForCountryCodeChanged(this,
+ EVENT_COUNTRY_CODE_CHANGED, null);
+ initializeHandlerForSatelliteAllowedResult();
+ setIsSatelliteAllowedRegionPossiblyChanged(false);
+
mSatelliteController = SatelliteController.getInstance();
+ mControllerMetricsStats = ControllerMetricsStats.getInstance();
+ mAccessControllerMetricsStats = AccessControllerMetricsStats.getInstance();
initSharedPreferences(context);
loadOverlayConfigs(context);
// loadConfigUpdaterConfigs has to be called after loadOverlayConfigs
@@ -227,8 +345,74 @@
handleIsSatelliteSupportedResult(resultCode, resultData);
}
};
+ mInternalSatelliteProvisionedResultReceiver = new ResultReceiver(this) {
+ @Override
+ protected void onReceiveResult(int resultCode, Bundle resultData) {
+ handleIsSatelliteProvisionedResult(resultCode, resultData);
+ }
+ };
+
+ mConfigUpdaterMetricsStats = ConfigUpdaterMetricsStats.getOrCreateInstance();
+
+ mInternalSatelliteSupportedStateCallback = new ISatelliteSupportedStateCallback.Stub() {
+ @Override
+ public void onSatelliteSupportedStateChanged(boolean isSupported) {
+ logd("onSatelliteSupportedStateChanged: isSupported=" + isSupported);
+ if (isSupported) {
+ requestIsCommunicationAllowedForCurrentLocation(
+ new ResultReceiver(null) {
+ @Override
+ protected void onReceiveResult(int resultCode, Bundle resultData) {
+ // do nothing
+ }
+ }, false);
+ }
+ }
+ };
+ mSatelliteController.registerForSatelliteSupportedStateChanged(
+ mInternalSatelliteSupportedStateCallback);
+
+ mInternalSatelliteProvisionStateCallback = new ISatelliteProvisionStateCallback.Stub() {
+ @Override
+ public void onSatelliteProvisionStateChanged(boolean isProvisioned) {
+ logd("onSatelliteProvisionStateChanged: isProvisioned=" + isProvisioned);
+ if (isProvisioned) {
+ requestIsCommunicationAllowedForCurrentLocation(
+ new ResultReceiver(null) {
+ @Override
+ protected void onReceiveResult(int resultCode, Bundle resultData) {
+ // do nothing
+ }
+ }, false);
+ }
+ }
+
+ @Override
+ public void onSatelliteSubscriptionProvisionStateChanged(
+ List<SatelliteSubscriberProvisionStatus> satelliteSubscriberProvisionStatus) {
+ logd("onSatelliteSubscriptionProvisionStateChanged: "
+ + satelliteSubscriberProvisionStatus);
+ }
+ };
+ mSatelliteController.registerForSatelliteProvisionStateChanged(
+ mInternalSatelliteProvisionStateCallback);
+
// Init the SatelliteOnDeviceAccessController so that the S2 level can be cached
initSatelliteOnDeviceAccessController();
+ registerLocationModeChangedBroadcastReceiver(context);
+ }
+
+ private void updateCurrentSatelliteAllowedState(boolean isAllowed) {
+ plogd("updateCurrentSatelliteAllowedState");
+ synchronized (mSatelliteCommunicationAllowStateLock) {
+ if (isAllowed != mCurrentSatelliteAllowedState) {
+ plogd("updatedValue = " + isAllowed + " | mCurrentSatelliteAllowedState = "
+ + mCurrentSatelliteAllowedState);
+ mCurrentSatelliteAllowedState = isAllowed;
+ notifySatelliteCommunicationAllowedStateChanged(isAllowed);
+ mControllerMetricsStats.reportAllowedStateChanged();
+ }
+ }
}
/** @return the singleton instance of {@link SatelliteAccessController} */
@@ -237,8 +421,10 @@
if (sInstance == null) {
HandlerThread handlerThread = new HandlerThread("SatelliteAccessController");
handlerThread.start();
+ LocationManager lm = context.createAttributionContext("telephony")
+ .getSystemService(LocationManager.class);
sInstance = new SatelliteAccessController(context, featureFlags,
- handlerThread.getLooper(), context.getSystemService(LocationManager.class),
+ handlerThread.getLooper(), lm,
context.getSystemService(TelecomManager.class), null, null);
}
return sInstance;
@@ -261,8 +447,13 @@
AsyncResult ar = (AsyncResult) msg.obj;
updateSatelliteConfigData((Context) ar.userObj);
break;
+ case EVENT_LOCATION_SETTINGS_ENABLED:
+ // Fall through
+ case EVENT_COUNTRY_CODE_CHANGED:
+ handleSatelliteAllowedRegionPossiblyChanged(msg.what);
+ break;
default:
- logw("SatelliteAccessControllerHandler: unexpected message code: " + msg.what);
+ plogw("SatelliteAccessControllerHandler: unexpected message code: " + msg.what);
break;
}
}
@@ -270,20 +461,25 @@
/**
* Request to get whether satellite communication is allowed for the current location.
*
- * @param subId The subId of the subscription to check whether satellite communication is
- * allowed for the current location for.
* @param result The result receiver that returns whether satellite communication is allowed
* for the current location if the request is successful or an error code
* if the request failed.
*/
- public void requestIsCommunicationAllowedForCurrentLocation(int subId,
- @NonNull ResultReceiver result) {
+ public void requestIsCommunicationAllowedForCurrentLocation(
+ @NonNull ResultReceiver result, boolean enablingSatellite) {
if (!mFeatureFlags.oemEnabledSatelliteFlag()) {
- logd("oemEnabledSatelliteFlag is disabled");
+ plogd("oemEnabledSatelliteFlag is disabled");
result.send(SATELLITE_RESULT_REQUEST_NOT_SUPPORTED, null);
return;
}
- sendRequestAsync(CMD_IS_SATELLITE_COMMUNICATION_ALLOWED, new Pair<>(subId, result));
+ plogd("requestIsCommunicationAllowedForCurrentLocation : "
+ + "enablingSatellite is " + enablingSatellite);
+ synchronized (mIsAllowedCheckBeforeEnablingSatelliteLock) {
+ mIsAllowedCheckBeforeEnablingSatellite = enablingSatellite;
+ }
+ mAccessControllerMetricsStats.setTriggeringEvent(TRIGGERING_EVENT_EXTERNAL_REQUEST);
+ sendRequestAsync(CMD_IS_SATELLITE_COMMUNICATION_ALLOWED,
+ new Pair<>(mSatelliteController.getSatellitePhone().getSubId(), result));
}
/**
@@ -294,10 +490,10 @@
@Nullable String s2CellFile, long locationFreshDurationNanos,
@Nullable List<String> satelliteCountryCodes) {
if (!isMockModemAllowed()) {
- logd("setSatelliteAccessControllerOverlayConfigs: mock modem is not allowed");
+ plogd("setSatelliteAccessControllerOverlayConfigs: mock modem is not allowed");
return false;
}
- logd("setSatelliteAccessControlOverlayConfigs: reset=" + reset
+ plogd("setSatelliteAccessControlOverlayConfigs: reset=" + reset
+ ", isAllowed" + isAllowed + ", s2CellFile=" + s2CellFile
+ ", locationFreshDurationNanos=" + locationFreshDurationNanos
+ ", satelliteCountryCodes=" + ((satelliteCountryCodes != null)
@@ -312,7 +508,7 @@
if (!TextUtils.isEmpty(s2CellFile)) {
mOverriddenSatelliteS2CellFile = getTestSatelliteS2File(s2CellFile);
if (!mOverriddenSatelliteS2CellFile.exists()) {
- logd("The overriding file "
+ plogd("The overriding file "
+ mOverriddenSatelliteS2CellFile.getAbsolutePath()
+ " does not exist");
mOverriddenSatelliteS2CellFile = null;
@@ -334,13 +530,13 @@
}
protected File getTestSatelliteS2File(String fileName) {
- logd("getTestSatelliteS2File: fileName=" + fileName);
+ plogd("getTestSatelliteS2File: fileName=" + fileName);
if (TextUtils.equals(fileName, GOOGLE_US_SAN_SAT_S2_FILE_NAME)) {
mCtsSatS2FilePath = copyTestSatS2FileToPhoneDirectory(GOOGLE_US_SAN_SAT_S2_FILE_NAME);
if (mCtsSatS2FilePath != null) {
return mCtsSatS2FilePath.toFile();
} else {
- loge("getTestSatelliteS2File: mCtsSatS2FilePath is null");
+ ploge("getTestSatelliteS2File: mCtsSatS2FilePath is null");
}
}
return new File(fileName);
@@ -418,13 +614,13 @@
SatelliteOnDeviceAccessController.create(s2CellFile);
int s2Level = satelliteOnDeviceAccessController.getS2Level();
if (s2Level < MIN_S2_LEVEL || s2Level > MAX_S2_LEVEL) {
- loge("isS2CellFileValid: invalid s2 level = " + s2Level);
+ ploge("isS2CellFileValid: invalid s2 level = " + s2Level);
satelliteOnDeviceAccessController.close();
return false;
}
satelliteOnDeviceAccessController.close();
} catch (Exception ex) {
- loge("isS2CellFileValid: Got exception in reading the file, ex=" + ex);
+ ploge("isS2CellFileValid: Got exception in reading the file, ex=" + ex);
return false;
}
return true;
@@ -435,7 +631,7 @@
try {
Files.delete(mCtsSatS2FilePath);
} catch (IOException ex) {
- loge("cleanUpCtsResources: ex=" + ex);
+ ploge("cleanUpCtsResources: ex=" + ex);
}
}
}
@@ -455,7 +651,7 @@
}
for (String countryCode : countryCodes) {
if (!TelephonyUtils.isValidCountryCode(countryCode)) {
- loge("invalid country code : " + countryCode);
+ ploge("invalid country code : " + countryCode);
return false;
}
}
@@ -465,11 +661,11 @@
private boolean updateSharedPreferencesCountryCodes(
@NonNull Context context, @NonNull List<String> value) {
if (mSharedPreferences == null) {
- logd("updateSharedPreferencesCountryCodes: mSharedPreferences is null");
+ plogd("updateSharedPreferencesCountryCodes: mSharedPreferences is null");
initSharedPreferences(context);
}
if (mSharedPreferences == null) {
- loge("updateSharedPreferencesCountryCodes: mSharedPreferences is null");
+ ploge("updateSharedPreferencesCountryCodes: mSharedPreferences is null");
return false;
}
try {
@@ -477,7 +673,7 @@
CONFIG_UPDATER_SATELLITE_COUNTRY_CODES_KEY, new HashSet<>(value)).apply();
return true;
} catch (Exception ex) {
- loge("updateSharedPreferencesCountryCodes error : " + ex);
+ ploge("updateSharedPreferencesCountryCodes error : " + ex);
return false;
}
}
@@ -485,11 +681,11 @@
private boolean updateSharedPreferencesIsAllowAccessControl(
@NonNull Context context, boolean value) {
if (mSharedPreferences == null) {
- logd("updateSharedPreferencesIsAllowAccessControl: mSharedPreferences is null");
+ plogd("updateSharedPreferencesIsAllowAccessControl: mSharedPreferences is null");
initSharedPreferences(context);
}
if (mSharedPreferences == null) {
- loge("updateSharedPreferencesIsAllowAccessControl: mSharedPreferences is null");
+ ploge("updateSharedPreferencesIsAllowAccessControl: mSharedPreferences is null");
return false;
}
try {
@@ -498,93 +694,141 @@
value).apply();
return true;
} catch (Exception ex) {
- loge("updateSharedPreferencesAllowRegion : " + ex);
+ ploge("updateSharedPreferencesIsAllowAccessControl error: " + ex);
return false;
}
}
+ private void persistLatestSatelliteCommunicationAllowedState() {
+ if (mSharedPreferences == null) {
+ ploge("persistLatestSatelliteCommunicationAllowedState: mSharedPreferences is null");
+ return;
+ }
+
+ try {
+ mSharedPreferences.edit().putLong(LATEST_SATELLITE_COMMUNICATION_ALLOWED_SET_TIME_KEY,
+ mLatestSatelliteCommunicationAllowedSetTime).apply();
+ mSharedPreferences.edit().putBoolean(LATEST_SATELLITE_COMMUNICATION_ALLOWED_KEY,
+ mLatestSatelliteCommunicationAllowed).apply();
+ } catch (Exception ex) {
+ ploge("persistLatestSatelliteCommunicationAllowedState error : " + ex);
+ }
+ }
+
/**
* Update country codes and S2CellFile with the new data from ConfigUpdater
*/
private void updateSatelliteConfigData(Context context) {
- logd("updateSatelliteConfigData");
+ plogd("updateSatelliteConfigData");
SatelliteConfig satelliteConfig = mSatelliteController.getSatelliteConfig();
if (satelliteConfig == null) {
- loge("satelliteConfig is null");
+ ploge("satelliteConfig is null");
+ mConfigUpdaterMetricsStats.reportOemAndCarrierConfigError(
+ SatelliteConstants.CONFIG_UPDATE_RESULT_NO_SATELLITE_DATA);
return;
}
List<String> satelliteCountryCodes = satelliteConfig.getDeviceSatelliteCountryCodes();
if (!isValidCountryCodes(satelliteCountryCodes)) {
- logd("country codes is invalid");
+ plogd("country codes is invalid");
+ mConfigUpdaterMetricsStats.reportOemConfigError(
+ SatelliteConstants.CONFIG_UPDATE_RESULT_DEVICE_DATA_INVALID_COUNTRY_CODE);
return;
}
Boolean isSatelliteDataForAllowedRegion = satelliteConfig.isSatelliteDataForAllowedRegion();
if (isSatelliteDataForAllowedRegion == null) {
- loge("Satellite allowed is not configured with country codes");
+ ploge("Satellite allowed is not configured with country codes");
+ mConfigUpdaterMetricsStats.reportOemConfigError(
+ SatelliteConstants.CONFIG_UPDATE_RESULT_DEVICE_DATA_INVALID_S2_CELL_FILE);
return;
}
File configUpdaterS2CellFile = satelliteConfig.getSatelliteS2CellFile(context);
if (configUpdaterS2CellFile == null || !configUpdaterS2CellFile.exists()) {
- logd("No S2 cell file configured or the file does not exist");
+ plogd("No S2 cell file configured or the file does not exist");
+ mConfigUpdaterMetricsStats.reportOemConfigError(
+ SatelliteConstants.CONFIG_UPDATE_RESULT_DEVICE_DATA_INVALID_S2_CELL_FILE);
return;
}
if (!isS2CellFileValid(configUpdaterS2CellFile)) {
- loge("The configured S2 cell file is not valid");
+ ploge("The configured S2 cell file is not valid");
+ mConfigUpdaterMetricsStats.reportOemConfigError(
+ SatelliteConstants.CONFIG_UPDATE_RESULT_DEVICE_DATA_INVALID_S2_CELL_FILE);
return;
}
File localS2CellFile = copySatS2FileToLocalDirectory(configUpdaterS2CellFile);
if (localS2CellFile == null || !localS2CellFile.exists()) {
- loge("Fail to copy S2 cell file to local directory");
+ ploge("Fail to copy S2 cell file to local directory");
+ mConfigUpdaterMetricsStats.reportOemConfigError(
+ SatelliteConstants.CONFIG_UPDATE_RESULT_IO_ERROR);
return;
}
if (!updateSharedPreferencesCountryCodes(context, satelliteCountryCodes)) {
- loge("Fail to copy country coeds into shared preferences");
+ ploge("Fail to copy country coeds into shared preferences");
localS2CellFile.delete();
+ mConfigUpdaterMetricsStats.reportOemConfigError(
+ SatelliteConstants.CONFIG_UPDATE_RESULT_IO_ERROR);
return;
}
if (!updateSharedPreferencesIsAllowAccessControl(
context, isSatelliteDataForAllowedRegion.booleanValue())) {
- loge("Fail to copy allow access control into shared preferences");
+ ploge("Fail to copy allow access control into shared preferences");
localS2CellFile.delete();
+ mConfigUpdaterMetricsStats.reportOemConfigError(
+ SatelliteConstants.CONFIG_UPDATE_RESULT_IO_ERROR);
return;
}
mSatelliteS2CellFile = localS2CellFile;
mSatelliteCountryCodes = satelliteCountryCodes;
mIsSatelliteAllowAccessControl = satelliteConfig.isSatelliteDataForAllowedRegion();
- logd("Use s2 cell file=" + mSatelliteS2CellFile.getAbsolutePath() + ", country codes="
+ plogd("Use s2 cell file=" + mSatelliteS2CellFile.getAbsolutePath() + ", country codes="
+ String.join(",", mSatelliteCountryCodes)
+ ", mIsSatelliteAllowAccessControl=" + mIsSatelliteAllowAccessControl
+ " from ConfigUpdater");
// Clean up resources so that the new config data will be used when serving new requests
cleanupOnDeviceAccessControllerResources();
+
+ // Clean up cached data based on previous geofence data
+ synchronized (mLock) {
+ plogd("clear mCachedAccessRestrictionMap");
+ mCachedAccessRestrictionMap.clear();
+ }
+
+ mConfigUpdaterMetricsStats.reportConfigUpdateSuccess();
}
- private void loadOverlayConfigs(@NonNull Context context) {
+ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)
+ protected void loadOverlayConfigs(@NonNull Context context) {
mSatelliteCountryCodes = getSatelliteCountryCodesFromOverlayConfig(context);
mIsSatelliteAllowAccessControl = getSatelliteAccessAllowFromOverlayConfig(context);
String satelliteS2CellFileName = getSatelliteS2CellFileFromOverlayConfig(context);
mSatelliteS2CellFile = TextUtils.isEmpty(satelliteS2CellFileName)
? null : new File(satelliteS2CellFileName);
if (mSatelliteS2CellFile != null && !mSatelliteS2CellFile.exists()) {
- loge("The satellite S2 cell file " + satelliteS2CellFileName + " does not exist");
+ ploge("The satellite S2 cell file " + satelliteS2CellFileName + " does not exist");
mSatelliteS2CellFile = null;
}
mLocationFreshDurationNanos = getSatelliteLocationFreshDurationFromOverlayConfig(context);
+ mAccessControllerMetricsStats.setConfigDataSource(
+ SatelliteConstants.CONFIG_DATA_SOURCE_DEVICE_CONFIG);
+ mRetryIntervalToEvaluateUserInSatelliteAllowedRegion =
+ getDelayBeforeRetryValidatingPossibleChangeInSatelliteAllowedRegionMillis(context);
+ mMaxRetryCountForValidatingPossibleChangeInAllowedRegion =
+ getMaxRetryCountForValidatingPossibleChangeInAllowedRegion(context);
+ mLocationQueryThrottleIntervalNanos = getLocationQueryThrottleIntervalNanos(context);
}
private void loadConfigUpdaterConfigs() {
if (mSharedPreferences == null) {
- loge("loadConfigUpdaterConfigs : mSharedPreferences is null");
+ ploge("loadConfigUpdaterConfigs : mSharedPreferences is null");
return;
}
@@ -592,7 +836,7 @@
mSharedPreferences.getStringSet(CONFIG_UPDATER_SATELLITE_COUNTRY_CODES_KEY, null);
if (countryCodes == null || countryCodes.isEmpty()) {
- loge("config updater country codes are either null or empty");
+ ploge("config updater country codes are either null or empty");
return;
}
@@ -602,14 +846,37 @@
File s2CellFile = getConfigUpdaterSatS2CellFileFromLocalDirectory();
if (s2CellFile == null) {
- loge("s2CellFile is null");
+ ploge("s2CellFile is null");
return;
}
- logd("use config updater config data");
+ plogd("use config updater config data");
mSatelliteS2CellFile = s2CellFile;
mSatelliteCountryCodes = countryCodes.stream().collect(Collectors.toList());
mIsSatelliteAllowAccessControl = isSatelliteAllowAccessControl;
+ mAccessControllerMetricsStats.setConfigDataSource(
+ SatelliteConstants.CONFIG_DATA_SOURCE_CONFIG_UPDATER);
+ }
+
+ private void loadCachedLatestSatelliteCommunicationAllowedState() {
+ if (mSharedPreferences == null) {
+ ploge("loadCachedLatestSatelliteCommunicationAllowedState: mSharedPreferences is null");
+ return;
+ }
+
+ try {
+ mLatestSatelliteCommunicationAllowedSetTime =
+ mSharedPreferences.getLong(LATEST_SATELLITE_COMMUNICATION_ALLOWED_SET_TIME_KEY,
+ 0);
+ mLatestSatelliteCommunicationAllowed =
+ mSharedPreferences.getBoolean(LATEST_SATELLITE_COMMUNICATION_ALLOWED_KEY,
+ false);
+ } catch (Exception ex) {
+ ploge("loadCachedLatestSatelliteCommunicationAllowedState: ex=" + ex);
+ }
+ plogd("mLatestSatelliteCommunicationAllowedSetTime="
+ + mLatestSatelliteCommunicationAllowedSetTime
+ + ", mLatestSatelliteCommunicationAllowed=" + mLatestSatelliteCommunicationAllowed);
}
private long getLocationFreshDurationNanos() {
@@ -655,77 +922,172 @@
synchronized (mLock) {
mSatelliteAllowResultReceivers.add(requestArguments.second);
if (mSatelliteAllowResultReceivers.size() > 1) {
- logd("requestIsCommunicationAllowedForCurrentLocation is already being "
+ plogd("requestIsCommunicationAllowedForCurrentLocation is already being "
+ "processed");
return;
}
+ mTotalCheckingStartTimeMillis = System.currentTimeMillis();
mSatelliteController.requestIsSatelliteSupported(
- requestArguments.first, mInternalSatelliteSupportedResultReceiver);
+ mInternalSatelliteSupportedResultReceiver);
}
}
private void handleWaitForCurrentLocationTimedOutEvent() {
- logd("Timed out to wait for current location");
+ plogd("Timed out to wait for current location");
synchronized (mLock) {
if (mLocationRequestCancellationSignal != null) {
mLocationRequestCancellationSignal.cancel();
mLocationRequestCancellationSignal = null;
onCurrentLocationAvailable(null);
} else {
- loge("handleWaitForCurrentLocationTimedOutEvent: "
+ ploge("handleWaitForCurrentLocationTimedOutEvent: "
+ "mLocationRequestCancellationSignal is null");
}
}
}
- private void handleIsSatelliteSupportedResult(int resultCode, Bundle resultData) {
- logd("handleIsSatelliteSupportedResult: resultCode=" + resultCode);
+ private void registerLocationModeChangedBroadcastReceiver(Context context) {
+ if (!mFeatureFlags.oemEnabledSatelliteFlag()) {
+ plogd("registerLocationModeChangedBroadcastReceiver: Flag "
+ + "oemEnabledSatellite is disabled");
+ return;
+ }
+ IntentFilter intentFilter = new IntentFilter();
+ intentFilter.addAction(LocationManager.MODE_CHANGED_ACTION);
+ context.registerReceiver(mLocationModeChangedBroadcastReceiver, intentFilter);
+ }
+
+ /**
+ * At country borders, a multi-SIM device might connect to multiple cellular base
+ * stations and thus might have multiple different MCCs.
+ * In such cases, framework is not sure whether the region should be disallowed or not,
+ * and thus the geofence data will be used to decide whether to allow satellite.
+ */
+ private boolean isRegionDisallowed(List<String> networkCountryIsoList) {
+ if (networkCountryIsoList.isEmpty()) {
+ plogd("isRegionDisallowed : false : network country code is not available");
+ return false;
+ }
+
+ for (String countryCode : networkCountryIsoList) {
+ if (isSatelliteAccessAllowedForLocation(List.of(countryCode))) {
+ plogd("isRegionDisallowed : false : Country Code " + countryCode
+ + " is allowed but not sure if current location should be allowed.");
+ return false;
+ }
+ }
+
+ plogd("isRegionDisallowed : true : " + networkCountryIsoList);
+ return true;
+ }
+
+ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)
+ protected void handleIsSatelliteSupportedResult(int resultCode, Bundle resultData) {
+ plogd("handleIsSatelliteSupportedResult: resultCode=" + resultCode);
synchronized (mLock) {
if (resultCode == SATELLITE_RESULT_SUCCESS) {
if (resultData.containsKey(KEY_SATELLITE_SUPPORTED)) {
boolean isSatelliteSupported = resultData.getBoolean(KEY_SATELLITE_SUPPORTED);
if (!isSatelliteSupported) {
- logd("Satellite is not supported");
+ plogd("Satellite is not supported");
Bundle bundle = new Bundle();
bundle.putBoolean(SatelliteManager.KEY_SATELLITE_COMMUNICATION_ALLOWED,
false);
- sendSatelliteAllowResultToReceivers(resultCode, bundle);
+ sendSatelliteAllowResultToReceivers(SATELLITE_RESULT_NOT_SUPPORTED, bundle,
+ false);
} else {
- checkSatelliteAccessRestrictionForCurrentLocation();
+ plogd("Satellite is supported");
+ List<String> networkCountryIsoList =
+ mCountryDetector.getCurrentNetworkCountryIso();
+ if (isRegionDisallowed(networkCountryIsoList)) {
+ Bundle bundle = new Bundle();
+ bundle.putBoolean(KEY_SATELLITE_COMMUNICATION_ALLOWED, false);
+ mAccessControllerMetricsStats.setAccessControlType(
+ SatelliteConstants.ACCESS_CONTROL_TYPE_NETWORK_COUNTRY_CODE)
+ .setCountryCodes(networkCountryIsoList);
+ sendSatelliteAllowResultToReceivers(SATELLITE_RESULT_SUCCESS, bundle,
+ false);
+ } else {
+ checkSatelliteAccessRestrictionUsingGPS();
+ }
}
} else {
- loge("KEY_SATELLITE_SUPPORTED does not exist.");
- sendSatelliteAllowResultToReceivers(resultCode, resultData);
+ ploge("KEY_SATELLITE_SUPPORTED does not exist.");
+ sendSatelliteAllowResultToReceivers(resultCode, resultData, false);
}
} else {
- sendSatelliteAllowResultToReceivers(resultCode, resultData);
+ sendSatelliteAllowResultToReceivers(resultCode, resultData, false);
}
}
}
- private void sendSatelliteAllowResultToReceivers(int resultCode, Bundle resultData) {
+ private void handleIsSatelliteProvisionedResult(int resultCode, Bundle resultData) {
+ plogd("handleIsSatelliteProvisionedResult: resultCode=" + resultCode);
+ synchronized (mLock) {
+ if (resultCode == SATELLITE_RESULT_SUCCESS) {
+ if (resultData.containsKey(KEY_SATELLITE_PROVISIONED)) {
+ boolean isSatelliteProvisioned =
+ resultData.getBoolean(KEY_SATELLITE_PROVISIONED);
+ if (!isSatelliteProvisioned) {
+ plogd("Satellite is not provisioned");
+ Bundle bundle = new Bundle();
+ bundle.putBoolean(SatelliteManager.KEY_SATELLITE_COMMUNICATION_ALLOWED,
+ false);
+ sendSatelliteAllowResultToReceivers(resultCode, bundle, false);
+ } else {
+ plogd("Satellite is provisioned");
+ checkSatelliteAccessRestrictionUsingGPS();
+ }
+ } else {
+ ploge("KEY_SATELLITE_PROVISIONED does not exist.");
+ sendSatelliteAllowResultToReceivers(resultCode, resultData, false);
+ }
+ } else {
+ sendSatelliteAllowResultToReceivers(resultCode, resultData, false);
+ }
+ }
+ }
+
+ private void sendSatelliteAllowResultToReceivers(int resultCode, Bundle resultData,
+ boolean allowed) {
+ plogd("sendSatelliteAllowResultToReceivers : resultCode is " + resultCode);
+ if (resultCode == SATELLITE_RESULT_SUCCESS) {
+ updateCurrentSatelliteAllowedState(allowed);
+ }
synchronized (mLock) {
for (ResultReceiver resultReceiver : mSatelliteAllowResultReceivers) {
resultReceiver.send(resultCode, resultData);
}
mSatelliteAllowResultReceivers.clear();
}
+ if (!shouldRetryValidatingPossibleChangeInAllowedRegion(resultCode)) {
+ setIsSatelliteAllowedRegionPossiblyChanged(false);
+ }
+ synchronized (mIsAllowedCheckBeforeEnablingSatelliteLock) {
+ mIsAllowedCheckBeforeEnablingSatellite = false;
+ }
+ reportMetrics(resultCode, allowed);
}
/**
- * Telephony-internal logic to verify if satellite access is restricted at the current location.
+ * Telephony-internal logic to verify if satellite access is restricted at the current
+ * location.
*/
private void checkSatelliteAccessRestrictionForCurrentLocation() {
synchronized (mLock) {
List<String> networkCountryIsoList = mCountryDetector.getCurrentNetworkCountryIso();
if (!networkCountryIsoList.isEmpty()) {
- logd("Use current network country codes=" + String.join(", ",
+ plogd("Use current network country codes=" + String.join(", ",
networkCountryIsoList));
+ boolean allowed = isSatelliteAccessAllowedForLocation(networkCountryIsoList);
Bundle bundle = new Bundle();
- bundle.putBoolean(KEY_SATELLITE_COMMUNICATION_ALLOWED,
- isSatelliteAccessAllowedForLocation(networkCountryIsoList));
- sendSatelliteAllowResultToReceivers(SATELLITE_RESULT_SUCCESS, bundle);
+ bundle.putBoolean(KEY_SATELLITE_COMMUNICATION_ALLOWED, allowed);
+ mAccessControllerMetricsStats
+ .setAccessControlType(
+ SatelliteConstants.ACCESS_CONTROL_TYPE_NETWORK_COUNTRY_CODE)
+ .setCountryCodes(networkCountryIsoList);
+ sendSatelliteAllowResultToReceivers(SATELLITE_RESULT_SUCCESS, bundle, allowed);
} else {
if (shouldUseOnDeviceAccessController()) {
// This will be an asynchronous check when it needs to wait for the current
@@ -739,6 +1101,161 @@
}
}
+ private boolean shouldRetryValidatingPossibleChangeInAllowedRegion(int resultCode) {
+ return (resultCode == SATELLITE_RESULT_LOCATION_NOT_AVAILABLE);
+ }
+
+ private void initializeHandlerForSatelliteAllowedResult() {
+ mHandlerForSatelliteAllowedResult = new ResultReceiver(null) {
+ @Override
+ protected void onReceiveResult(int resultCode, Bundle resultData) {
+ plogd("query satellite allowed for current "
+ + "location, resultCode=" + resultCode + ", resultData=" + resultData);
+ synchronized (mPossibleChangeInSatelliteAllowedRegionLock) {
+ if (shouldRetryValidatingPossibleChangeInAllowedRegion(resultCode)
+ && (mRetryCountForValidatingPossibleChangeInAllowedRegion
+ < mMaxRetryCountForValidatingPossibleChangeInAllowedRegion)) {
+ mRetryCountForValidatingPossibleChangeInAllowedRegion++;
+ plogd("mRetryCountForValidatingPossibleChangeInAllowedRegion is "
+ + mRetryCountForValidatingPossibleChangeInAllowedRegion);
+ sendDelayedRequestAsync(CMD_IS_SATELLITE_COMMUNICATION_ALLOWED,
+ new Pair<>(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID,
+ mHandlerForSatelliteAllowedResult),
+ mRetryIntervalToEvaluateUserInSatelliteAllowedRegion);
+ } else {
+ mRetryCountForValidatingPossibleChangeInAllowedRegion = 0;
+ plogd("Stop retry validating the possible change in satellite allowed "
+ + "region");
+ }
+ }
+ }
+ };
+ }
+
+ private void handleSatelliteAllowedRegionPossiblyChanged(int handleEvent) {
+ if (!mFeatureFlags.oemEnabledSatelliteFlag()) {
+ ploge("handleSatelliteAllowedRegionPossiblyChanged: "
+ + "The feature flag oemEnabledSatelliteFlag() is not enabled");
+ return;
+ }
+ synchronized (mPossibleChangeInSatelliteAllowedRegionLock) {
+ logd("handleSatelliteAllowedRegionPossiblyChanged");
+ setIsSatelliteAllowedRegionPossiblyChanged(true);
+ requestIsCommunicationAllowedForCurrentLocation(
+ mHandlerForSatelliteAllowedResult, false);
+ int triggeringEvent = TRIGGERING_EVENT_UNKNOWN;
+ if (handleEvent == EVENT_LOCATION_SETTINGS_ENABLED) {
+ triggeringEvent = TRIGGERING_EVENT_LOCATION_SETTINGS_ENABLED;
+ } else if (handleEvent == EVENT_COUNTRY_CODE_CHANGED) {
+ triggeringEvent = TRIGGERING_EVENT_MCC_CHANGED;
+ }
+ mAccessControllerMetricsStats.setTriggeringEvent(triggeringEvent);
+ }
+ }
+
+ protected boolean allowLocationQueryForSatelliteAllowedCheck() {
+ synchronized (mPossibleChangeInSatelliteAllowedRegionLock) {
+ if (!isCommunicationAllowedCacheValid()) {
+ logd("allowLocationQueryForSatelliteAllowedCheck: cache is not valid");
+ return true;
+ }
+
+ if (isSatelliteAllowedRegionPossiblyChanged() && !isLocationQueryThrottled()) {
+ logd("allowLocationQueryForSatelliteAllowedCheck: location query is not throttled");
+ return true;
+ }
+ }
+ logd("allowLocationQueryForSatelliteAllowedCheck: false");
+ return false;
+ }
+
+ private boolean isLocationQueryThrottled() {
+ if (mLastLocationQueryForPossibleChangeInAllowedRegionTimeNanos == 0) {
+ plogv("isLocationQueryThrottled: "
+ + "mLastLocationQueryForPossibleChangeInAllowedRegionTimeNanos is 0, return "
+ + "false");
+ return false;
+ }
+
+ long currentTime = getElapsedRealtimeNanos();
+ if (currentTime - mLastLocationQueryForPossibleChangeInAllowedRegionTimeNanos
+ > mLocationQueryThrottleIntervalNanos) {
+ plogv("isLocationQueryThrottled: currentTime - "
+ + "mLastLocationQueryForPossibleChangeInAllowedRegionTimeNanos is "
+ + "bigger than " + mLocationQueryThrottleIntervalNanos + " so return false");
+ return false;
+ }
+
+ plogd("isLocationQueryThrottled : true");
+ return true;
+ }
+
+ /**
+ * Telephony-internal logic to verify if satellite access is restricted from the location query.
+ */
+ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)
+ public void checkSatelliteAccessRestrictionUsingGPS() {
+ logv("checkSatelliteAccessRestrictionUsingGPS:");
+ synchronized (mIsAllowedCheckBeforeEnablingSatelliteLock) {
+ if (isInEmergency()) {
+ executeLocationQuery();
+ } else {
+ if (mLocationManager.isLocationEnabled()) {
+ plogd("location query is allowed");
+ if (allowLocationQueryForSatelliteAllowedCheck()
+ || mIsAllowedCheckBeforeEnablingSatellite) {
+ executeLocationQuery();
+ } else {
+ Bundle bundle = new Bundle();
+ bundle.putBoolean(KEY_SATELLITE_COMMUNICATION_ALLOWED,
+ mLatestSatelliteCommunicationAllowed);
+ sendSatelliteAllowResultToReceivers(SATELLITE_RESULT_SUCCESS, bundle,
+ mLatestSatelliteCommunicationAllowed);
+ }
+ } else {
+ plogv("location query is not allowed");
+ Bundle bundle = new Bundle();
+ bundle.putBoolean(KEY_SATELLITE_COMMUNICATION_ALLOWED, false);
+ sendSatelliteAllowResultToReceivers(
+ SATELLITE_RESULT_LOCATION_DISABLED, bundle, false);
+ }
+ }
+ }
+ }
+
+ /**
+ * @return {@code true} if the latest query was executed within the predefined valid duration,
+ * {@code false} otherwise.
+ */
+ private boolean isCommunicationAllowedCacheValid() {
+ if (mLatestSatelliteCommunicationAllowedSetTime > 0) {
+ long currentTime = getElapsedRealtimeNanos();
+ if ((currentTime - mLatestSatelliteCommunicationAllowedSetTime)
+ <= ALLOWED_STATE_CACHE_VALID_DURATION_NANOS) {
+ logv("isCommunicationAllowedCacheValid: cache is valid");
+ return true;
+ }
+ }
+ logv("isCommunicationAllowedCacheValid: cache is expired");
+ return false;
+ }
+
+ private void executeLocationQuery() {
+ plogd("executeLocationQuery");
+ synchronized (mPossibleChangeInSatelliteAllowedRegionLock) {
+ if (isSatelliteAllowedRegionPossiblyChanged()) {
+ mLastLocationQueryForPossibleChangeInAllowedRegionTimeNanos =
+ getElapsedRealtimeNanos();
+ plogd("mLastLocationQueryForPossibleChangeInAllowedRegionTimeNanos is set "
+ + mLastLocationQueryForPossibleChangeInAllowedRegionTimeNanos);
+ }
+ }
+ synchronized (mLock) {
+ mFreshLastKnownLocation = getFreshLastKnownLocation();
+ checkSatelliteAccessRestrictionUsingOnDeviceData();
+ }
+ }
+
/**
* This function synchronously checks if satellite is allowed at current location using cached
* country codes.
@@ -760,12 +1277,14 @@
// Use cached network country codes
countryCodeList = networkCountryCodeInfoMap.keySet().stream().toList();
}
- logd("Use cached country codes=" + String.join(", ", countryCodeList));
+ plogd("Use cached country codes=" + String.join(", ", countryCodeList));
+ mAccessControllerMetricsStats.setAccessControlType(
+ SatelliteConstants.ACCESS_CONTROL_TYPE_CACHED_COUNTRY_CODE);
+ boolean allowed = isSatelliteAccessAllowedForLocation(countryCodeList);
Bundle bundle = new Bundle();
- bundle.putBoolean(KEY_SATELLITE_COMMUNICATION_ALLOWED,
- isSatelliteAccessAllowedForLocation(countryCodeList));
- sendSatelliteAllowResultToReceivers(SATELLITE_RESULT_SUCCESS, bundle);
+ bundle.putBoolean(KEY_SATELLITE_COMMUNICATION_ALLOWED, allowed);
+ sendSatelliteAllowResultToReceivers(SATELLITE_RESULT_SUCCESS, bundle, allowed);
}
/**
@@ -774,14 +1293,19 @@
* from location service.
*/
private void checkSatelliteAccessRestrictionUsingOnDeviceData() {
+ mOnDeviceLookupStartTimeMillis = System.currentTimeMillis();
synchronized (mLock) {
- logd("Use on-device data");
+ plogd("Use on-device data");
if (mFreshLastKnownLocation != null) {
+ mAccessControllerMetricsStats.setAccessControlType(
+ SatelliteConstants.ACCESS_CONTROL_TYPE_LAST_KNOWN_LOCATION);
checkSatelliteAccessRestrictionForLocation(mFreshLastKnownLocation);
mFreshLastKnownLocation = null;
} else {
Location freshLastKnownLocation = getFreshLastKnownLocation();
if (freshLastKnownLocation != null) {
+ mAccessControllerMetricsStats.setAccessControlType(
+ SatelliteConstants.ACCESS_CONTROL_TYPE_LAST_KNOWN_LOCATION);
checkSatelliteAccessRestrictionForLocation(freshLastKnownLocation);
} else {
queryCurrentLocation();
@@ -793,14 +1317,16 @@
private void queryCurrentLocation() {
synchronized (mLock) {
if (mLocationRequestCancellationSignal != null) {
- logd("Request for current location was already sent to LocationManager");
+ plogd("queryCurrentLocation : "
+ + "Request for current location was already sent to LocationManager");
return;
}
mLocationRequestCancellationSignal = new CancellationSignal();
- mLocationManager.getCurrentLocation(LocationManager.GPS_PROVIDER,
+ mLocationQueryStartTimeMillis = System.currentTimeMillis();
+ mLocationManager.getCurrentLocation(LocationManager.FUSED_PROVIDER,
new LocationRequest.Builder(0)
.setQuality(LocationRequest.QUALITY_HIGH_ACCURACY)
- .setLocationSettingsIgnored(true)
+ .setLocationSettingsIgnored(isInEmergency())
.build(),
mLocationRequestCancellationSignal, this::post,
this::onCurrentLocationAvailable);
@@ -809,14 +1335,39 @@
}
private void onCurrentLocationAvailable(@Nullable Location location) {
- logd("onCurrentLocationAvailable " + (location != null));
+ plogd("onCurrentLocationAvailable " + (location != null));
synchronized (mLock) {
stopWaitForCurrentLocationTimer();
mLocationRequestCancellationSignal = null;
+ mAccessControllerMetricsStats.setLocationQueryTime(mLocationQueryStartTimeMillis);
+ Bundle bundle = new Bundle();
if (location != null) {
+ plogd("onCurrentLocationAvailable: lat=" + Rlog.pii(TAG, location.getLatitude())
+ + ", long=" + Rlog.pii(TAG, location.getLongitude()));
+ if (location.isMock() && !isMockModemAllowed()) {
+ logd("location is mock");
+ bundle.putBoolean(KEY_SATELLITE_COMMUNICATION_ALLOWED, false);
+ sendSatelliteAllowResultToReceivers(SATELLITE_RESULT_SUCCESS, bundle, false);
+ return;
+ }
+ mAccessControllerMetricsStats.setAccessControlType(
+ SatelliteConstants.ACCESS_CONTROL_TYPE_CURRENT_LOCATION);
+ mControllerMetricsStats.reportLocationQuerySuccessful(true);
checkSatelliteAccessRestrictionForLocation(location);
} else {
- checkSatelliteAccessRestrictionUsingCachedCountryCodes();
+ plogd("current location is not available");
+ if (isCommunicationAllowedCacheValid()) {
+ plogd("onCurrentLocationAvailable: cache is still valid, using it");
+ bundle.putBoolean(KEY_SATELLITE_COMMUNICATION_ALLOWED,
+ mLatestSatelliteCommunicationAllowed);
+ sendSatelliteAllowResultToReceivers(SATELLITE_RESULT_SUCCESS, bundle,
+ mLatestSatelliteCommunicationAllowed);
+ } else {
+ bundle.putBoolean(KEY_SATELLITE_COMMUNICATION_ALLOWED, false);
+ sendSatelliteAllowResultToReceivers(
+ SATELLITE_RESULT_LOCATION_NOT_AVAILABLE, bundle, false);
+ }
+ mControllerMetricsStats.reportLocationQuerySuccessful(false);
}
}
}
@@ -833,22 +1384,40 @@
satelliteAllowed = mCachedAccessRestrictionMap.get(locationToken);
} else {
if (!initSatelliteOnDeviceAccessController()) {
- loge("Failed to init SatelliteOnDeviceAccessController");
- checkSatelliteAccessRestrictionUsingCachedCountryCodes();
+ ploge("Failed to init SatelliteOnDeviceAccessController");
+ Bundle bundle = new Bundle();
+ bundle.putBoolean(KEY_SATELLITE_COMMUNICATION_ALLOWED, false);
+ sendSatelliteAllowResultToReceivers(SATELLITE_RESULT_SUCCESS, bundle,
+ false);
return;
}
satelliteAllowed = mSatelliteOnDeviceAccessController
.isSatCommunicationAllowedAtLocation(locationToken);
updateCachedAccessRestrictionMap(locationToken, satelliteAllowed);
}
+ mAccessControllerMetricsStats.setOnDeviceLookupTime(mOnDeviceLookupStartTimeMillis);
Bundle bundle = new Bundle();
bundle.putBoolean(KEY_SATELLITE_COMMUNICATION_ALLOWED, satelliteAllowed);
- sendSatelliteAllowResultToReceivers(SATELLITE_RESULT_SUCCESS, bundle);
+ sendSatelliteAllowResultToReceivers(SATELLITE_RESULT_SUCCESS, bundle,
+ satelliteAllowed);
+ mLatestSatelliteCommunicationAllowed = satelliteAllowed;
+ mLatestSatelliteCommunicationAllowedSetTime = getElapsedRealtimeNanos();
+ persistLatestSatelliteCommunicationAllowedState();
} catch (Exception ex) {
- loge("checkSatelliteAccessRestrictionForLocation: ex=" + ex);
+ ploge("checkSatelliteAccessRestrictionForLocation: ex=" + ex);
reportAnomaly(UUID_ON_DEVICE_LOOKUP_EXCEPTION,
"On-device satellite lookup exception");
- checkSatelliteAccessRestrictionUsingCachedCountryCodes();
+ Bundle bundle = new Bundle();
+ if (isCommunicationAllowedCacheValid()) {
+ bundle.putBoolean(KEY_SATELLITE_COMMUNICATION_ALLOWED,
+ mLatestSatelliteCommunicationAllowed);
+ plogd("checkSatelliteAccessRestrictionForLocation: cache is still valid, "
+ + "using it");
+ } else {
+ bundle.putBoolean(KEY_SATELLITE_COMMUNICATION_ALLOWED, false);
+ }
+ sendSatelliteAllowResultToReceivers(SATELLITE_RESULT_SUCCESS, bundle,
+ mLatestSatelliteCommunicationAllowed);
}
}
}
@@ -869,7 +1438,8 @@
return true;
}
- private boolean isSatelliteAccessAllowedForLocation(
+ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)
+ protected boolean isSatelliteAccessAllowedForLocation(
@NonNull List<String> networkCountryIsoList) {
if (isSatelliteAllowAccessControl()) {
// The current country is unidentified, we're uncertain and thus returning false
@@ -932,6 +1502,9 @@
long lastKnownLocationAge =
getElapsedRealtimeNanos() - lastKnownLocation.getElapsedRealtimeNanos();
if (lastKnownLocationAge <= getLocationFreshDurationNanos()) {
+ plogd("getFreshLastKnownLocation: lat=" + Rlog.pii(TAG,
+ lastKnownLocation.getLatitude())
+ + ", long=" + Rlog.pii(TAG, lastKnownLocation.getLongitude()));
return lastKnownLocation;
}
}
@@ -941,14 +1514,23 @@
private boolean isInEmergency() {
// Check if emergency call is ongoing
if (mTelecomManager.isInEmergencyCall()) {
+ plogd("In emergency call");
return true;
}
+
// Check if the device is in emergency callback mode
for (Phone phone : PhoneFactory.getPhones()) {
if (phone.isInEcm()) {
+ plogd("In emergency callback mode");
return true;
}
}
+
+ // Check if satellite is in emergency mode
+ if (mSatelliteController.isInEmergencyMode()) {
+ plogd("In satellite emergency mode");
+ return true;
+ }
return false;
}
@@ -962,7 +1544,12 @@
result = location;
}
}
- return result;
+
+ if (result == null || isMockModemAllowed()) {
+ return result;
+ }
+
+ return result.isMock() ? null : result;
}
private void initSharedPreferences(@NonNull Context context) {
@@ -970,7 +1557,7 @@
mSharedPreferences =
context.getSharedPreferences(SATELLITE_SHARED_PREF, Context.MODE_PRIVATE);
} catch (Exception e) {
- loge("Cannot get default shared preferences: " + e);
+ ploge("Cannot get default shared preferences: " + e);
}
}
@@ -996,9 +1583,9 @@
SatelliteOnDeviceAccessController.create(getSatelliteS2CellFile());
restartKeepOnDeviceAccessControllerResourcesTimer();
mS2Level = mSatelliteOnDeviceAccessController.getS2Level();
- logd("mS2Level=" + mS2Level);
+ plogd("mS2Level=" + mS2Level);
} catch (Exception ex) {
- loge("Got exception in creating an instance of SatelliteOnDeviceAccessController,"
+ ploge("Got exception in creating an instance of SatelliteOnDeviceAccessController,"
+ " ex=" + ex + ", sat s2 file="
+ getSatelliteS2CellFile().getAbsolutePath());
reportAnomaly(UUID_CREATE_ON_DEVICE_ACCESS_CONTROLLER_EXCEPTION,
@@ -1015,13 +1602,13 @@
private void cleanupOnDeviceAccessControllerResources() {
synchronized (mLock) {
- logd("cleanupOnDeviceAccessControllerResources="
+ plogd("cleanupOnDeviceAccessControllerResources="
+ (mSatelliteOnDeviceAccessController != null));
if (mSatelliteOnDeviceAccessController != null) {
try {
mSatelliteOnDeviceAccessController.close();
} catch (Exception ex) {
- loge("cleanupOnDeviceAccessControllerResources: ex=" + ex);
+ ploge("cleanupOnDeviceAccessControllerResources: ex=" + ex);
}
mSatelliteOnDeviceAccessController = null;
stopKeepOnDeviceAccessControllerResourcesTimer();
@@ -1087,6 +1674,63 @@
}
@NonNull
+ private static long getDelayBeforeRetryValidatingPossibleChangeInSatelliteAllowedRegionMillis(
+ @NonNull Context context) {
+ Integer retryDuration = null;
+ try {
+ retryDuration = context.getResources().getInteger(com.android.internal.R.integer
+ .config_satellite_delay_minutes_before_retry_validating_possible_change_in_allowed_region);
+ } catch (Resources.NotFoundException ex) {
+ loge("getDelayBeforeRetryValidatingPossibleChangeInSatelliteAllowedRegionMillis: got "
+ + "ex=" + ex);
+ }
+ if (retryDuration == null) {
+ logd("Use default retry duration for possible change satellite allowed region ="
+ + DEFAULT_DELAY_MINUTES_BEFORE_VALIDATING_POSSIBLE_CHANGE_IN_ALLOWED_REGION);
+ retryDuration =
+ DEFAULT_DELAY_MINUTES_BEFORE_VALIDATING_POSSIBLE_CHANGE_IN_ALLOWED_REGION;
+ }
+ return TimeUnit.MINUTES.toMillis(retryDuration);
+ }
+
+ @NonNull
+ private static int getMaxRetryCountForValidatingPossibleChangeInAllowedRegion(
+ @NonNull Context context) {
+ Integer maxRetrycount = null;
+ try {
+ maxRetrycount = context.getResources().getInteger(com.android.internal.R.integer
+ .config_satellite_max_retry_count_for_validating_possible_change_in_allowed_region);
+ } catch (Resources.NotFoundException ex) {
+ loge("getMaxRetryCountForValidatingPossibleChangeInAllowedRegion: got ex= " + ex);
+ }
+ if (maxRetrycount == null) {
+ logd("Use default max retry count for possible change satellite allowed region ="
+ + DEFAULT_MAX_RETRY_COUNT_FOR_VALIDATING_POSSIBLE_CHANGE_IN_ALLOWED_REGION);
+ maxRetrycount =
+ DEFAULT_MAX_RETRY_COUNT_FOR_VALIDATING_POSSIBLE_CHANGE_IN_ALLOWED_REGION;
+ }
+ return maxRetrycount;
+ }
+
+ @NonNull
+ private static long getLocationQueryThrottleIntervalNanos(@NonNull Context context) {
+ Integer throttleInterval = null;
+ try {
+ throttleInterval = context.getResources().getInteger(com.android.internal.R.integer
+ .config_satellite_location_query_throttle_interval_minutes);
+ } catch (Resources.NotFoundException ex) {
+ loge("getLocationQueryThrottleIntervalNanos: got ex=" + ex);
+ }
+ if (throttleInterval == null) {
+ logd("Use default location query throttle interval ="
+ + DEFAULT_THROTTLE_INTERVAL_FOR_LOCATION_QUERY_MINUTES);
+ throttleInterval =
+ DEFAULT_THROTTLE_INTERVAL_FOR_LOCATION_QUERY_MINUTES;
+ }
+ return TimeUnit.MINUTES.toNanos(throttleInterval);
+ }
+
+ @NonNull
private static String[] readStringArrayFromOverlayConfig(
@NonNull Context context, @ArrayRes int id) {
String[] strArray = null;
@@ -1128,7 +1772,7 @@
private void startWaitForCurrentLocationTimer() {
synchronized (mLock) {
if (hasMessages(EVENT_WAIT_FOR_CURRENT_LOCATION_TIMEOUT)) {
- logw("WaitForCurrentLocationTimer is already started");
+ plogw("WaitForCurrentLocationTimer is already started");
removeMessages(EVENT_WAIT_FOR_CURRENT_LOCATION_TIMEOUT);
}
sendEmptyMessageDelayed(EVENT_WAIT_FOR_CURRENT_LOCATION_TIMEOUT,
@@ -1145,7 +1789,7 @@
private void restartKeepOnDeviceAccessControllerResourcesTimer() {
synchronized (mLock) {
if (hasMessages(EVENT_KEEP_ON_DEVICE_ACCESS_CONTROLLER_RESOURCES_TIMEOUT)) {
- logd("KeepOnDeviceAccessControllerResourcesTimer is already started. "
+ plogd("KeepOnDeviceAccessControllerResourcesTimer is already started. "
+ "Restarting it...");
removeMessages(EVENT_KEEP_ON_DEVICE_ACCESS_CONTROLLER_RESOURCES_TIMEOUT);
}
@@ -1161,7 +1805,7 @@
}
private void reportAnomaly(@NonNull String uuid, @NonNull String log) {
- loge(log);
+ ploge(log);
AnomalyReporter.reportAnomaly(UUID.fromString(uuid), log);
}
@@ -1176,11 +1820,177 @@
* @param command command to be executed on the main thread
* @param argument additional parameters required to perform of the operation
*/
+ private void sendDelayedRequestAsync(int command, @NonNull Object argument, long dealyMillis) {
+ Message msg = this.obtainMessage(command, argument);
+ sendMessageDelayed(msg, dealyMillis);
+ }
+
+ /**
+ * Posts the specified command to be executed on the main thread and returns immediately.
+ *
+ * @param command command to be executed on the main thread
+ * @param argument additional parameters required to perform of the operation
+ */
private void sendRequestAsync(int command, @NonNull Object argument) {
Message msg = this.obtainMessage(command, argument);
msg.sendToTarget();
}
+ /**
+ * Registers for the satellite communication allowed state changed.
+ *
+ * @param subId The subId of the subscription to register for the satellite communication
+ * allowed state changed.
+ * @param callback The callback to handle the satellite communication allowed state changed
+ * event.
+ * @return The {@link SatelliteManager.SatelliteResult} result of the operation.
+ */
+ @SatelliteManager.SatelliteResult
+ public int registerForCommunicationAllowedStateChanged(int subId,
+ @NonNull ISatelliteCommunicationAllowedStateCallback callback) {
+ if (!mFeatureFlags.oemEnabledSatelliteFlag()) {
+ plogd("registerForCommunicationAllowedStateChanged: oemEnabledSatelliteFlag is "
+ + "disabled");
+ return SatelliteManager.SATELLITE_RESULT_REQUEST_NOT_SUPPORTED;
+ }
+
+ mSatelliteCommunicationAllowedStateChangedListeners.put(callback.asBinder(), callback);
+
+ this.post(() -> {
+ try {
+ synchronized (mSatelliteCommunicationAllowStateLock) {
+ callback.onSatelliteCommunicationAllowedStateChanged(
+ mCurrentSatelliteAllowedState);
+ logd("registerForCommunicationAllowedStateChanged: "
+ + "mCurrentSatelliteAllowedState " + mCurrentSatelliteAllowedState);
+ }
+ } catch (RemoteException ex) {
+ ploge("registerForCommunicationAllowedStateChanged: RemoteException ex=" + ex);
+ }
+ });
+
+ return SATELLITE_RESULT_SUCCESS;
+ }
+
+ /**
+ * Unregisters for the satellite communication allowed state changed.
+ * If callback was not registered before, the request will be ignored.
+ *
+ * @param subId The subId of the subscription to unregister for the satellite communication
+ * allowed state changed.
+ * @param callback The callback that was passed to
+ * {@link #registerForCommunicationAllowedStateChanged(int,
+ * ISatelliteCommunicationAllowedStateCallback)}.
+ */
+ public void unregisterForCommunicationAllowedStateChanged(
+ int subId, @NonNull ISatelliteCommunicationAllowedStateCallback callback) {
+ if (!mFeatureFlags.oemEnabledSatelliteFlag()) {
+ plogd("unregisterForCommunicationAllowedStateChanged: "
+ + "oemEnabledSatelliteFlag is disabled");
+ return;
+ }
+
+ mSatelliteCommunicationAllowedStateChangedListeners.remove(callback.asBinder());
+ }
+
+ /**
+ * This API can be used by only CTS to set the cache whether satellite communication is allowed.
+ *
+ * @param state a state indicates whether satellite access allowed state should be cached and
+ * the allowed state.
+ * @return {@code true} if the setting is successful, {@code false} otherwise.
+ */
+ public boolean setIsSatelliteCommunicationAllowedForCurrentLocationCache(String state) {
+ if (!mFeatureFlags.oemEnabledSatelliteFlag()) {
+ logd("setIsSatelliteCommunicationAllowedForCurrentLocationCache: "
+ + "oemEnabledSatelliteFlag is disabled");
+ return false;
+ }
+
+ if (!isMockModemAllowed()) {
+ logd("setIsSatelliteCommunicationAllowedForCurrentLocationCache: "
+ + "mock modem not allowed.");
+ return false;
+ }
+
+ logd("setIsSatelliteCommunicationAllowedForCurrentLocationCache: state=" + state);
+
+ synchronized (mSatelliteCommunicationAllowStateLock) {
+ if ("cache_allowed".equalsIgnoreCase(state)) {
+ mLatestSatelliteCommunicationAllowedSetTime = getElapsedRealtimeNanos();
+ mLatestSatelliteCommunicationAllowed = true;
+ mCurrentSatelliteAllowedState = true;
+ } else if ("cache_not_allowed".equalsIgnoreCase(state)) {
+ mLatestSatelliteCommunicationAllowedSetTime = getElapsedRealtimeNanos();
+ mLatestSatelliteCommunicationAllowed = false;
+ mCurrentSatelliteAllowedState = false;
+ } else if ("cache_clear_and_not_allowed".equalsIgnoreCase(state)) {
+ mLatestSatelliteCommunicationAllowedSetTime = 0;
+ mLatestSatelliteCommunicationAllowed = false;
+ mCurrentSatelliteAllowedState = false;
+ persistLatestSatelliteCommunicationAllowedState();
+ } else if ("clear_cache_only".equalsIgnoreCase(state)) {
+ mLatestSatelliteCommunicationAllowedSetTime = 0;
+ mLatestSatelliteCommunicationAllowed = false;
+ persistLatestSatelliteCommunicationAllowedState();
+ } else {
+ loge("setIsSatelliteCommunicationAllowedForCurrentLocationCache: invalid state="
+ + state);
+ return false;
+ }
+ }
+ return true;
+ }
+
+ private void notifySatelliteCommunicationAllowedStateChanged(boolean allowState) {
+ plogd("notifySatelliteCommunicationAllowedStateChanged: allowState=" + allowState);
+
+ List<ISatelliteCommunicationAllowedStateCallback> deadCallersList = new ArrayList<>();
+ mSatelliteCommunicationAllowedStateChangedListeners.values().forEach(listener -> {
+ try {
+ listener.onSatelliteCommunicationAllowedStateChanged(allowState);
+ } catch (RemoteException e) {
+ plogd("handleEventNtnSignalStrengthChanged RemoteException: " + e);
+ deadCallersList.add(listener);
+ }
+ });
+ deadCallersList.forEach(listener -> {
+ mSatelliteCommunicationAllowedStateChangedListeners.remove(listener.asBinder());
+ });
+ }
+
+ private void reportMetrics(int resultCode, boolean allowed) {
+ if (resultCode == SATELLITE_RESULT_SUCCESS) {
+ mControllerMetricsStats.reportAllowedSatelliteAccessCount(allowed);
+ } else {
+ mControllerMetricsStats.reportFailedSatelliteAccessCheckCount();
+ }
+
+ mAccessControllerMetricsStats
+ .setLocationQueryTime(mLocationQueryStartTimeMillis)
+ .setTotalCheckingTime(mTotalCheckingStartTimeMillis)
+ .setIsAllowed(allowed)
+ .setIsEmergency(isInEmergency())
+ .setResult(resultCode)
+ .reportAccessControllerMetrics();
+ mLocationQueryStartTimeMillis = 0;
+ mOnDeviceLookupStartTimeMillis = 0;
+ mTotalCheckingStartTimeMillis = 0;
+ }
+
+ protected boolean isSatelliteAllowedRegionPossiblyChanged() {
+ synchronized (mPossibleChangeInSatelliteAllowedRegionLock) {
+ return mIsSatelliteAllowedRegionPossiblyChanged;
+ }
+ }
+
+ protected void setIsSatelliteAllowedRegionPossiblyChanged(boolean changed) {
+ synchronized (mPossibleChangeInSatelliteAllowedRegionLock) {
+ plogd("setIsSatelliteAllowedRegionPossiblyChanged : " + changed);
+ mIsSatelliteAllowedRegionPossiblyChanged = changed;
+ }
+ }
+
private static void logd(@NonNull String log) {
Rlog.d(TAG, log);
}
@@ -1192,4 +2002,49 @@
private static void loge(@NonNull String log) {
Rlog.e(TAG, log);
}
+
+ private static void logv(@NonNull String log) {
+ Rlog.v(TAG, log);
+ }
+
+ private boolean isSatellitePersistentLoggingEnabled(
+ @NonNull Context context, @NonNull FeatureFlags featureFlags) {
+ if (featureFlags.satellitePersistentLogging()) {
+ return true;
+ }
+ try {
+ return context.getResources().getBoolean(
+ R.bool.config_dropboxmanager_persistent_logging_enabled);
+ } catch (RuntimeException e) {
+ return false;
+ }
+ }
+
+ private void plogv(@NonNull String log) {
+ Rlog.v(TAG, log);
+ if (mPersistentLogger != null) {
+ mPersistentLogger.debug(TAG, log);
+ }
+ }
+
+ private void plogd(@NonNull String log) {
+ Rlog.d(TAG, log);
+ if (mPersistentLogger != null) {
+ mPersistentLogger.debug(TAG, log);
+ }
+ }
+
+ private void plogw(@NonNull String log) {
+ Rlog.w(TAG, log);
+ if (mPersistentLogger != null) {
+ mPersistentLogger.warn(TAG, log);
+ }
+ }
+
+ private void ploge(@NonNull String log) {
+ Rlog.e(TAG, log);
+ if (mPersistentLogger != null) {
+ mPersistentLogger.error(TAG, log);
+ }
+ }
}
diff --git a/src/com/android/phone/satellite/entitlement/SatelliteEntitlementController.java b/src/com/android/phone/satellite/entitlement/SatelliteEntitlementController.java
index d193a7d..8d9850d 100644
--- a/src/com/android/phone/satellite/entitlement/SatelliteEntitlementController.java
+++ b/src/com/android/phone/satellite/entitlement/SatelliteEntitlementController.java
@@ -16,8 +16,6 @@
package com.android.phone.satellite.entitlement;
-import static com.android.phone.satellite.entitlement.SatelliteEntitlementResult.SATELLITE_ENTITLEMENT_STATUS_ENABLED;
-
import static java.time.format.DateTimeFormatter.RFC_1123_DATE_TIME;
import static java.time.temporal.ChronoUnit.SECONDS;
@@ -40,15 +38,19 @@
import android.telephony.SubscriptionManager;
+import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.telephony.ExponentialBackoff;
import com.android.internal.telephony.flags.FeatureFlags;
+import com.android.internal.telephony.satellite.SatelliteConstants;
import com.android.internal.telephony.satellite.SatelliteController;
+import com.android.internal.telephony.satellite.metrics.EntitlementMetricsStats;
import com.android.internal.telephony.subscription.SubscriptionManagerService;
import com.android.libraries.entitlement.ServiceEntitlementException;
import java.time.Instant;
import java.time.format.DateTimeParseException;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -65,7 +67,7 @@
/** Message code used in handleMessage() */
private static final int CMD_START_QUERY_ENTITLEMENT = 1;
private static final int CMD_RETRY_QUERY_ENTITLEMENT = 2;
- private static final int CMD_STOP_RETRY_QUERY_ENTITLEMENT = 3;
+ private static final int CMD_SIM_REFRESH = 3;
/** Retry on next trigger event. */
private static final int HTTP_RESPONSE_500 = 500;
@@ -74,7 +76,7 @@
private static final int HTTP_RESPONSE_503 = 503;
/** Default query refresh time is 1 month. */
- private static final int DEFAULT_QUERY_REFRESH_DAYS = 30;
+ private static final int DEFAULT_QUERY_REFRESH_DAYS = 7;
private static final long INITIAL_DELAY_MILLIS = TimeUnit.MINUTES.toMillis(10); // 10 min
private static final long MAX_DELAY_MILLIS = TimeUnit.DAYS.toMillis(5); // 5 days
private static final int MULTIPLIER = 2;
@@ -89,15 +91,26 @@
@NonNull private final Context mContext;
private final Object mLock = new Object();
/** Map key : subId, value : ExponentialBackoff. */
+ @GuardedBy("mLock")
private Map<Integer, ExponentialBackoff> mExponentialBackoffPerSub = new HashMap<>();
/** Map key : subId, value : SatelliteEntitlementResult. */
+ @GuardedBy("mLock")
private Map<Integer, SatelliteEntitlementResult> mSatelliteEntitlementResultPerSub =
new HashMap<>();
/** Map key : subId, value : the last query time to millis. */
+ @GuardedBy("mLock")
private Map<Integer, Long> mLastQueryTimePerSub = new HashMap<>();
/** Map key : subId, value : Count the number of retries caused by the 'ExponentialBackoff' and
* '503 error case with the Retry-After header'. */
+ @GuardedBy("mLock")
private Map<Integer, Integer> mRetryCountPerSub = new HashMap<>();
+ /** Map key : subId, value : Whether query is in progress. */
+ @GuardedBy("mLock")
+ private Map<Integer, Boolean> mIsEntitlementInProgressPerSub = new HashMap<>();
+ /** Map key : slotId, value : The last used subId. */
+ @GuardedBy("mLock")
+ private Map<Integer, Integer> mSubIdPerSlot = new HashMap<>();
+ @NonNull private final EntitlementMetricsStats mEntitlementMetricsStats;
/**
* Create the SatelliteEntitlementController singleton instance.
@@ -132,19 +145,16 @@
mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
mCarrierConfigChangeListener = (slotIndex, subId, carrierId, specificCarrierId) ->
handleCarrierConfigChanged(slotIndex, subId, carrierId, specificCarrierId);
- mCarrierConfigManager.registerCarrierConfigChangeListener(this::post,
- mCarrierConfigChangeListener);
+ if (mCarrierConfigManager != null) {
+ mCarrierConfigManager.registerCarrierConfigChangeListener(this::post,
+ mCarrierConfigChangeListener);
+ }
mConnectivityManager = context.getSystemService(ConnectivityManager.class);
mNetworkCallback = new ConnectivityManager.NetworkCallback() {
@Override
public void onAvailable(Network network) {
handleInternetConnected();
}
-
- @Override
- public void onLost(Network network) {
- handleInternetDisconnected();
- }
};
NetworkRequest networkrequest = new NetworkRequest.Builder()
.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET).build();
@@ -153,6 +163,8 @@
IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction(Intent.ACTION_AIRPLANE_MODE_CHANGED);
context.registerReceiver(mReceiver, intentFilter);
+ mEntitlementMetricsStats = EntitlementMetricsStats.getOrCreateInstance();
+ SatelliteController.getInstance().registerIccRefresh(this, CMD_SIM_REFRESH);
}
@Override
@@ -164,8 +176,8 @@
case CMD_RETRY_QUERY_ENTITLEMENT:
handleCmdRetryQueryEntitlement(msg.arg1);
break;
- case CMD_STOP_RETRY_QUERY_ENTITLEMENT:
- stopExponentialBackoff(msg.arg1);
+ case CMD_SIM_REFRESH:
+ handleSimRefresh();
break;
default:
logd("do not used this message");
@@ -174,14 +186,35 @@
private void handleCarrierConfigChanged(int slotIndex, int subId, int carrierId,
int specificCarrierId) {
- if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
- return;
- }
logd("handleCarrierConfigChanged(): slotIndex(" + slotIndex + "), subId("
+ subId + "), carrierId(" + carrierId + "), specificCarrierId("
+ specificCarrierId + ")");
+ processSimChanged(slotIndex, subId);
+ if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+ return;
+ }
sendEmptyMessage(CMD_START_QUERY_ENTITLEMENT);
+ synchronized (mLock) {
+ mSubIdPerSlot.put(slotIndex, subId);
+ }
+ }
+
+ // When SIM is removed or changed, then reset the previous subId's retry related objects.
+ private void processSimChanged(int slotIndex, int subId) {
+ int previousSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+ synchronized (mLock) {
+ previousSubId = mSubIdPerSlot.getOrDefault(slotIndex,
+ SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+ }
+ logd("processSimChanged prev subId:" + previousSubId);
+ if (previousSubId != subId) {
+ synchronized (mLock) {
+ mSubIdPerSlot.remove(slotIndex);
+ }
+ logd("processSimChanged resetEntitlementQueryPerSubId");
+ resetEntitlementQueryPerSubId(previousSubId);
+ }
}
private class SatelliteEntitlementControllerReceiver extends BroadcastReceiver {
@@ -201,6 +234,12 @@
}
}
+ private void handleSimRefresh() {
+ resetEntitlementQueryCounts(cmdToString(CMD_SIM_REFRESH));
+ sendMessageDelayed(obtainMessage(CMD_START_QUERY_ENTITLEMENT),
+ TimeUnit.SECONDS.toMillis(10));
+ }
+
private boolean isInternetConnected() {
Network activeNetwork = mConnectivityManager.getActiveNetwork();
NetworkCapabilities networkCapabilities =
@@ -214,15 +253,6 @@
sendEmptyMessage(CMD_START_QUERY_ENTITLEMENT);
}
- private void handleInternetDisconnected() {
- mExponentialBackoffPerSub.forEach((key, value) -> {
- Message message = obtainMessage();
- message.what = CMD_STOP_RETRY_QUERY_ENTITLEMENT;
- message.arg1 = key;
- sendMessage(message);
- });
- }
-
/**
* Check if the device can request to entitlement server (if there is an internet connection and
* if the throttle time has passed since the last request), and then pass the response to
@@ -230,34 +260,48 @@
*/
@VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)
public void handleCmdStartQueryEntitlement() {
- if (!isInternetConnected()) {
- logd("Internet disconnected");
- return;
- }
-
for (int subId : mSubscriptionManagerService.getActiveSubIdList(true)) {
- if (!shouldQueryEntitlement(subId)) {
- return;
+ if (!shouldStartQueryEntitlement(subId)) {
+ continue;
}
// Check the satellite service query result from the entitlement server for the
// satellite service.
try {
- mSatelliteEntitlementResultPerSub.remove(subId);
- mSatelliteEntitlementResultPerSub.put(subId, getSatelliteEntitlementApi(
- subId).checkEntitlementStatus());
+ synchronized (mLock) {
+ mIsEntitlementInProgressPerSub.put(subId, true);
+ SatelliteEntitlementResult entitlementResult = getSatelliteEntitlementApi(
+ subId).checkEntitlementStatus();
+ mSatelliteEntitlementResultPerSub.put(subId, entitlementResult);
+ mEntitlementMetricsStats.reportSuccess(subId,
+ getEntitlementStatus(entitlementResult), false);
+ }
} catch (ServiceEntitlementException e) {
loge(e.toString());
+ mEntitlementMetricsStats.reportError(subId, e.getErrorCode(), false);
if (!isInternetConnected()) {
- logd("handleCmdStartQueryEntitlement: disconnected. " + e);
+ logd("StartQuery: disconnected. " + e);
+ synchronized (mLock) {
+ mIsEntitlementInProgressPerSub.remove(subId);
+ }
return;
}
- if (shouldHandleErrorResponse(e, subId)) {
- logd("handleCmdStartQueryEntitlement: handle response.");
- return;
+ if (isPermanentError(e)) {
+ logd("StartQuery: shouldPermanentError.");
+ queryCompleted(subId);
+ continue;
+ } else if (isRetryAfterError(e)) {
+ long retryAfterSeconds = parseSecondsFromRetryAfter(e.getRetryAfter());
+ logd("StartQuery: next retry will be in " + TimeUnit.SECONDS.toMillis(
+ retryAfterSeconds) + " sec");
+ sendMessageDelayed(obtainMessage(CMD_RETRY_QUERY_ENTITLEMENT, subId, 0),
+ TimeUnit.SECONDS.toMillis(retryAfterSeconds));
+ stopExponentialBackoff(subId);
+ continue;
+ } else {
+ startExponentialBackoff(subId);
+ continue;
}
- startExponentialBackoff(subId);
- return;
}
queryCompleted(subId);
}
@@ -267,9 +311,12 @@
* query. */
private void resetEntitlementQueryCounts(String event) {
logd("resetEntitlementQueryCounts: " + event);
- mLastQueryTimePerSub = new HashMap<>();
- mExponentialBackoffPerSub = new HashMap<>();
- mRetryCountPerSub = new HashMap<>();
+ synchronized (mLock) {
+ mLastQueryTimePerSub = new HashMap<>();
+ mExponentialBackoffPerSub = new HashMap<>();
+ mRetryCountPerSub = new HashMap<>();
+ mIsEntitlementInProgressPerSub = new HashMap<>();
+ }
}
/**
@@ -283,65 +330,83 @@
* MAX_RETRY_COUNT is reached using the ExponentialBackoff.
*/
private void handleCmdRetryQueryEntitlement(int subId) {
- logd("handleCmdRetryQueryEntitlement: " + subId);
+ if (!shouldRetryQueryEntitlement(subId)) {
+ return;
+ }
try {
synchronized (mLock) {
- mSatelliteEntitlementResultPerSub.put(subId, getSatelliteEntitlementApi(
- subId).checkEntitlementStatus());
+ int currentRetryCount = getRetryCount(subId);
+ mRetryCountPerSub.put(subId, currentRetryCount + 1);
+ logd("[" + subId + "] retry cnt:" + getRetryCount(subId));
+ SatelliteEntitlementResult entitlementResult = getSatelliteEntitlementApi(
+ subId).checkEntitlementStatus();
+ mSatelliteEntitlementResultPerSub.put(subId, entitlementResult);
+ mEntitlementMetricsStats.reportSuccess(subId,
+ getEntitlementStatus(entitlementResult), true);
}
} catch (ServiceEntitlementException e) {
+ loge(e.toString());
+ mEntitlementMetricsStats.reportError(subId, e.getErrorCode(), true);
+ if (!isRetryAvailable(subId)) {
+ logd("retryQuery: unavailable.");
+ queryCompleted(subId);
+ return;
+ }
if (!isInternetConnected()) {
- logd("retryQuery: Internet disconnected. reset the retry and after the "
- + "internet is connected then the first query is triggered." + e);
+ logd("retryQuery: Internet disconnected.");
stopExponentialBackoff(subId);
+ synchronized (mLock) {
+ mIsEntitlementInProgressPerSub.remove(subId);
+ }
return;
}
- if (shouldHandleErrorResponse(e, subId)) {
- logd("retryQuery: handle response.");
+ if (isPermanentError(e)) {
+ logd("retryQuery: shouldPermanentError.");
+ queryCompleted(subId);
+ return;
+ } else if (isRetryAfterError(e)) {
+ long retryAfterSeconds = parseSecondsFromRetryAfter(e.getRetryAfter());
+ logd("retryQuery: next retry will be in " + TimeUnit.SECONDS.toMillis(
+ retryAfterSeconds) + " sec");
+ sendMessageDelayed(obtainMessage(CMD_RETRY_QUERY_ENTITLEMENT, subId, 0),
+ TimeUnit.SECONDS.toMillis(retryAfterSeconds));
stopExponentialBackoff(subId);
return;
+ } else {
+ ExponentialBackoff exponentialBackoff = null;
+ synchronized (mLock) {
+ exponentialBackoff = mExponentialBackoffPerSub.get(subId);
+ }
+ if (exponentialBackoff == null) {
+ startExponentialBackoff(subId);
+ } else {
+ exponentialBackoff.notifyFailed();
+ logd("retryQuery: The next retry will be in "
+ + exponentialBackoff.getCurrentDelay() + " ms.");
+ }
+ return;
}
- mExponentialBackoffPerSub.get(subId).notifyFailed();
- mRetryCountPerSub.put(subId,
- mRetryCountPerSub.getOrDefault(subId, 0) + 1);
- logd("handleCmdRetryQueryEntitlement:" + e + "[" + subId + "] cnt="
- + mRetryCountPerSub.getOrDefault(subId, 0) + "] Retrying in "
- + mExponentialBackoffPerSub.get(subId).getCurrentDelay() + " ms.");
}
+ queryCompleted(subId);
}
- /** Only handle '500' and '503 with retry-after header' error responses received.
- * If the 500 response is received, no retry until the next trigger event occurs.
- * If the 503 response with Retry-After header, retry is attempted according to the value in the
- * Retry-After header up to MAX_RETRY_COUNT.
- * In other cases, it performs an exponential backoff process. */
- private boolean shouldHandleErrorResponse(ServiceEntitlementException e, int subId) {
+ // If the 500 response is received, no retry until the next trigger event occurs.
+ private boolean isPermanentError(ServiceEntitlementException e) {
+ return e.getHttpStatus() == HTTP_RESPONSE_500;
+ }
+
+ /** If the 503 response with Retry-After header, retry is attempted according to the value in
+ * the Retry-After header up to MAX_RETRY_COUNT. */
+ private boolean isRetryAfterError(ServiceEntitlementException e) {
int responseCode = e.getHttpStatus();
- logd("shouldHandleErrorResponse: received the " + responseCode);
+ logd("shouldRetryAfterError: received the " + responseCode);
if (responseCode == HTTP_RESPONSE_503 && e.getRetryAfter() != null
&& !e.getRetryAfter().isEmpty()) {
- if (mRetryCountPerSub.getOrDefault(subId, 0) >= MAX_RETRY_COUNT) {
- logd("The 503 retry after reaching the " + MAX_RETRY_COUNT
- + "The retry will not be attempted until the next trigger event.");
- queryCompleted(subId);
- return true;
- }
long retryAfterSeconds = parseSecondsFromRetryAfter(e.getRetryAfter());
if (retryAfterSeconds == -1) {
logd("Unable parsing the retry-after. try to exponential backoff.");
return false;
}
- mRetryCountPerSub.put(subId, mRetryCountPerSub.getOrDefault(subId, 0) + 1);
- logd("[" + subId + "] cnt=" + mRetryCountPerSub.getOrDefault(subId, 0)
- + " Retrying in " + TimeUnit.SECONDS.toMillis(retryAfterSeconds) + " sec");
- Message message = obtainMessage();
- message.what = CMD_RETRY_QUERY_ENTITLEMENT;
- message.arg1 = subId;
- sendMessageDelayed(message, TimeUnit.SECONDS.toMillis(retryAfterSeconds));
- return true;
- } else if (responseCode == HTTP_RESPONSE_500) {
- logd("The retry on the next trigger event.");
- queryCompleted(subId);
return true;
}
return false;
@@ -364,46 +429,34 @@
}
private void startExponentialBackoff(int subId) {
+ ExponentialBackoff exponentialBackoff = null;
stopExponentialBackoff(subId);
- mExponentialBackoffPerSub.put(subId,
- new ExponentialBackoff(INITIAL_DELAY_MILLIS, MAX_DELAY_MILLIS,
- MULTIPLIER, this.getLooper(), () -> {
- synchronized (mLock) {
- if (mSatelliteEntitlementResultPerSub.containsKey(subId)) {
- logd("handleCmdStartQueryEntitlement: get the response "
- + "successfully.");
- mExponentialBackoffPerSub.get(subId).stop();
- queryCompleted(subId);
- return;
+ synchronized (mLock) {
+ mExponentialBackoffPerSub.put(subId,
+ new ExponentialBackoff(INITIAL_DELAY_MILLIS, MAX_DELAY_MILLIS,
+ MULTIPLIER, this.getLooper(), () -> {
+ synchronized (mLock) {
+ sendMessage(obtainMessage(CMD_RETRY_QUERY_ENTITLEMENT, subId, 0));
}
-
- if (mRetryCountPerSub.getOrDefault(subId, 0) >= MAX_RETRY_COUNT) {
- logd("The ExponentialBackoff is stopped after reaching the "
- + MAX_RETRY_COUNT + ". The retry don't attempted until the"
- + " refresh time expires.");
- mExponentialBackoffPerSub.get(subId).stop();
- queryCompleted(subId);
- return;
- }
- if (!mSatelliteEntitlementResultPerSub.containsKey(subId)) {
- handleCmdRetryQueryEntitlement(subId);
- }
- }
- }));
- mExponentialBackoffPerSub.get(subId).start();
- mRetryCountPerSub.put(subId, mRetryCountPerSub.getOrDefault(subId, 0) + 1);
- logd("start ExponentialBackoff [" + mRetryCountPerSub.getOrDefault(subId, 0)
- + "] Retrying in " + mExponentialBackoffPerSub.get(subId).getCurrentDelay()
- + " ms.");
+ }));
+ exponentialBackoff = mExponentialBackoffPerSub.get(subId);
+ }
+ if (exponentialBackoff != null) {
+ exponentialBackoff.start();
+ logd("start ExponentialBackoff, cnt: " + getRetryCount(subId) + ". Retrying in "
+ + exponentialBackoff.getCurrentDelay() + " ms.");
+ }
}
/** If the Internet connection is lost during the ExponentialBackoff, stop the
* ExponentialBackoff and reset it. */
private void stopExponentialBackoff(int subId) {
- if (isExponentialBackoffInProgress(subId)) {
- logd("stopExponentialBackoff: reset ExponentialBackoff");
- mExponentialBackoffPerSub.get(subId).stop();
- mExponentialBackoffPerSub.remove(subId);
+ synchronized (mLock) {
+ if (mExponentialBackoffPerSub.get(subId) != null) {
+ logd("stopExponentialBackoff: reset ExponentialBackoff");
+ mExponentialBackoffPerSub.get(subId).stop();
+ mExponentialBackoffPerSub.remove(subId);
+ }
}
}
@@ -413,10 +466,18 @@
* And then it send a delayed message to trigger the query again after A refresh day has passed.
*/
private void queryCompleted(int subId) {
- if (!mSatelliteEntitlementResultPerSub.containsKey(subId)) {
- logd("queryCompleted: create default SatelliteEntitlementResult");
- mSatelliteEntitlementResultPerSub.put(subId,
- SatelliteEntitlementResult.getDefaultResult());
+ SatelliteEntitlementResult entitlementResult;
+ synchronized (mLock) {
+ if (!mSatelliteEntitlementResultPerSub.containsKey(subId)) {
+ logd("queryCompleted: create default SatelliteEntitlementResult");
+ mSatelliteEntitlementResultPerSub.put(subId,
+ SatelliteEntitlementResult.getDefaultResult());
+ }
+ entitlementResult = mSatelliteEntitlementResultPerSub.get(subId);
+ stopExponentialBackoff(subId);
+ mIsEntitlementInProgressPerSub.remove(subId);
+ logd("reset retry count for refresh query");
+ mRetryCountPerSub.remove(subId);
}
saveLastQueryTime(subId);
@@ -426,36 +487,80 @@
sendMessageDelayed(message, TimeUnit.DAYS.toMillis(
getSatelliteEntitlementStatusRefreshDays(subId)));
logd("queryCompleted: updateSatelliteEntitlementStatus");
- updateSatelliteEntitlementStatus(subId,
- mSatelliteEntitlementResultPerSub.get(subId).getEntitlementStatus()
- == SATELLITE_ENTITLEMENT_STATUS_ENABLED,
- mSatelliteEntitlementResultPerSub.get(subId).getAllowedPLMNList(),
- mSatelliteEntitlementResultPerSub.get(subId).getBarredPLMNList());
- stopExponentialBackoff(subId);
- mRetryCountPerSub.remove(subId);
+ updateSatelliteEntitlementStatus(subId, entitlementResult.getEntitlementStatus() ==
+ SatelliteEntitlementResult.SATELLITE_ENTITLEMENT_STATUS_ENABLED,
+ entitlementResult.getAllowedPLMNList(), entitlementResult.getBarredPLMNList());
}
- /** Check whether there is a saved subId. Returns true if there is a saved subId,
- * otherwise return false.*/
- private boolean isExponentialBackoffInProgress(int subId) {
- return mExponentialBackoffPerSub.containsKey(subId);
+ private boolean shouldStartQueryEntitlement(int subId) {
+ logd("shouldStartQueryEntitlement " + subId);
+ if (!shouldRetryQueryEntitlement(subId)) {
+ return false;
+ }
+
+ synchronized (mLock) {
+ if (mIsEntitlementInProgressPerSub.getOrDefault(subId, false)) {
+ logd("In progress retry");
+ return false;
+ }
+ }
+ return true;
}
- /**
- * Check if the subId can query the entitlement server to get the satellite configuration.
- */
- private boolean shouldQueryEntitlement(int subId) {
+ private boolean shouldRetryQueryEntitlement(int subId) {
if (!isSatelliteEntitlementSupported(subId)) {
logd("Doesn't support entitlement query for satellite.");
+ resetSatelliteEntitlementRestrictedReason(subId);
return false;
}
- if (isExponentialBackoffInProgress(subId)) {
- logd("In progress ExponentialBackoff.");
+ if (!isInternetConnected()) {
+ stopExponentialBackoff(subId);
+ synchronized (mLock) {
+ mIsEntitlementInProgressPerSub.remove(subId);
+ }
+ logd("Internet disconnected");
return false;
}
- return shouldRefreshEntitlementStatus(subId);
+ if (!shouldRefreshEntitlementStatus(subId)) {
+ return false;
+ }
+
+ return isRetryAvailable(subId);
+ }
+
+ // update for removing the satellite entitlement restricted reason
+ private void resetSatelliteEntitlementRestrictedReason(int subId) {
+ SatelliteEntitlementResult previousResult;
+ SatelliteEntitlementResult enabledResult = new SatelliteEntitlementResult(
+ SatelliteEntitlementResult.SATELLITE_ENTITLEMENT_STATUS_ENABLED,
+ new ArrayList<>(), new ArrayList<>());
+ synchronized (mLock) {
+ previousResult = mSatelliteEntitlementResultPerSub.get(subId);
+ }
+ if (previousResult != null && previousResult.getEntitlementStatus()
+ != SatelliteEntitlementResult.SATELLITE_ENTITLEMENT_STATUS_ENABLED) {
+ logd("set enabled status for removing satellite entitlement restricted reason");
+ synchronized (mLock) {
+ mSatelliteEntitlementResultPerSub.put(subId, enabledResult);
+ }
+ updateSatelliteEntitlementStatus(subId, true, enabledResult.getAllowedPLMNList(),
+ enabledResult.getBarredPLMNList());
+ }
+ resetEntitlementQueryPerSubId(subId);
+ }
+
+ private void resetEntitlementQueryPerSubId(int subId) {
+ logd("resetEntitlementQueryPerSubId: " + subId);
+ stopExponentialBackoff(subId);
+ synchronized (mLock) {
+ mLastQueryTimePerSub.remove(subId);
+ mRetryCountPerSub.remove(subId);
+ mIsEntitlementInProgressPerSub.remove(subId);
+ }
+ removeMessages(CMD_RETRY_QUERY_ENTITLEMENT,
+ obtainMessage(CMD_RETRY_QUERY_ENTITLEMENT, subId, 0));
}
/**
@@ -489,7 +594,9 @@
/** If there is a value stored in the cache, it is used. If there is no value stored in the
* cache, it is considered the first query. */
private long getLastQueryTime(int subId) {
- return mLastQueryTimePerSub.getOrDefault(subId, 0L);
+ synchronized (mLock) {
+ return mLastQueryTimePerSub.getOrDefault(subId, 0L);
+ }
}
/** Return the satellite entitlement status refresh days from carrier config. */
@@ -499,6 +606,14 @@
DEFAULT_QUERY_REFRESH_DAYS);
}
+ private boolean isRetryAvailable(int subId) {
+ if (getRetryCount(subId) >= MAX_RETRY_COUNT) {
+ logd("The retry will not be attempted until the next trigger event.");
+ return false;
+ }
+ return true;
+ }
+
/** Return the satellite entitlement supported bool from carrier config. */
private boolean isSatelliteEntitlementSupported(int subId) {
return getConfigForSubId(subId).getBoolean(
@@ -507,11 +622,14 @@
@NonNull
private PersistableBundle getConfigForSubId(int subId) {
- PersistableBundle config = mCarrierConfigManager.getConfigForSubId(subId,
- CarrierConfigManager.ImsServiceEntitlement.KEY_ENTITLEMENT_SERVER_URL_STRING,
- CarrierConfigManager.KEY_SATELLITE_ENTITLEMENT_STATUS_REFRESH_DAYS_INT,
- CarrierConfigManager.KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL,
- CarrierConfigManager.KEY_SATELLITE_ENTITLEMENT_APP_NAME_STRING);
+ PersistableBundle config = null;
+ if (mCarrierConfigManager != null) {
+ config = mCarrierConfigManager.getConfigForSubId(subId,
+ CarrierConfigManager.ImsServiceEntitlement.KEY_ENTITLEMENT_SERVER_URL_STRING,
+ CarrierConfigManager.KEY_SATELLITE_ENTITLEMENT_STATUS_REFRESH_DAYS_INT,
+ CarrierConfigManager.KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL,
+ CarrierConfigManager.KEY_SATELLITE_ENTITLEMENT_APP_NAME_STRING);
+ }
if (config == null || config.isEmpty()) {
config = CarrierConfigManager.getDefaultConfig();
}
@@ -520,7 +638,15 @@
private void saveLastQueryTime(int subId) {
long lastQueryTimeMillis = System.currentTimeMillis();
- mLastQueryTimePerSub.put(subId, lastQueryTimeMillis);
+ synchronized (mLock) {
+ mLastQueryTimePerSub.put(subId, lastQueryTimeMillis);
+ }
+ }
+
+ private int getRetryCount(int subId) {
+ synchronized (mLock) {
+ return mRetryCountPerSub.getOrDefault(subId, 0);
+ }
}
/**
@@ -534,6 +660,31 @@
plmnAllowedList, plmnBarredList, null);
}
+ private @SatelliteConstants.SatelliteEntitlementStatus int getEntitlementStatus(
+ SatelliteEntitlementResult entitlementResult) {
+ switch (entitlementResult.getEntitlementStatus()) {
+ case SatelliteEntitlementResult.SATELLITE_ENTITLEMENT_STATUS_DISABLED:
+ return SatelliteConstants.SATELLITE_ENTITLEMENT_STATUS_DISABLED;
+ case SatelliteEntitlementResult.SATELLITE_ENTITLEMENT_STATUS_ENABLED:
+ return SatelliteConstants.SATELLITE_ENTITLEMENT_STATUS_ENABLED;
+ case SatelliteEntitlementResult.SATELLITE_ENTITLEMENT_STATUS_INCOMPATIBLE:
+ return SatelliteConstants.SATELLITE_ENTITLEMENT_STATUS_INCOMPATIBLE;
+ case SatelliteEntitlementResult.SATELLITE_ENTITLEMENT_STATUS_PROVISIONING:
+ return SatelliteConstants.SATELLITE_ENTITLEMENT_STATUS_PROVISIONING;
+ default:
+ return SatelliteConstants.SATELLITE_ENTITLEMENT_STATUS_UNKNOWN;
+ }
+ }
+
+ private static String cmdToString(int cmd) {
+ switch (cmd) {
+ case CMD_SIM_REFRESH:
+ return "SIM_REFRESH";
+ default:
+ return "UNKNOWN(" + cmd + ")";
+ }
+ }
+
private static void logd(String log) {
Rlog.d(TAG, log);
}
diff --git a/src/com/android/phone/settings/PhoneAccountSettingsActivity.java b/src/com/android/phone/settings/PhoneAccountSettingsActivity.java
index 12cc667..5617a0b 100644
--- a/src/com/android/phone/settings/PhoneAccountSettingsActivity.java
+++ b/src/com/android/phone/settings/PhoneAccountSettingsActivity.java
@@ -20,12 +20,15 @@
import android.os.Bundle;
import android.os.UserManager;
import android.preference.PreferenceActivity;
+import android.util.Log;
import android.view.MenuItem;
import android.widget.Toast;
+import com.android.internal.telephony.flags.Flags;
import com.android.phone.R;
public class PhoneAccountSettingsActivity extends PreferenceActivity {
+ private static final String LOG_TAG = "PhoneAccountSettingsActivity";
@Override
protected void onCreate(Bundle icicle) {
@@ -40,6 +43,17 @@
return;
}
+ // Make sure mobile network configs are not restricted.
+ if (Flags.ensureAccessToCallSettingsIsRestricted() &&
+ userManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)) {
+ Log.i(LOG_TAG, "Mobile network configs are restricted, disabling phone account "
+ + "settings");
+ Toast.makeText(this, R.string.phone_account_no_config_mobile_networks,
+ Toast.LENGTH_SHORT).show();
+ finish();
+ return;
+ }
+
getWindow().addSystemFlags(
android.view.WindowManager.LayoutParams
.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
diff --git a/src/com/android/phone/settings/RadioInfo.java b/src/com/android/phone/settings/RadioInfo.java
index 328087b..24d680c 100644
--- a/src/com/android/phone/settings/RadioInfo.java
+++ b/src/com/android/phone/settings/RadioInfo.java
@@ -20,8 +20,8 @@
import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import android.annotation.NonNull;
import android.content.ComponentName;
-import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.ComponentInfo;
@@ -29,7 +29,6 @@
import android.content.pm.ResolveInfo;
import android.content.res.Resources;
import android.graphics.Typeface;
-import android.hardware.radio.modem.ImeiInfo;
import android.net.ConnectivityManager;
import android.net.Network;
import android.net.NetworkCapabilities;
@@ -41,9 +40,11 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.HandlerExecutor;
+import android.os.HandlerThread;
import android.os.Message;
import android.os.PersistableBundle;
import android.os.SystemProperties;
+import android.os.UserHandle;
import android.os.UserManager;
import android.telephony.AccessNetworkConstants;
import android.telephony.CarrierConfigManager;
@@ -58,6 +59,7 @@
import android.telephony.CellInfoLte;
import android.telephony.CellInfoNr;
import android.telephony.CellInfoWcdma;
+import android.telephony.CellSignalStrength;
import android.telephony.CellSignalStrengthCdma;
import android.telephony.CellSignalStrengthGsm;
import android.telephony.CellSignalStrengthLte;
@@ -67,6 +69,7 @@
import android.telephony.NetworkRegistrationInfo;
import android.telephony.PhysicalChannelConfig;
import android.telephony.RadioAccessFamily;
+import android.telephony.RadioAccessSpecifier;
import android.telephony.ServiceState;
import android.telephony.SignalStrength;
import android.telephony.SubscriptionManager;
@@ -82,6 +85,8 @@
import android.telephony.ims.ProvisioningManager;
import android.telephony.ims.feature.MmTelFeature;
import android.telephony.ims.stub.ImsRegistrationImplBase;
+import android.telephony.satellite.EnableRequestAttributes;
+import android.telephony.satellite.SatelliteManager;
import android.text.TextUtils;
import android.util.Log;
import android.view.Menu;
@@ -104,20 +109,26 @@
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneFactory;
+import com.android.internal.telephony.RILConstants;
import com.android.internal.telephony.euicc.EuiccConnector;
-import com.android.internal.telephony.util.TelephonyUtils;
import com.android.phone.R;
import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
+import java.util.Locale;
import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
/**
* Radio Information Class
@@ -168,7 +179,37 @@
"Unknown"
};
- private static String[] sPhoneIndexLabels;
+ private static final Integer[] SIGNAL_STRENGTH_LEVEL = new Integer[] {
+ -1 /*clear mock*/,
+ CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN,
+ CellSignalStrength.SIGNAL_STRENGTH_POOR,
+ CellSignalStrength.SIGNAL_STRENGTH_MODERATE,
+ CellSignalStrength.SIGNAL_STRENGTH_GOOD,
+ CellSignalStrength.SIGNAL_STRENGTH_GREAT
+ };
+ private static final Integer[] MOCK_DATA_NETWORK_TYPE = new Integer[] {
+ -1 /*clear mock*/,
+ ServiceState.RIL_RADIO_TECHNOLOGY_GPRS,
+ ServiceState.RIL_RADIO_TECHNOLOGY_EDGE,
+ ServiceState.RIL_RADIO_TECHNOLOGY_UMTS,
+ ServiceState.RIL_RADIO_TECHNOLOGY_IS95A,
+ ServiceState.RIL_RADIO_TECHNOLOGY_IS95B,
+ ServiceState.RIL_RADIO_TECHNOLOGY_1xRTT,
+ ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_0,
+ ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_A,
+ ServiceState.RIL_RADIO_TECHNOLOGY_HSDPA,
+ ServiceState.RIL_RADIO_TECHNOLOGY_HSUPA,
+ ServiceState.RIL_RADIO_TECHNOLOGY_HSPA,
+ ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_B,
+ ServiceState.RIL_RADIO_TECHNOLOGY_EHRPD,
+ ServiceState.RIL_RADIO_TECHNOLOGY_LTE,
+ ServiceState.RIL_RADIO_TECHNOLOGY_HSPAP,
+ ServiceState.RIL_RADIO_TECHNOLOGY_GSM,
+ ServiceState.RIL_RADIO_TECHNOLOGY_TD_SCDMA,
+ ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA,
+ ServiceState.RIL_RADIO_TECHNOLOGY_NR
+ };
+ private static String[] sPhoneIndexLabels = new String[0];
private static final int sCellInfoListRateDisabled = Integer.MAX_VALUE;
private static final int sCellInfoListRateMax = 0;
@@ -212,7 +253,6 @@
private static final int EVENT_QUERY_SMSC_DONE = 1005;
private static final int EVENT_UPDATE_SMSC_DONE = 1006;
- private static final int EVENT_PHYSICAL_CHANNEL_CONFIG_CHANGED = 1007;
private static final int EVENT_UPDATE_NR_STATS = 1008;
private static final int MENU_ITEM_VIEW_ADN = 1;
@@ -255,7 +295,6 @@
private TextView mPingHostnameV6;
private TextView mHttpClientTest;
private TextView mPhyChanConfig;
- private TextView mDnsCheckState;
private TextView mDownlinkKbps;
private TextView mUplinkKbps;
private TextView mEndcAvailable;
@@ -268,14 +307,17 @@
private EditText mSmsc;
private Switch mRadioPowerOnSwitch;
private Switch mSimulateOutOfServiceSwitch;
+ private Switch mEnforceSatelliteChannel;
private Switch mMockSatellite;
- private Button mDnsCheckToggleButton;
private Button mPingTestButton;
private Button mUpdateSmscButton;
private Button mRefreshSmscButton;
private Button mOemInfoButton;
private Button mCarrierProvisioningButton;
private Button mTriggerCarrierProvisioningButton;
+ private Button mEsosButton;
+ private Button mSatelliteEnableNonEmergencyModeButton;
+ private Button mEsosDemoButton;
private Switch mImsVolteProvisionedSwitch;
private Switch mImsVtProvisionedSwitch;
private Switch mImsWfcProvisionedSwitch;
@@ -284,6 +326,9 @@
private Switch mDsdsSwitch;
private Switch mRemovableEsimSwitch;
private Spinner mPreferredNetworkType;
+ private Spinner mMockSignalStrength;
+ private Spinner mMockDataNetworkType;
+
private Spinner mSelectPhoneIndex;
private Spinner mCellInfoRefreshRateSpinner;
@@ -304,14 +349,29 @@
private boolean mMwiValue = false;
private boolean mCfiValue = false;
+ private boolean mSystemUser = true;
+
private final PersistableBundle[] mCarrierSatelliteOriginalBundle = new PersistableBundle[2];
+ private final PersistableBundle[] mOriginalSystemChannels = new PersistableBundle[2];
private List<CellInfo> mCellInfoResult = null;
private final boolean[] mSimulateOos = new boolean[2];
+ private int[] mSelectedSignalStrengthIndex = new int[2];
+ private int[] mSelectedMockDataNetworkTypeIndex = new int[2];
private String mEuiccInfoResult = "";
private int mPreferredNetworkTypeResult;
private int mCellInfoRefreshRateIndex;
- private int mSelectedPhoneIndex;
+ private int mPhoneId = SubscriptionManager.INVALID_PHONE_INDEX;
+ private static final int DEFAULT_PHONE_ID = 0;
+
+ private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+
+ private String mActionEsos;
+ private String mActionEsosDemo;
+
+ private TelephonyDisplayInfo mDisplayInfo;
+
+ private List<PhysicalChannelConfig> mPhysicalChannelConfigs = new ArrayList<>();
private final NetworkRequest mDefaultNetworkRequest = new NetworkRequest.Builder()
.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
@@ -339,6 +399,7 @@
TelephonyCallback.CellInfoListener,
TelephonyCallback.SignalStrengthsListener,
TelephonyCallback.ServiceStateListener,
+ TelephonyCallback.PhysicalChannelConfigListener,
TelephonyCallback.DisplayInfoListener {
@Override
@@ -403,16 +464,23 @@
@Override
public void onDisplayInfoChanged(TelephonyDisplayInfo displayInfo) {
+ mDisplayInfo = displayInfo;
updateNetworkType();
}
+
+ @Override
+ public void onPhysicalChannelConfigChanged(@NonNull List<PhysicalChannelConfig> configs) {
+ updatePhysicalChannelConfiguration(configs);
+ }
}
private void updatePhysicalChannelConfiguration(List<PhysicalChannelConfig> configs) {
+ mPhysicalChannelConfigs = configs;
StringBuilder sb = new StringBuilder();
String div = "";
sb.append("{");
- if (configs != null) {
- for (PhysicalChannelConfig c : configs) {
+ if (mPhysicalChannelConfigs != null) {
+ for (PhysicalChannelConfig c : mPhysicalChannelConfigs) {
sb.append(div).append(c);
div = ",";
}
@@ -431,24 +499,21 @@
mPreferredNetworkType.setSelection(mPreferredNetworkTypeResult, true);
}
- private void updatePhoneIndex(int phoneIndex, int subId) {
+ private void updatePhoneIndex() {
// unregister listeners on the old subId
unregisterPhoneStateListener();
- mTelephonyManager.setCellInfoListRate(sCellInfoListRateDisabled, mPhone.getSubId());
-
- if (phoneIndex == SubscriptionManager.INVALID_PHONE_INDEX) {
- log("Invalid phone index " + phoneIndex + ", subscription ID " + subId);
- return;
- }
+ mTelephonyManager.setCellInfoListRate(sCellInfoListRateDisabled, mSubId);
// update the subId
- mTelephonyManager = mTelephonyManager.createForSubscriptionId(subId);
+ mTelephonyManager = mTelephonyManager.createForSubscriptionId(mSubId);
// update the phoneId
- mPhone = PhoneFactory.getPhone(phoneIndex);
- mImsManager = new ImsManager(mPhone.getContext());
+ if (mSystemUser) {
+ mPhone = PhoneFactory.getPhone(mPhoneId);
+ }
+ mImsManager = new ImsManager(this);
try {
- mProvisioningManager = ProvisioningManager.createForSubscriptionId(subId);
+ mProvisioningManager = ProvisioningManager.createForSubscriptionId(mSubId);
} catch (IllegalArgumentException e) {
log("updatePhoneIndex : IllegalArgumentException " + e.getMessage());
mProvisioningManager = null;
@@ -477,13 +542,6 @@
mSmsc.setText("update error");
}
break;
- case EVENT_PHYSICAL_CHANNEL_CONFIG_CHANGED:
- ar = (AsyncResult) msg.obj;
- if (ar.exception != null) {
- mPhyChanConfig.setText(("update error"));
- }
- updatePhysicalChannelConfiguration((List<PhysicalChannelConfig>) ar.result);
- break;
case EVENT_UPDATE_NR_STATS:
log("got EVENT_UPDATE_NR_STATS");
updateNrStats();
@@ -499,14 +557,9 @@
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
- if (!android.os.Process.myUserHandle().isSystem()) {
- Log.e(TAG, "Not run from system user, don't do anything.");
- finish();
- return;
- }
-
- UserManager userManager =
- (UserManager) getApplicationContext().getSystemService(Context.USER_SERVICE);
+ mSystemUser = android.os.Process.myUserHandle().isSystem();
+ log("onCreate: mSystemUser=" + mSystemUser);
+ UserManager userManager = getSystemService(UserManager.class);
if (userManager != null
&& userManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)) {
Log.w(TAG, "User is restricted from configuring mobile networks.");
@@ -515,20 +568,39 @@
}
setContentView(R.layout.radio_info);
+ Resources r = getResources();
+ mActionEsos =
+ r.getString(
+ com.android.internal.R.string
+ .config_satellite_test_with_esp_replies_intent_action);
- log("Started onCreate");
+ mActionEsosDemo =
+ r.getString(
+ com.android.internal.R.string.config_satellite_demo_mode_sos_intent_action);
mQueuedWork = new ThreadPoolExecutor(1, 1, RUNNABLE_TIMEOUT_MS, TimeUnit.MICROSECONDS,
- new LinkedBlockingDeque<Runnable>());
- mConnectivityManager = (ConnectivityManager) getSystemService(CONNECTIVITY_SERVICE);
- mPhone = getPhone(SubscriptionManager.getDefaultSubscriptionId());
- mTelephonyManager = ((TelephonyManager) getSystemService(TELEPHONY_SERVICE))
- .createForSubscriptionId(mPhone.getSubId());
+ new LinkedBlockingDeque<>());
+ mConnectivityManager = getSystemService(ConnectivityManager.class);
+ if (mSystemUser) {
+ mPhone = getPhone(SubscriptionManager.getDefaultSubscriptionId());
+ }
+ mSubId = SubscriptionManager.getDefaultSubscriptionId();
+ if (mPhone != null) {
+ mPhoneId = mPhone.getPhoneId();
+ } else {
+ mPhoneId = SubscriptionManager.getPhoneId(mSubId);
+ }
+ if (!SubscriptionManager.isValidPhoneId(mPhoneId)) {
+ mPhoneId = DEFAULT_PHONE_ID;
+ }
+
+ mTelephonyManager = getSystemService(TelephonyManager.class)
+ .createForSubscriptionId(mSubId);
mEuiccManager = getSystemService(EuiccManager.class);
- mImsManager = new ImsManager(mPhone.getContext());
+ mImsManager = new ImsManager(this);
try {
- mProvisioningManager = ProvisioningManager.createForSubscriptionId(mPhone.getSubId());
+ mProvisioningManager = ProvisioningManager.createForSubscriptionId(mSubId);
} catch (IllegalArgumentException e) {
log("onCreate : IllegalArgumentException " + e.getMessage());
mProvisioningManager = null;
@@ -561,7 +633,6 @@
mSent = (TextView) findViewById(R.id.sent);
mReceived = (TextView) findViewById(R.id.received);
mSmsc = (EditText) findViewById(R.id.smsc);
- mDnsCheckState = (TextView) findViewById(R.id.dnsCheckState);
mPingHostnameV4 = (TextView) findViewById(R.id.pingHostnameV4);
mPingHostnameV6 = (TextView) findViewById(R.id.pingHostnameV6);
mHttpClientTest = (TextView) findViewById(R.id.httpClientTest);
@@ -587,6 +658,33 @@
.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
mPreferredNetworkType.setAdapter(mPreferredNetworkTypeAdapter);
+ mMockSignalStrength = (Spinner) findViewById(R.id.signalStrength);
+ if (!Build.isDebuggable() || !mSystemUser) {
+ mMockSignalStrength.setVisibility(View.GONE);
+ findViewById(R.id.signalStrength).setVisibility(View.GONE);
+ findViewById(R.id.signal_strength_label).setVisibility(View.GONE);
+ } else {
+ ArrayAdapter<Integer> mSignalStrengthAdapter = new ArrayAdapter<>(this,
+ android.R.layout.simple_spinner_item, SIGNAL_STRENGTH_LEVEL);
+ mSignalStrengthAdapter
+ .setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+ mMockSignalStrength.setAdapter(mSignalStrengthAdapter);
+ }
+
+ mMockDataNetworkType = (Spinner) findViewById(R.id.dataNetworkType);
+ if (!Build.isDebuggable() || !mSystemUser) {
+ mMockDataNetworkType.setVisibility(View.GONE);
+ findViewById(R.id.dataNetworkType).setVisibility(View.GONE);
+ findViewById(R.id.data_network_type_label).setVisibility(View.GONE);
+ } else {
+ ArrayAdapter<String> mNetworkTypeAdapter = new ArrayAdapter<>(this,
+ android.R.layout.simple_spinner_item, Arrays.stream(MOCK_DATA_NETWORK_TYPE)
+ .map(ServiceState::rilRadioTechnologyToString).toArray(String[]::new));
+ mNetworkTypeAdapter
+ .setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+ mMockDataNetworkType.setAdapter(mNetworkTypeAdapter);
+ }
+
mSelectPhoneIndex = (Spinner) findViewById(R.id.phoneIndex);
ArrayAdapter<String> phoneIndexAdapter = new ArrayAdapter<String>(this,
android.R.layout.simple_spinner_item, sPhoneIndexLabels);
@@ -604,7 +702,7 @@
mImsWfcProvisionedSwitch = (Switch) findViewById(R.id.wfc_provisioned_switch);
mEabProvisionedSwitch = (Switch) findViewById(R.id.eab_provisioned_switch);
- if (!isImsSupportedOnDevice(mPhone.getContext())) {
+ if (!isImsSupportedOnDevice()) {
mImsVolteProvisionedSwitch.setVisibility(View.GONE);
mImsVtProvisionedSwitch.setVisibility(View.GONE);
mImsWfcProvisionedSwitch.setVisibility(View.GONE);
@@ -641,13 +739,15 @@
mRadioPowerOnSwitch = (Switch) findViewById(R.id.radio_power);
mSimulateOutOfServiceSwitch = (Switch) findViewById(R.id.simulate_out_of_service);
- if (!TelephonyUtils.IS_DEBUGGABLE) {
+ if (!Build.isDebuggable()) {
mSimulateOutOfServiceSwitch.setVisibility(View.GONE);
}
mMockSatellite = (Switch) findViewById(R.id.mock_carrier_roaming_satellite);
- if (!TelephonyUtils.IS_DEBUGGABLE) {
+ mEnforceSatelliteChannel = (Switch) findViewById(R.id.enforce_satellite_channel);
+ if (!Build.isDebuggable()) {
mMockSatellite.setVisibility(View.GONE);
+ mEnforceSatelliteChannel.setVisibility(View.GONE);
}
mDownlinkKbps = (TextView) findViewById(R.id.dl_kbps);
@@ -660,8 +760,12 @@
mUpdateSmscButton.setOnClickListener(mUpdateSmscButtonHandler);
mRefreshSmscButton = (Button) findViewById(R.id.refresh_smsc);
mRefreshSmscButton.setOnClickListener(mRefreshSmscButtonHandler);
- mDnsCheckToggleButton = (Button) findViewById(R.id.dns_check_toggle);
- mDnsCheckToggleButton.setOnClickListener(mDnsCheckButtonHandler);
+ if (!mSystemUser) {
+ mSmsc.setVisibility(View.GONE);
+ mUpdateSmscButton.setVisibility(View.GONE);
+ mRefreshSmscButton.setVisibility(View.GONE);
+ findViewById(R.id.smsc_label).setVisibility(View.GONE);
+ }
mCarrierProvisioningButton = (Button) findViewById(R.id.carrier_provisioning);
if (!TextUtils.isEmpty(getCarrierProvisioningAppString())) {
mCarrierProvisioningButton.setOnClickListener(mCarrierProvisioningButtonHandler);
@@ -678,6 +782,39 @@
mTriggerCarrierProvisioningButton.setEnabled(false);
}
+ mEsosButton = (Button) findViewById(R.id.esos_questionnaire);
+ mEsosDemoButton = (Button) findViewById(R.id.demo_esos_questionnaire);
+ mSatelliteEnableNonEmergencyModeButton = (Button) findViewById(
+ R.id.satellite_enable_non_emergency_mode);
+ CarrierConfigManager cm = getSystemService(CarrierConfigManager.class);
+ if (!cm.getConfigForSubId(mSubId,
+ CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL)
+ .getBoolean(CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL)) {
+ mSatelliteEnableNonEmergencyModeButton.setVisibility(View.GONE);
+ }
+ if (!Build.isDebuggable()) {
+ if (!TextUtils.isEmpty(mActionEsos)) {
+ mEsosButton.setVisibility(View.GONE);
+ }
+ if (!TextUtils.isEmpty(mActionEsosDemo)) {
+ mEsosDemoButton.setVisibility(View.GONE);
+ }
+ mSatelliteEnableNonEmergencyModeButton.setVisibility(View.GONE);
+ } else {
+ mEsosButton.setOnClickListener(v -> startActivityAsUser(
+ new Intent(mActionEsos).addFlags(
+ Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK),
+ UserHandle.CURRENT)
+ );
+ mEsosDemoButton.setOnClickListener(v -> startActivityAsUser(
+ new Intent(mActionEsosDemo).addFlags(
+ Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK),
+ UserHandle.CURRENT)
+ );
+ mSatelliteEnableNonEmergencyModeButton.setOnClickListener(v ->
+ enableSatelliteNonEmergencyMode());
+ }
+
mOemInfoButton = (Button) findViewById(R.id.oem_info);
mOemInfoButton.setOnClickListener(mOemInfoButtonHandler);
PackageManager pm = getPackageManager();
@@ -689,7 +826,6 @@
mCellInfoRefreshRateIndex = 0; //disabled
mPreferredNetworkTypeResult = PREFERRED_NETWORK_LABELS.length - 1; //Unknown
- mSelectedPhoneIndex = mPhone.getPhoneId();
new Thread(() -> {
int networkType = (int) mTelephonyManager.getPreferredNetworkTypeBitmask();
@@ -727,7 +863,6 @@
updateRadioPowerState();
updateImsProvisionedState();
updateProperties();
- updateDnsCheckState();
updateNetworkType();
updateNrStats();
updateEuiccInfo();
@@ -744,7 +879,7 @@
mCellInfoRefreshRateSpinner.setSelection(mCellInfoRefreshRateIndex);
// Request cell information update from RIL.
mTelephonyManager.setCellInfoListRate(CELL_INFO_REFRESH_RATES[mCellInfoRefreshRateIndex],
- mPhone.getSubId());
+ mSubId);
//set selection before registering to prevent update
mPreferredNetworkType.setSelection(mPreferredNetworkTypeResult, true);
@@ -756,15 +891,25 @@
RadioAccessFamily.getNetworkTypeFromRaf(networkType)));
}).start();
+ // mock signal strength
+ mMockSignalStrength.setSelection(mSelectedSignalStrengthIndex[mPhoneId]);
+ mMockSignalStrength.setOnItemSelectedListener(mOnMockSignalStrengthSelectedListener);
+
+ // mock data network type
+ mMockDataNetworkType.setSelection(mSelectedMockDataNetworkTypeIndex[mPhoneId]);
+ mMockDataNetworkType.setOnItemSelectedListener(mOnMockDataNetworkTypeSelectedListener);
+
// set phone index
- mSelectPhoneIndex.setSelection(mSelectedPhoneIndex, true);
+ mSelectPhoneIndex.setSelection(mPhoneId, true);
mSelectPhoneIndex.setOnItemSelectedListener(mSelectPhoneIndexHandler);
mRadioPowerOnSwitch.setOnCheckedChangeListener(mRadioPowerOnChangeListener);
- mSimulateOutOfServiceSwitch.setChecked(mSimulateOos[mPhone.getPhoneId()]);
+ mSimulateOutOfServiceSwitch.setChecked(mSimulateOos[mPhoneId]);
mSimulateOutOfServiceSwitch.setOnCheckedChangeListener(mSimulateOosOnChangeListener);
- mMockSatellite.setChecked(mCarrierSatelliteOriginalBundle[mPhone.getPhoneId()] != null);
+ mMockSatellite.setChecked(mCarrierSatelliteOriginalBundle[mPhoneId] != null);
mMockSatellite.setOnCheckedChangeListener(mMockSatelliteListener);
+ updateSatelliteChannelDisplay(mPhoneId);
+ mEnforceSatelliteChannel.setOnCheckedChangeListener(mForceSatelliteChannelOnChangeListener);
mImsVolteProvisionedSwitch.setOnCheckedChangeListener(mImsVolteCheckedChangeListener);
mImsVtProvisionedSwitch.setOnCheckedChangeListener(mImsVtCheckedChangeListener);
mImsWfcProvisionedSwitch.setOnCheckedChangeListener(mImsWfcCheckedChangeListener);
@@ -777,9 +922,6 @@
unregisterPhoneStateListener();
registerPhoneStateListener();
- mPhone.registerForPhysicalChannelConfig(mHandler,
- EVENT_PHYSICAL_CHANNEL_CONFIG_CHANGED, null);
-
mConnectivityManager.registerNetworkCallback(
mDefaultNetworkRequest, mNetworkCallback, mHandler);
@@ -793,7 +935,7 @@
log("onPause: unregister phone & data intents");
mTelephonyManager.unregisterTelephonyCallback(mTelephonyCallback);
- mTelephonyManager.setCellInfoListRate(sCellInfoListRateDisabled, mPhone.getSubId());
+ mTelephonyManager.setCellInfoListRate(sCellInfoListRateDisabled, mSubId);
mConnectivityManager.unregisterNetworkCallback(mNetworkCallback);
}
@@ -814,7 +956,8 @@
mPreferredNetworkTypeResult = b.getInt("mPreferredNetworkTypeResult",
PREFERRED_NETWORK_LABELS.length - 1);
- mSelectedPhoneIndex = b.getInt("mSelectedPhoneIndex", 0);
+ mPhoneId = b.getInt("mSelectedPhoneIndex", 0);
+ mSubId = SubscriptionManager.getSubscriptionId(mPhoneId);
mCellInfoRefreshRateIndex = b.getInt("mCellInfoRefreshRateIndex", 0);
}
@@ -827,7 +970,7 @@
outState.putString("mHttpClientTestResult", mHttpClientTestResult);
outState.putInt("mPreferredNetworkTypeResult", mPreferredNetworkTypeResult);
- outState.putInt("mSelectedPhoneIndex", mSelectedPhoneIndex);
+ outState.putInt("mSelectedPhoneIndex", mPhoneId);
outState.putInt("mCellInfoRefreshRateIndex", mCellInfoRefreshRateIndex);
}
@@ -841,7 +984,7 @@
R.string.radioInfo_menu_viewFDN).setOnMenuItemClickListener(mViewFDNCallback);
menu.add(1, MENU_ITEM_VIEW_SDN, 0,
R.string.radioInfo_menu_viewSDN).setOnMenuItemClickListener(mViewSDNCallback);
- if (isImsSupportedOnDevice(mPhone.getContext())) {
+ if (isImsSupportedOnDevice()) {
menu.add(1, MENU_ITEM_GET_IMS_STATUS,
0, R.string.radioInfo_menu_getIMS).setOnMenuItemClickListener(mGetImsStatus);
}
@@ -876,6 +1019,7 @@
@Override
protected void onDestroy() {
+ log("onDestroy");
clearOverride();
super.onDestroy();
if (mQueuedWork != null) {
@@ -884,11 +1028,22 @@
}
private void clearOverride() {
- if (mSimulateOutOfServiceSwitch.isChecked()) {
- mSimulateOosOnChangeListener.onCheckedChanged(mSimulateOutOfServiceSwitch, false);
- }
- if (mMockSatellite.isChecked()) {
- mMockSatelliteListener.onCheckedChanged(mMockSatellite, false);
+ for (int phoneId = 0; phoneId < sPhoneIndexLabels.length; phoneId++) {
+ if (mSystemUser) {
+ mPhone = PhoneFactory.getPhone(phoneId);
+ }
+ if (mSimulateOos[mPhoneId]) {
+ mSimulateOosOnChangeListener.onCheckedChanged(mSimulateOutOfServiceSwitch, false);
+ }
+ if (mCarrierSatelliteOriginalBundle[mPhoneId] != null) {
+ mMockSatelliteListener.onCheckedChanged(mMockSatellite, false);
+ }
+ if (mSelectedSignalStrengthIndex[mPhoneId] > 0) {
+ mOnMockSignalStrengthSelectedListener.onItemSelected(null, null, 0/*pos*/, 0);
+ }
+ if (mSelectedMockDataNetworkTypeIndex[mPhoneId] > 0) {
+ mOnMockDataNetworkTypeSelectedListener.onItemSelected(null, null, 0/*pos*/, 0);
+ }
}
}
@@ -905,7 +1060,6 @@
private void unregisterPhoneStateListener() {
mTelephonyManager.unregisterTelephonyCallback(mTelephonyCallback);
- mPhone.unregisterForPhysicalChannelConfig(mHandler);
// clear all fields so they are blank until the next listener event occurs
mOperatorName.setText("");
@@ -928,6 +1082,8 @@
mGsmState.setText("");
mRoamingState.setText("");
mPhyChanConfig.setText("");
+ mDownlinkKbps.setText("");
+ mUplinkKbps.setText("");
}
// register mTelephonyCallback for relevant fields using the current TelephonyManager
@@ -952,12 +1108,6 @@
mNetworkSlicingConfig.setVisibility(visibility);
}
- private void updateDnsCheckState() {
- //FIXME: Replace with a TelephonyManager call
- mDnsCheckState.setText(mPhone.isDnsCheckDisabled()
- ? "0.0.0.0 allowed" : "0.0.0.0 not allowed");
- }
-
private void updateBandwidths(int dlbw, int ulbw) {
dlbw = (dlbw < 0 || dlbw == Integer.MAX_VALUE) ? -1 : dlbw;
ulbw = (ulbw < 0 || ulbw == Integer.MAX_VALUE) ? -1 : ulbw;
@@ -1164,7 +1314,7 @@
}
private void updateSubscriptionIds() {
- mSubscriptionId.setText(Integer.toString(mPhone.getSubId()));
+ mSubscriptionId.setText(String.format(Locale.ROOT, "%d", mSubId));
mDds.setText(Integer.toString(SubscriptionManager.getDefaultDataSubscriptionId()));
}
@@ -1178,6 +1328,12 @@
private void updateServiceState(ServiceState serviceState) {
+ if (!SubscriptionManager.isValidSubscriptionId(mSubId)) {
+ // When SIM is absent, we can't listen service state change from absent slot. Need
+ // explicitly get service state from the specific slot.
+ serviceState = mTelephonyManager.getServiceStateForSlot(mPhoneId);
+ }
+ log("Update service state " + serviceState);
int state = serviceState.getState();
Resources r = getResources();
String display = r.getString(R.string.radioInfo_unknown);
@@ -1232,32 +1388,40 @@
Resources r = getResources();
String display = r.getString(R.string.radioInfo_unknown);
- switch (state) {
- case TelephonyManager.DATA_CONNECTED:
- display = r.getString(R.string.radioInfo_data_connected);
- break;
- case TelephonyManager.DATA_CONNECTING:
- display = r.getString(R.string.radioInfo_data_connecting);
- break;
- case TelephonyManager.DATA_DISCONNECTED:
- display = r.getString(R.string.radioInfo_data_disconnected);
- break;
- case TelephonyManager.DATA_SUSPENDED:
- display = r.getString(R.string.radioInfo_data_suspended);
- break;
+ if (SubscriptionManager.isValidSubscriptionId(mSubId)) {
+ switch (state) {
+ case TelephonyManager.DATA_CONNECTED:
+ display = r.getString(R.string.radioInfo_data_connected);
+ break;
+ case TelephonyManager.DATA_CONNECTING:
+ display = r.getString(R.string.radioInfo_data_connecting);
+ break;
+ case TelephonyManager.DATA_DISCONNECTED:
+ display = r.getString(R.string.radioInfo_data_disconnected);
+ break;
+ case TelephonyManager.DATA_SUSPENDED:
+ display = r.getString(R.string.radioInfo_data_suspended);
+ break;
+ }
+ } else {
+ display = r.getString(R.string.radioInfo_data_disconnected);
}
mGprsState.setText(display);
}
private void updateNetworkType() {
- if (mPhone != null) {
+ if (SubscriptionManager.isValidPhoneId(mPhoneId)) {
mDataNetwork.setText(ServiceState.rilRadioTechnologyToString(
- mPhone.getServiceState().getRilDataRadioTechnology()));
+ mTelephonyManager.getServiceStateForSlot(mPhoneId)
+ .getRilDataRadioTechnology()));
mVoiceNetwork.setText(ServiceState.rilRadioTechnologyToString(
- mPhone.getServiceState().getRilVoiceRadioTechnology()));
- int overrideNetwork = mPhone.getDisplayInfoController().getTelephonyDisplayInfo()
- .getOverrideNetworkType();
+ mTelephonyManager.getServiceStateForSlot(mPhoneId)
+ .getRilVoiceRadioTechnology()));
+ int overrideNetwork = (mDisplayInfo != null
+ && SubscriptionManager.isValidSubscriptionId(mSubId))
+ ? mDisplayInfo.getOverrideNetworkType()
+ : TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE;
mOverrideNetwork.setText(
TelephonyDisplayInfo.overrideNetworkTypeToString(overrideNetwork));
}
@@ -1277,9 +1441,7 @@
private void updateRawRegistrationState(ServiceState serviceState) {
ServiceState ss = serviceState;
- if (ss == null && mPhone != null) {
- ss = mPhone.getServiceState();
- }
+ ss = mTelephonyManager.getServiceStateForSlot(mPhoneId);
mVoiceRawReg.setText(getRawRegistrationStateText(ss, NetworkRegistrationInfo.DOMAIN_CS,
AccessNetworkConstants.TRANSPORT_TYPE_WWAN));
@@ -1294,7 +1456,7 @@
& TelephonyManager.NETWORK_TYPE_BITMASK_NR) == 0) {
return;
}
- ServiceState ss = (mPhone == null) ? null : mPhone.getServiceState();
+ ServiceState ss = mTelephonyManager.getServiceStateForSlot(mPhoneId);
if (ss != null) {
NetworkRegistrationInfo nri = ss.getNetworkRegistrationInfo(
NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
@@ -1334,21 +1496,18 @@
String s;
Resources r = getResources();
- s = mPhone.getDeviceId();
- if (s == null) {
- s = r.getString(R.string.radioInfo_unknown);
- } else if (mPhone.getImeiType() == ImeiInfo.ImeiType.PRIMARY) {
- s = s + " (" + r.getString(R.string.radioInfo_imei_primary) + ")";
- }
+ s = mTelephonyManager.getImei(mPhoneId);
mDeviceId.setText(s);
- s = mPhone.getSubscriberId();
- if (s == null) s = r.getString(R.string.radioInfo_unknown);
+ s = mTelephonyManager.getSubscriberId();
+ if (s == null || !SubscriptionManager.isValidSubscriptionId(mSubId)) {
+ s = r.getString(R.string.radioInfo_unknown);
+ }
mSubscriberId.setText(s);
SubscriptionManager subMgr = getSystemService(SubscriptionManager.class);
- int subId = mPhone.getSubId();
+ int subId = mSubId;
s = subMgr.getPhoneNumber(subId)
+ " { CARRIER:"
+ subMgr.getPhoneNumber(subId, SubscriptionManager.PHONE_NUMBER_SOURCE_CARRIER)
@@ -1385,15 +1544,18 @@
mQueuedWork.execute(new Runnable() {
@Override
public void run() {
- if (!mEuiccManager.isEnabled()) {
- mEuiccInfoResult = "Not enabled";
- }
- try {
- mEuiccInfoResult = " { Available memory in bytes:"
- + mEuiccManager.getAvailableMemoryInBytes()
- + " }";
- } catch (Exception e) {
- mEuiccInfoResult = e.getMessage();
+ if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY_EUICC)) {
+ mEuiccInfoResult = "Euicc Feature is disabled";
+ } else if (mEuiccManager == null || !mEuiccManager.isEnabled()) {
+ mEuiccInfoResult = "EuiccManager is not enabled";
+ } else {
+ try {
+ mEuiccInfoResult = " { Available memory in bytes:"
+ + mEuiccManager.getAvailableMemoryInBytes()
+ + " }";
+ } catch (Exception e) {
+ mEuiccInfoResult = e.getMessage();
+ }
}
mHandler.post(setEuiccInfo);
}
@@ -1456,9 +1618,8 @@
}
private void refreshSmsc() {
- mQueuedWork.execute(new Runnable() {
- public void run() {
- //FIXME: Replace with a TelephonyManager call
+ mQueuedWork.execute(() -> {
+ if (mSystemUser) {
mPhone.getSmscAddress(mHandler.obtainMessage(EVENT_QUERY_SMSC_DONE));
}
});
@@ -1523,84 +1684,108 @@
private MenuItem.OnMenuItemClickListener mViewADNCallback =
new MenuItem.OnMenuItemClickListener() {
- public boolean onMenuItemClick(MenuItem item) {
- Intent intent = new Intent(Intent.ACTION_VIEW);
- // XXX We need to specify the component here because if we don't
- // the activity manager will try to resolve the type by calling
- // the content provider, which causes it to be loaded in a process
- // other than the Dialer process, which causes a lot of stuff to
- // break.
- intent.setClassName("com.android.phone", "com.android.phone.SimContacts");
- startActivity(intent);
- return true;
- }
- };
+ public boolean onMenuItemClick(MenuItem item) {
+ Intent intent = new Intent(Intent.ACTION_VIEW);
+ // XXX We need to specify the component here because if we don't
+ // the activity manager will try to resolve the type by calling
+ // the content provider, which causes it to be loaded in a process
+ // other than the Dialer process, which causes a lot of stuff to
+ // break.
+ intent.setClassName("com.android.phone", "com.android.phone.SimContacts");
+ startActivityAsUser(intent, UserHandle.CURRENT);
+ return true;
+ }
+ };
private MenuItem.OnMenuItemClickListener mViewFDNCallback =
new MenuItem.OnMenuItemClickListener() {
- public boolean onMenuItemClick(MenuItem item) {
- Intent intent = new Intent(Intent.ACTION_VIEW);
- // XXX We need to specify the component here because if we don't
- // the activity manager will try to resolve the type by calling
- // the content provider, which causes it to be loaded in a process
- // other than the Dialer process, which causes a lot of stuff to
- // break.
- intent.setClassName("com.android.phone", "com.android.phone.settings.fdn.FdnList");
- startActivity(intent);
- return true;
- }
- };
+ public boolean onMenuItemClick(MenuItem item) {
+ Intent intent = new Intent(Intent.ACTION_VIEW);
+ // XXX We need to specify the component here because if we don't
+ // the activity manager will try to resolve the type by calling
+ // the content provider, which causes it to be loaded in a process
+ // other than the Dialer process, which causes a lot of stuff to
+ // break.
+ intent.setClassName("com.android.phone",
+ "com.android.phone.settings.fdn.FdnList");
+ startActivityAsUser(intent, UserHandle.CURRENT);
+ return true;
+ }
+ };
private MenuItem.OnMenuItemClickListener mViewSDNCallback =
new MenuItem.OnMenuItemClickListener() {
- public boolean onMenuItemClick(MenuItem item) {
- Intent intent = new Intent(
- Intent.ACTION_VIEW, Uri.parse("content://icc/sdn"));
- // XXX We need to specify the component here because if we don't
- // the activity manager will try to resolve the type by calling
- // the content provider, which causes it to be loaded in a process
- // other than the Dialer process, which causes a lot of stuff to
- // break.
- intent.setClassName("com.android.phone", "com.android.phone.ADNList");
- startActivity(intent);
- return true;
- }
- };
+ public boolean onMenuItemClick(MenuItem item) {
+ Intent intent = new Intent(
+ Intent.ACTION_VIEW, Uri.parse("content://icc/sdn"));
+ // XXX We need to specify the component here because if we don't
+ // the activity manager will try to resolve the type by calling
+ // the content provider, which causes it to be loaded in a process
+ // other than the Dialer process, which causes a lot of stuff to
+ // break.
+ intent.setClassName("com.android.phone", "com.android.phone.ADNList");
+ startActivityAsUser(intent, UserHandle.CURRENT);
+ return true;
+ }
+ };
private MenuItem.OnMenuItemClickListener mGetImsStatus =
new MenuItem.OnMenuItemClickListener() {
- public boolean onMenuItemClick(MenuItem item) {
- boolean isImsRegistered = mPhone.isImsRegistered();
- boolean availableVolte = mPhone.isVoiceOverCellularImsEnabled();
- boolean availableWfc = mPhone.isWifiCallingEnabled();
- boolean availableVt = mPhone.isVideoEnabled();
- boolean availableUt = mPhone.isUtEnabled();
+ public boolean onMenuItemClick(MenuItem item) {
+ boolean isSimValid = SubscriptionManager.isValidSubscriptionId(mSubId);
+ boolean isImsRegistered = isSimValid && mTelephonyManager.isImsRegistered();
+ boolean availableVolte = isSimValid && mTelephonyManager.isVolteAvailable();
+ boolean availableWfc = isSimValid && mTelephonyManager.isWifiCallingAvailable();
+ boolean availableVt =
+ isSimValid && mTelephonyManager.isVideoTelephonyAvailable();
+ AtomicBoolean availableUt = new AtomicBoolean(false);
- final String imsRegString = isImsRegistered
- ? getString(R.string.radio_info_ims_reg_status_registered)
- : getString(R.string.radio_info_ims_reg_status_not_registered);
+ if (isSimValid) {
+ ImsMmTelManager imsMmTelManager = mImsManager.getImsMmTelManager(mSubId);
+ CountDownLatch latch = new CountDownLatch(1);
+ try {
+ HandlerThread handlerThread = new HandlerThread("RadioInfo");
+ handlerThread.start();
+ imsMmTelManager.isSupported(
+ MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_UT,
+ AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
+ handlerThread.getThreadExecutor(), (result) -> {
+ latch.countDown();
+ availableUt.set(result);
+ });
+ latch.await(2, TimeUnit.SECONDS);
+ handlerThread.quit();
+ } catch (Exception e) {
+ loge("Failed to get UT state.");
+ }
+ }
- final String available = getString(R.string.radio_info_ims_feature_status_available);
- final String unavailable = getString(
- R.string.radio_info_ims_feature_status_unavailable);
+ final String imsRegString = isImsRegistered
+ ? getString(R.string.radio_info_ims_reg_status_registered)
+ : getString(R.string.radio_info_ims_reg_status_not_registered);
- String imsStatus = getString(R.string.radio_info_ims_reg_status,
- imsRegString,
- availableVolte ? available : unavailable,
- availableWfc ? available : unavailable,
- availableVt ? available : unavailable,
- availableUt ? available : unavailable);
+ final String available = getString(
+ R.string.radio_info_ims_feature_status_available);
+ final String unavailable = getString(
+ R.string.radio_info_ims_feature_status_unavailable);
- AlertDialog imsDialog = new AlertDialog.Builder(RadioInfo.this)
- .setMessage(imsStatus)
- .setTitle(getString(R.string.radio_info_ims_reg_status_title))
- .create();
+ String imsStatus = getString(R.string.radio_info_ims_reg_status,
+ imsRegString,
+ availableVolte ? available : unavailable,
+ availableWfc ? available : unavailable,
+ availableVt ? available : unavailable,
+ availableUt.get() ? available : unavailable);
- imsDialog.show();
+ AlertDialog imsDialog = new AlertDialog.Builder(RadioInfo.this)
+ .setMessage(imsStatus)
+ .setTitle(getString(R.string.radio_info_ims_reg_status_title))
+ .create();
- return true;
- }
- };
+ imsDialog.show();
+
+ return true;
+ }
+ };
private MenuItem.OnMenuItemClickListener mToggleData =
new MenuItem.OnMenuItemClickListener() {
@@ -1755,42 +1940,159 @@
}
};
- private final OnCheckedChangeListener mSimulateOosOnChangeListener =
- (buttonView, isChecked) -> {
+ private final OnCheckedChangeListener mSimulateOosOnChangeListener = (bv, isChecked) -> {
Intent intent = new Intent("com.android.internal.telephony.TestServiceState");
if (isChecked) {
log("Send OOS override broadcast intent.");
intent.putExtra("data_reg_state", 1);
- mSimulateOos[mPhone.getPhoneId()] = true;
+ mSimulateOos[mPhoneId] = true;
} else {
log("Remove OOS override.");
intent.putExtra("action", "reset");
- mSimulateOos[mPhone.getPhoneId()] = false;
+ mSimulateOos[mPhoneId] = false;
}
-
mPhone.getTelephonyTester().setServiceStateTestIntent(intent);
};
+ private static final int SATELLITE_CHANNEL = 8665;
+ private final OnCheckedChangeListener mForceSatelliteChannelOnChangeListener =
+ (buttonView, isChecked) -> {
+ if (!SubscriptionManager.isValidSubscriptionId(mSubId)) {
+ loge("Force satellite channel invalid subId " + mSubId);
+ return;
+ }
+ CarrierConfigManager cm = getSystemService(CarrierConfigManager.class);
+ if (cm == null) {
+ loge("Force satellite channel cm == null");
+ return;
+ }
+ TelephonyManager tm = mTelephonyManager.createForSubscriptionId(mSubId);
+ // To be used in thread in case mPhone changes.
+ int subId = mSubId;
+ int phoneId = mPhoneId;
+ if (isChecked) {
+ (new Thread(() -> {
+ // Override carrier config
+ PersistableBundle originalBundle = cm.getConfigForSubId(subId,
+ CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL,
+ CarrierConfigManager.KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL,
+ CarrierConfigManager.KEY_EMERGENCY_MESSAGING_SUPPORTED_BOOL
+ );
+ PersistableBundle overrideBundle = new PersistableBundle();
+ overrideBundle.putBoolean(
+ CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL, true);
+ overrideBundle.putBoolean(CarrierConfigManager
+ .KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL, true);
+ overrideBundle.putBoolean(CarrierConfigManager
+ .KEY_EMERGENCY_MESSAGING_SUPPORTED_BOOL, true);
+
+ // Set only allow LTE network type
+ try {
+ tm.setAllowedNetworkTypesForReason(
+ TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_TEST,
+ RadioAccessFamily.getRafFromNetworkType(
+ RILConstants.NETWORK_MODE_LTE_ONLY));
+ log("Force satellite channel set to LTE only");
+ } catch (Exception e) {
+ loge("Force satellite channel failed to set network type to LTE " + e);
+ return;
+ }
+
+ // Set force channel selection
+ List<RadioAccessSpecifier> mock = List.of(
+ new RadioAccessSpecifier(
+ AccessNetworkConstants.AccessNetworkType.EUTRAN,
+ new int[]{AccessNetworkConstants.EutranBand.BAND_25},
+ new int[]{SATELLITE_CHANNEL}));
+ try {
+ log("Force satellite channel new channels " + mock);
+ tm.setSystemSelectionChannels(mock);
+ } catch (Exception e) {
+ loge("Force satellite channel failed to set channels " + e);
+ return;
+ }
+ log("Force satellite channel new config " + overrideBundle);
+ cm.overrideConfig(subId, overrideBundle, false);
+
+ mOriginalSystemChannels[phoneId] = originalBundle;
+ log("Force satellite channel old " + mock + originalBundle);
+ })).start();
+ } else {
+ (new Thread(() -> {
+ try {
+ tm.setSystemSelectionChannels(
+ Collections.emptyList() /* isSpecifyChannels false */);
+ log("Force satellite channel successfully cleared channels ");
+ tm.setAllowedNetworkTypesForReason(
+ TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_TEST,
+ TelephonyManager.getAllNetworkTypesBitmask());
+ log("Force satellite channel successfully reset network type to "
+ + TelephonyManager.getAllNetworkTypesBitmask());
+ PersistableBundle original = mOriginalSystemChannels[phoneId];
+ if (original != null) {
+ cm.overrideConfig(subId, original, false);
+ log("Force satellite channel successfully restored config to "
+ + original);
+ mOriginalSystemChannels[phoneId] = null;
+ }
+ } catch (Exception e) {
+ loge("Force satellite channel: Can't clear mock " + e);
+ }
+ })).start();
+ }
+ };
+
+ private void updateSatelliteChannelDisplay(int phoneId) {
+ if (mEnforceSatelliteChannel.isChecked()) return;
+ // Assume in testing mode
+ (new Thread(() -> {
+ TelephonyManager tm = mTelephonyManager.createForSubscriptionId(
+ SubscriptionManager.getSubscriptionId(phoneId));
+ try {
+ List<RadioAccessSpecifier> channels = tm.getSystemSelectionChannels();
+ long networkTypeBitMask = tm.getAllowedNetworkTypesForReason(
+ TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_TEST);
+ long lteNetworkBitMask = RadioAccessFamily.getRafFromNetworkType(
+ RILConstants.NETWORK_MODE_LTE_ONLY);
+ mHandler.post(() -> {
+ log("Force satellite get channel " + channels
+ + " get networkTypeBitMask " + networkTypeBitMask
+ + " lte " + lteNetworkBitMask);
+ // if SATELLITE_CHANNEL is the current channel
+ mEnforceSatelliteChannel.setChecked(channels.stream().filter(specifier ->
+ specifier.getRadioAccessNetwork()
+ == AccessNetworkConstants.AccessNetworkType.EUTRAN)
+ .flatMapToInt(specifier -> Arrays.stream(specifier.getChannels()))
+ .anyMatch(channel -> channel == SATELLITE_CHANNEL)
+ // OR ALLOWED_NETWORK_TYPES_REASON_TEST is LTE only.
+ || (networkTypeBitMask & lteNetworkBitMask) == networkTypeBitMask);
+ });
+ } catch (Exception e) {
+ loge("updateSatelliteChannelDisplay " + e);
+ }
+ })).start();
+ }
+
private final OnCheckedChangeListener mMockSatelliteListener =
(buttonView, isChecked) -> {
- if (mPhone != null) {
- CarrierConfigManager cm = mPhone.getContext()
- .getSystemService(CarrierConfigManager.class);
+ if (SubscriptionManager.isValidPhoneId(mPhoneId)) {
+ CarrierConfigManager cm = getSystemService(CarrierConfigManager.class);
if (cm == null) return;
if (isChecked) {
- String operatorNumeric = mPhone.getOperatorNumeric();
+ String operatorNumeric = mTelephonyManager
+ .getNetworkOperatorForPhone(mPhoneId);
TelephonyManager tm;
- if (TextUtils.isEmpty(operatorNumeric) && (tm = mPhone.getContext()
- .getSystemService(TelephonyManager.class)) != null) {
- operatorNumeric = tm.getSimOperatorNumericForPhone(mPhone.getPhoneId());
+ if (TextUtils.isEmpty(operatorNumeric)
+ && (tm = getSystemService(TelephonyManager.class)) != null) {
+ operatorNumeric = tm.getSimOperatorNumericForPhone(mPhoneId);
}
if (TextUtils.isEmpty(operatorNumeric)) {
loge("mMockSatelliteListener: Can't mock because no operator for phone "
- + mPhone.getPhoneId());
+ + mPhoneId);
mMockSatellite.setChecked(false);
return;
}
- PersistableBundle originalBundle = cm.getConfigForSubId(mPhone.getSubId(),
+ PersistableBundle originalBundle = cm.getConfigForSubId(mSubId,
CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL,
CarrierConfigManager.KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL,
CarrierConfigManager
@@ -1802,28 +2104,30 @@
overrideBundle.putBoolean(CarrierConfigManager
.KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL, false);
PersistableBundle capableProviderBundle = new PersistableBundle();
- capableProviderBundle.putIntArray(mPhone.getOperatorNumeric(), new int[]{
- // Currently satellite only supports below
- NetworkRegistrationInfo.SERVICE_TYPE_SMS,
- NetworkRegistrationInfo.SERVICE_TYPE_EMERGENCY
+ capableProviderBundle.putIntArray(mTelephonyManager
+ .getNetworkOperatorForPhone(mPhoneId),
+ new int[]{
+ // Currently satellite only supports below
+ NetworkRegistrationInfo.SERVICE_TYPE_SMS,
+ NetworkRegistrationInfo.SERVICE_TYPE_EMERGENCY
});
overrideBundle.putPersistableBundle(CarrierConfigManager
.KEY_CARRIER_SUPPORTED_SATELLITE_SERVICES_PER_PROVIDER_BUNDLE,
capableProviderBundle);
log("mMockSatelliteListener: new " + overrideBundle);
log("mMockSatelliteListener: old " + originalBundle);
- cm.overrideConfig(mPhone.getSubId(), overrideBundle, false);
- mCarrierSatelliteOriginalBundle[mPhone.getPhoneId()] = originalBundle;
+ cm.overrideConfig(mSubId, overrideBundle, false);
+ mCarrierSatelliteOriginalBundle[mPhoneId] = originalBundle;
} else {
try {
- cm.overrideConfig(mPhone.getSubId(),
- mCarrierSatelliteOriginalBundle[mPhone.getPhoneId()], false);
- mCarrierSatelliteOriginalBundle[mPhone.getPhoneId()] = null;
+ cm.overrideConfig(mSubId,
+ mCarrierSatelliteOriginalBundle[mPhoneId], false);
+ mCarrierSatelliteOriginalBundle[mPhoneId] = null;
log("mMockSatelliteListener: Successfully cleared mock for phone "
- + mPhone.getPhoneId());
+ + mPhoneId);
} catch (Exception e) {
loge("mMockSatelliteListener: Can't clear mock because invalid sub Id "
- + mPhone.getSubId()
+ + mSubId
+ ", insert SIM and use adb shell cmd phone cc clear-values");
// Keep show toggle ON if the view is not destroyed. If destroyed, must
// use cmd to reset, because upon creation the view doesn't remember the
@@ -1834,6 +2138,29 @@
}
};
+ /**
+ * Enable modem satellite for non-emergency mode.
+ */
+ private void enableSatelliteNonEmergencyMode() {
+ SatelliteManager sm = getSystemService(SatelliteManager.class);
+ CarrierConfigManager cm = getSystemService(CarrierConfigManager.class);
+ if (sm == null || cm == null) {
+ loge("enableSatelliteNonEmergencyMode: sm or cm is null");
+ return;
+ }
+ if (!cm.getConfigForSubId(mSubId,
+ CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL)
+ .getBoolean(CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL)) {
+ loge("enableSatelliteNonEmergencyMode: KEY_SATELLITE_ATTACH_SUPPORTED_BOOL is false");
+ return;
+ }
+ log("enableSatelliteNonEmergencyMode: requestEnabled");
+ sm.requestEnabled(new EnableRequestAttributes.Builder(true)
+ .setDemoMode(false).setEmergencyMode(false).build(),
+ Runnable::run, res -> log("enableSatelliteNonEmergencyMode: " + res)
+ );
+ }
+
private boolean isImsVolteProvisioned() {
return getImsConfigProvisionedState(MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VOICE,
ImsRegistrationImplBase.REGISTRATION_TECH_LTE);
@@ -1909,10 +2236,9 @@
}
private boolean isEabEnabledByPlatform() {
- if (mPhone != null) {
- CarrierConfigManager configManager = (CarrierConfigManager)
- mPhone.getContext().getSystemService(Context.CARRIER_CONFIG_SERVICE);
- PersistableBundle b = configManager.getConfigForSubId(mPhone.getSubId());
+ if (SubscriptionManager.isValidPhoneId(mPhoneId)) {
+ CarrierConfigManager configManager = getSystemService(CarrierConfigManager.class);
+ PersistableBundle b = configManager.getConfigForSubId(mSubId);
if (b != null) {
return b.getBoolean(
CarrierConfigManager.KEY_USE_RCS_PRESENCE_BOOL, false) || b.getBoolean(
@@ -1924,7 +2250,7 @@
}
private void updateImsProvisionedState() {
- if (!isImsSupportedOnDevice(mPhone.getContext())) {
+ if (!isImsSupportedOnDevice()) {
return;
}
@@ -1976,19 +2302,11 @@
&& isEnabledByPlatform && isEabProvisioningRequired());
}
- OnClickListener mDnsCheckButtonHandler = new OnClickListener() {
- public void onClick(View v) {
- //FIXME: Replace with a TelephonyManager call
- mPhone.disableDnsCheck(!mPhone.isDnsCheckDisabled());
- updateDnsCheckState();
- }
- };
-
OnClickListener mOemInfoButtonHandler = new OnClickListener() {
public void onClick(View v) {
Intent intent = new Intent(OEM_RADIO_INFO_INTENT);
try {
- startActivity(intent);
+ startActivityAsUser(intent, UserHandle.CURRENT);
} catch (android.content.ActivityNotFoundException ex) {
log("OEM-specific Info/Settings Activity Not Found : " + ex);
// If the activity does not exist, there are no OEM
@@ -2006,8 +2324,8 @@
OnClickListener mUpdateSmscButtonHandler = new OnClickListener() {
public void onClick(View v) {
mUpdateSmscButton.setEnabled(false);
- mQueuedWork.execute(new Runnable() {
- public void run() {
+ mQueuedWork.execute(() -> {
+ if (mSystemUser) {
mPhone.setSmscAddress(mSmsc.getText().toString(),
mHandler.obtainMessage(EVENT_UPDATE_SMSC_DONE));
}
@@ -2015,11 +2333,7 @@
}
};
- OnClickListener mRefreshSmscButtonHandler = new OnClickListener() {
- public void onClick(View v) {
- refreshSmsc();
- }
- };
+ OnClickListener mRefreshSmscButtonHandler = v -> refreshSmsc();
OnClickListener mCarrierProvisioningButtonHandler = v -> {
String carrierProvisioningApp = getCarrierProvisioningAppString();
@@ -2062,45 +2376,85 @@
}
};
+ AdapterView.OnItemSelectedListener mOnMockSignalStrengthSelectedListener =
+ new AdapterView.OnItemSelectedListener() {
+
+ public void onItemSelected(AdapterView<?> parent, View v, int pos, long id) {
+ log("mOnSignalStrengthSelectedListener: " + pos);
+ mSelectedSignalStrengthIndex[mPhoneId] = pos;
+ if (mSystemUser) {
+ mPhone.getTelephonyTester().setSignalStrength(SIGNAL_STRENGTH_LEVEL[pos]);
+ }
+ }
+
+ public void onNothingSelected(AdapterView<?> parent) {}
+ };
+
+
+ AdapterView.OnItemSelectedListener mOnMockDataNetworkTypeSelectedListener =
+ new AdapterView.OnItemSelectedListener() {
+
+ public void onItemSelected(AdapterView<?> parent, View v, int pos, long id) {
+ log("mOnMockDataNetworkTypeSelectedListener: " + pos);
+ mSelectedMockDataNetworkTypeIndex[mPhoneId] = pos;
+ Intent intent = new Intent("com.android.internal.telephony.TestServiceState");
+ if (pos > 0) {
+ log("mOnMockDataNetworkTypeSelectedListener: Override RAT: "
+ + ServiceState.rilRadioTechnologyToString(
+ MOCK_DATA_NETWORK_TYPE[pos]));
+ intent.putExtra("data_reg_state", ServiceState.STATE_IN_SERVICE);
+ intent.putExtra("data_rat", MOCK_DATA_NETWORK_TYPE[pos]);
+ } else {
+ log("mOnMockDataNetworkTypeSelectedListener: Remove RAT override.");
+ intent.putExtra("action", "reset");
+ }
+
+ if (mSystemUser) {
+ mPhone.getTelephonyTester().setServiceStateTestIntent(intent);
+ }
+ }
+
+ public void onNothingSelected(AdapterView<?> parent) {}
+ };
+
AdapterView.OnItemSelectedListener mSelectPhoneIndexHandler =
new AdapterView.OnItemSelectedListener() {
- public void onItemSelected(AdapterView parent, View v, int pos, long id) {
- if (pos >= 0 && pos <= sPhoneIndexLabels.length - 1) {
- // the array position is equal to the phone index
- int phoneIndex = pos;
- Phone[] phones = PhoneFactory.getPhones();
- if (phones == null || phones.length <= phoneIndex) {
- return;
+ public void onItemSelected(AdapterView parent, View v, int pos, long id) {
+ if (pos >= 0 && pos <= sPhoneIndexLabels.length - 1) {
+ if (mTelephonyManager.getActiveModemCount() <= pos) {
+ return;
+ }
+
+ mPhoneId = pos;
+ mSubId = SubscriptionManager.getSubscriptionId(mPhoneId);
+ log("Updated phone id to " + mPhoneId + ", sub id to " + mSubId);
+ updatePhoneIndex();
+ }
}
- // getSubId says it takes a slotIndex, but it actually takes a phone index
- mSelectedPhoneIndex = phoneIndex;
- updatePhoneIndex(phoneIndex, SubscriptionManager.getSubscriptionId(phoneIndex));
- }
- }
- public void onNothingSelected(AdapterView parent) {
- }
- };
+ public void onNothingSelected(AdapterView parent) {
+ }
+ };
- AdapterView.OnItemSelectedListener mCellInfoRefreshRateHandler =
+ AdapterView.OnItemSelectedListener mCellInfoRefreshRateHandler =
new AdapterView.OnItemSelectedListener() {
- public void onItemSelected(AdapterView parent, View v, int pos, long id) {
- mCellInfoRefreshRateIndex = pos;
- mTelephonyManager.setCellInfoListRate(CELL_INFO_REFRESH_RATES[pos], mPhone.getSubId());
- updateAllCellInfo();
- }
+ public void onItemSelected(AdapterView parent, View v, int pos, long id) {
+ mCellInfoRefreshRateIndex = pos;
+ mTelephonyManager.setCellInfoListRate(CELL_INFO_REFRESH_RATES[pos], mPhoneId);
+ updateAllCellInfo();
+ }
- public void onNothingSelected(AdapterView parent) {
- }
- };
+ public void onNothingSelected(AdapterView parent) {
+ }
+ };
private String getCarrierProvisioningAppString() {
- if (mPhone != null) {
+ if (SubscriptionManager.isValidPhoneId(mPhoneId)) {
CarrierConfigManager configManager =
- mPhone.getContext().getSystemService(CarrierConfigManager.class);
- PersistableBundle b = configManager.getConfigForSubId(mPhone.getSubId());
+ getSystemService(CarrierConfigManager.class);
+ PersistableBundle b = configManager.getConfigForSubId(mSubId);
if (b != null) {
return b.getString(
CarrierConfigManager.KEY_CARRIER_PROVISIONING_APP_STRING, "");
@@ -2207,18 +2561,17 @@
sendBroadcast(intent);
}
- private boolean isImsSupportedOnDevice(Context context) {
- return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY_IMS);
+ private boolean isImsSupportedOnDevice() {
+ return getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY_IMS);
}
private void updateServiceEnabledByPlatform() {
- int subId = mPhone.getSubId();
- if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+ if (!SubscriptionManager.isValidSubscriptionId(mSubId)) {
log("updateServiceEnabledByPlatform subscription ID is invalid");
return;
}
- ImsMmTelManager imsMmTelManager = mImsManager.getImsMmTelManager(subId);
+ ImsMmTelManager imsMmTelManager = mImsManager.getImsMmTelManager(mSubId);
try {
imsMmTelManager.isSupported(MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VOICE,
AccessNetworkConstants.TRANSPORT_TYPE_WWAN, getMainExecutor(), (result) -> {
diff --git a/src/com/android/phone/settings/SuppServicesUiUtil.java b/src/com/android/phone/settings/SuppServicesUiUtil.java
index 4f1a79f..bf4df6b 100644
--- a/src/com/android/phone/settings/SuppServicesUiUtil.java
+++ b/src/com/android/phone/settings/SuppServicesUiUtil.java
@@ -22,6 +22,7 @@
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
+import android.os.UserHandle;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.Log;
@@ -70,9 +71,9 @@
Intent intent = new Intent(Intent.ACTION_MAIN);
ComponentName mobileNetworkSettingsComponent = new ComponentName(
context.getString(R.string.mobile_network_settings_package),
- context.getString(R.string.mobile_network_settings_class));
+ context.getString(R.string.sims_settings_class));
intent.setComponent(mobileNetworkSettingsComponent);
- context.startActivity(intent);
+ context.startActivityAsUser(intent, UserHandle.CURRENT);
}
};
return builder.setMessage(message)
diff --git a/src/com/android/phone/settings/VoicemailSettingsActivity.java b/src/com/android/phone/settings/VoicemailSettingsActivity.java
index c940748..909a3ad 100644
--- a/src/com/android/phone/settings/VoicemailSettingsActivity.java
+++ b/src/com/android/phone/settings/VoicemailSettingsActivity.java
@@ -42,7 +42,6 @@
import android.text.TextUtils;
import android.util.Log;
import android.view.MenuItem;
-import android.view.WindowManager;
import android.widget.ListAdapter;
import android.widget.Toast;
@@ -50,6 +49,7 @@
import com.android.internal.telephony.CommandsInterface;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneConstants;
+import com.android.internal.telephony.flags.Flags;
import com.android.internal.telephony.util.NotificationChannelController;
import com.android.phone.EditPhoneNumberPreference;
import com.android.phone.PhoneGlobals;
@@ -200,6 +200,7 @@
private boolean mShowVoicemailPreference = false;
private boolean mForeground;
+ private boolean mDisallowedConfig = false;
private Phone mPhone;
private SubscriptionInfoHelper mSubscriptionInfoHelper;
@@ -221,11 +222,20 @@
// Make sure we are running as the primary user only
UserManager userManager = getApplicationContext().getSystemService(UserManager.class);
if (!userManager.isPrimaryUser()) {
- Toast.makeText(this, R.string.voice_number_setting_primary_user_only,
- Toast.LENGTH_SHORT).show();
- finish();
- return;
+ Toast.makeText(this, R.string.voice_number_setting_primary_user_only,
+ Toast.LENGTH_SHORT).show();
+ finish();
+ return;
}
+
+ // Check if mobile network configs are restricted.
+ if (Flags.ensureAccessToCallSettingsIsRestricted() &&
+ userManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)) {
+ mDisallowedConfig = true;
+ Log.i(LOG_TAG, "Mobile network configs are restricted, disabling voicemail "
+ + "settings");
+ }
+
// Show the voicemail preference in onResume if the calling intent specifies the
// ACTION_ADD_VOICEMAIL action.
mShowVoicemailPreference = (icicle == null) &&
@@ -266,7 +276,8 @@
mSubMenuVoicemailSettings.setDialogOnClosedListener(this);
mSubMenuVoicemailSettings.setDialogTitle(R.string.voicemail_settings_number_label);
if (!getBooleanCarrierConfig(
- CarrierConfigManager.KEY_EDITABLE_VOICEMAIL_NUMBER_SETTING_BOOL)) {
+ CarrierConfigManager.KEY_EDITABLE_VOICEMAIL_NUMBER_SETTING_BOOL) ||
+ mDisallowedConfig) {
mSubMenuVoicemailSettings.setEnabled(false);
}
}
@@ -483,7 +494,7 @@
Intent i = new Intent(ACTION_ADD_VOICEMAIL);
i.putExtra(IGNORE_PROVIDER_EXTRA, victim);
i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
- this.startActivity(i);
+ this.startActivityAsUser(i, UserHandle.CURRENT);
}
return;
}
diff --git a/src/com/android/phone/settings/fdn/EditFdnContactScreen.java b/src/com/android/phone/settings/fdn/EditFdnContactScreen.java
index 0884e12..6bf41f3 100644
--- a/src/com/android/phone/settings/fdn/EditFdnContactScreen.java
+++ b/src/com/android/phone/settings/fdn/EditFdnContactScreen.java
@@ -346,7 +346,7 @@
Intent intent = mSubscriptionInfoHelper.getIntent(DeleteFdnContactScreen.class);
intent.putExtra(INTENT_EXTRA_NAME, mName);
intent.putExtra(INTENT_EXTRA_NUMBER, mNumber);
- startActivity(intent);
+ startActivityAsUser(intent, UserHandle.CURRENT);
}
finish();
}
diff --git a/src/com/android/phone/settings/fdn/FdnList.java b/src/com/android/phone/settings/fdn/FdnList.java
index c2ecbc6..1b5a7af 100644
--- a/src/com/android/phone/settings/fdn/FdnList.java
+++ b/src/com/android/phone/settings/fdn/FdnList.java
@@ -23,6 +23,7 @@
import android.net.Uri;
import android.os.Bundle;
import android.os.PersistableBundle;
+import android.os.UserHandle;
import android.telecom.PhoneAccount;
import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionManager;
@@ -167,7 +168,7 @@
Intent intent = mSubscriptionInfoHelper.getIntent(FdnSetting.class);
intent.setAction(Intent.ACTION_MAIN);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
- startActivity(intent);
+ startActivityAsUser(intent, UserHandle.CURRENT);
finish();
return true;
@@ -200,7 +201,7 @@
private void addContact() {
//If there is no INTENT_EXTRA_NAME provided, EditFdnContactScreen treats it as an "add".
Intent intent = mSubscriptionInfoHelper.getIntent(EditFdnContactScreen.class);
- startActivity(intent);
+ startActivityAsUser(intent, UserHandle.CURRENT);
}
/**
@@ -224,7 +225,7 @@
Intent intent = mSubscriptionInfoHelper.getIntent(EditFdnContactScreen.class);
intent.putExtra(INTENT_EXTRA_NAME, name);
intent.putExtra(INTENT_EXTRA_NUMBER, number);
- startActivity(intent);
+ startActivityAsUser(intent, UserHandle.CURRENT);
}
}
@@ -240,7 +241,7 @@
Intent intent = mSubscriptionInfoHelper.getIntent(DeleteFdnContactScreen.class);
intent.putExtra(INTENT_EXTRA_NAME, name);
intent.putExtra(INTENT_EXTRA_NUMBER, number);
- startActivity(intent);
+ startActivityAsUser(intent, UserHandle.CURRENT);
}
}
@@ -254,7 +255,7 @@
if (!TextUtils.isEmpty(number)) {
Uri uri = Uri.fromParts(PhoneAccount.SCHEME_TEL, number, null);
final Intent intent = new Intent(Intent.ACTION_CALL_PRIVILEGED, uri);
- startActivity(intent);
+ startActivityAsUser(intent, UserHandle.CURRENT);
}
}
}
diff --git a/src/com/android/phone/settings/fdn/FdnSetting.java b/src/com/android/phone/settings/fdn/FdnSetting.java
index e347dec..ddbcc99 100644
--- a/src/com/android/phone/settings/fdn/FdnSetting.java
+++ b/src/com/android/phone/settings/fdn/FdnSetting.java
@@ -33,6 +33,7 @@
import com.android.internal.telephony.CommandException;
import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.flags.Flags;
import com.android.phone.CallFeaturesSetting;
import com.android.phone.PhoneGlobals;
import com.android.phone.R;
diff --git a/src/com/android/phone/slice/SlicePurchaseController.java b/src/com/android/phone/slice/SlicePurchaseController.java
index 9a42e16..51255dd 100644
--- a/src/com/android/phone/slice/SlicePurchaseController.java
+++ b/src/com/android/phone/slice/SlicePurchaseController.java
@@ -40,6 +40,7 @@
import android.os.Looper;
import android.os.Message;
import android.os.PersistableBundle;
+import android.os.UserHandle;
import android.provider.DeviceConfig;
import android.sysprop.TelephonyProperties;
import android.telephony.AnomalyReporter;
@@ -832,7 +833,11 @@
intent.putExtra(EXTRA_INTENT_NOTIFICATION_SHOWN, createPendingIntent(
ACTION_SLICE_PURCHASE_APP_RESPONSE_NOTIFICATION_SHOWN, capability, false));
logd("Broadcasting start intent to SlicePurchaseBroadcastReceiver.");
- mPhone.getContext().sendBroadcast(intent);
+ if (mFeatureFlags.hsumBroadcast()) {
+ mPhone.getContext().sendBroadcastAsUser(intent, UserHandle.ALL);
+ } else {
+ mPhone.getContext().sendBroadcast(intent);
+ }
// Listen for responses from the slice purchase application
mSlicePurchaseControllerBroadcastReceivers.put(capability,
@@ -913,7 +918,11 @@
intent.putExtra(EXTRA_PHONE_ID, mPhone.getPhoneId());
intent.putExtra(EXTRA_PREMIUM_CAPABILITY, capability);
logd("Broadcasting timeout intent to SlicePurchaseBroadcastReceiver.");
- mPhone.getContext().sendBroadcast(intent);
+ if (mFeatureFlags.hsumBroadcast()) {
+ mPhone.getContext().sendBroadcastAsUser(intent, UserHandle.ALL);
+ } else {
+ mPhone.getContext().sendBroadcast(intent);
+ }
handlePurchaseResult(
capability, TelephonyManager.PURCHASE_PREMIUM_CAPABILITY_RESULT_TIMEOUT, true);
diff --git a/src/com/android/phone/utils/CarrierAllowListInfo.java b/src/com/android/phone/utils/CarrierAllowListInfo.java
index 3ab9733..b230a9e 100644
--- a/src/com/android/phone/utils/CarrierAllowListInfo.java
+++ b/src/com/android/phone/utils/CarrierAllowListInfo.java
@@ -21,9 +21,11 @@
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.Signature;
+import android.os.Binder;
import android.telephony.Rlog;
import android.text.TextUtils;
+import com.android.internal.telephony.flags.Flags;
import com.android.internal.telephony.uicc.IccUtils;
import org.json.JSONArray;
@@ -155,7 +157,11 @@
// package name is mandatory
return false;
}
- final PackageManager packageManager = context.getPackageManager();
+ PackageManager packageManager = context.getPackageManager();
+ if (Flags.hsumPackageManager()) {
+ packageManager = context.createContextAsUser(Binder.getCallingUserHandle(), 0)
+ .getPackageManager();
+ }
try {
MessageDigest sha256MDigest = MessageDigest.getInstance(MESSAGE_DIGEST_256_ALGORITHM);
final PackageInfo packageInfo = packageManager.getPackageInfo(packageName,
diff --git a/src/com/android/phone/vvm/CarrierVvmPackageInstalledReceiver.java b/src/com/android/phone/vvm/CarrierVvmPackageInstalledReceiver.java
index ec0d3f6..e866ce0 100644
--- a/src/com/android/phone/vvm/CarrierVvmPackageInstalledReceiver.java
+++ b/src/com/android/phone/vvm/CarrierVvmPackageInstalledReceiver.java
@@ -21,6 +21,7 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.os.PersistableBundle;
+import android.os.UserHandle;
import android.telecom.PhoneAccountHandle;
import android.telecom.TelecomManager;
import android.telephony.CarrierConfigManager;
@@ -29,6 +30,8 @@
import android.text.TextUtils;
import android.util.ArraySet;
+import com.android.internal.telephony.flags.Flags;
+
import java.util.Collections;
import java.util.Set;
@@ -80,28 +83,37 @@
.createForPhoneAccountHandle(phoneAccountHandle);
if (pinnedTelephonyManager == null) {
- VvmLog.e(TAG, "cannot create TelephonyManager from " + phoneAccountHandle);
+ VvmLog.e(TAG, "carrierVvmPkgAdded: cannot create TelephonyManager from "
+ + phoneAccountHandle);
continue;
}
if (!getCarrierVvmPackages(telephonyManager).contains(packageName)) {
+ VvmLog.w(TAG, "carrierVvmPkgAdded: carrier vvm packages doesn't contain "
+ + packageName);
continue;
}
- VvmLog.i(TAG, "Carrier VVM app " + packageName + " installed");
+ VvmLog.i(TAG, "carrierVvmPkgAdded: Carrier VVM app " + packageName + " installed");
String vvmPackage = pinnedTelephonyManager.getVisualVoicemailPackageName();
if (!TextUtils.equals(vvmPackage, systemDialer)) {
// Non system dialer do not need to prioritize carrier vvm app.
- VvmLog.i(TAG, "non system dialer " + vvmPackage + " ignored");
+ VvmLog.i(TAG, "carrierVvmPkgAdded: non system dialer "
+ + vvmPackage + " ignored");
continue;
}
- VvmLog.i(TAG, "sending broadcast to " + vvmPackage);
+ VvmLog.i(TAG, "carrierVvmPkgAdded: sending vvm package installed broadcast to "
+ + vvmPackage);
Intent broadcast = new Intent(ACTION_CARRIER_VVM_PACKAGE_INSTALLED);
broadcast.putExtra(Intent.EXTRA_PACKAGE_NAME, packageName);
broadcast.setPackage(vvmPackage);
- context.sendBroadcast(broadcast);
+ if (Flags.hsumBroadcast()) {
+ context.sendBroadcastAsUser(broadcast, UserHandle.ALL);
+ } else {
+ context.sendBroadcast(broadcast);
+ }
}
}
diff --git a/src/com/android/phone/vvm/RemoteVvmTaskManager.java b/src/com/android/phone/vvm/RemoteVvmTaskManager.java
index daa5d67b..b7c3406 100644
--- a/src/com/android/phone/vvm/RemoteVvmTaskManager.java
+++ b/src/com/android/phone/vvm/RemoteVvmTaskManager.java
@@ -170,22 +170,23 @@
}
if (info.serviceInfo == null) {
VvmLog.w(TAG,
- "Component " + TelephonyUtils.getComponentInfo(info)
+ "getRemotePackage: Component " + TelephonyUtils.getComponentInfo(info)
+ " is not a service, ignoring");
continue;
}
if (!android.Manifest.permission.BIND_VISUAL_VOICEMAIL_SERVICE
.equals(info.serviceInfo.permission)) {
- VvmLog.w(TAG, "package " + info.serviceInfo.packageName
+ VvmLog.w(TAG, "getRemotePackage: package " + info.serviceInfo.packageName
+ " does not enforce BIND_VISUAL_VOICEMAIL_SERVICE, ignoring");
continue;
}
if (targetPackage != null && !TextUtils.equals(packageName, targetPackage)) {
- VvmLog.w(TAG, "target package " + targetPackage
+ VvmLog.w(TAG, "getRemotePackage: target package " + targetPackage
+ " is no longer the active VisualVoicemailService, ignoring");
continue;
}
ComponentInfo componentInfo = TelephonyUtils.getComponentInfo(info);
+ VvmLog.i(TAG, "getRemotePackage: found package " + targetPackage);
return new ComponentName(componentInfo.packageName, componentInfo.name);
}
@@ -206,6 +207,7 @@
return null;
}
ComponentInfo componentInfo = TelephonyUtils.getComponentInfo(info.get(0));
+ VvmLog.i(TAG, "getBroadcastPackage: found package " + componentInfo.packageName);
return new ComponentName(componentInfo.packageName, componentInfo.name);
}
@@ -234,7 +236,7 @@
mTaskReferenceCount++;
if (intent == null) {
- VvmLog.i(TAG, "received intent is null");
+ VvmLog.i(TAG, "onStartCommand: received intent is null");
checkReference();
return START_NOT_STICKY;
}
@@ -245,7 +247,8 @@
ComponentName remotePackage = getRemotePackage(this, subId,
intent.getStringExtra(EXTRA_TARGET_PACKAGE));
if (remotePackage == null) {
- VvmLog.i(TAG, "No service to handle " + intent.getAction() + ", ignoring");
+ VvmLog.i(TAG, "onStartCommand: No service to handle "
+ + intent.getAction() + ", ignoring");
checkReference();
return START_NOT_STICKY;
}
@@ -309,6 +312,7 @@
public void onServiceConnected(ComponentName className,
IBinder service) {
+ VvmLog.i(TAG, "onServiceConnected: " + className);
mRemoteMessenger = new Messenger(service);
mConnected = true;
runQueue();
@@ -318,7 +322,8 @@
mConnection = null;
mConnected = false;
mRemoteMessenger = null;
- VvmLog.e(TAG, "Service disconnected, " + mTaskReferenceCount + " tasks dropped.");
+ VvmLog.e(TAG, "onServiceDisconnected: remoteService disconnected, "
+ + mTaskReferenceCount + " tasks dropped.");
mTaskReferenceCount = 0;
checkReference();
}
@@ -333,7 +338,7 @@
try {
mRemoteMessenger.send(message);
} catch (RemoteException e) {
- VvmLog.e(TAG, "Error sending message to remote service", e);
+ VvmLog.e(TAG, "runQueue: Error sending message to remote service", e);
}
message = mTaskQueue.poll();
}
@@ -351,7 +356,7 @@
* a different repository so it can not be updated in sync with android SDK. It is also
* hard to make a manifest service to work in the intermittent state.
*/
- VvmLog.i(TAG, "sending broadcast " + what + " to " + remotePackage);
+ VvmLog.i(TAG, "send: sending broadcast " + what + " to " + remotePackage);
Intent intent = new Intent(ACTION_VISUAL_VOICEMAIL_SERVICE_EVENT);
intent.putExtras(extras);
intent.putExtra(EXTRA_WHAT, what);
@@ -371,7 +376,7 @@
if (!mConnection.isConnected()) {
Intent intent = newBindIntent(this);
intent.setComponent(remotePackage);
- VvmLog.i(TAG, "Binding to " + intent.getComponent());
+ VvmLog.i(TAG, "send: Binding to " + intent.getComponent());
bindServiceAsUser(intent, mConnection, Context.BIND_AUTO_CREATE, userHandle);
}
}
diff --git a/src/com/android/phone/vvm/VvmDumpHandler.java b/src/com/android/phone/vvm/VvmDumpHandler.java
index 82c5bb5..bf09f30 100644
--- a/src/com/android/phone/vvm/VvmDumpHandler.java
+++ b/src/com/android/phone/vvm/VvmDumpHandler.java
@@ -19,15 +19,20 @@
indentedWriter.println("******* OmtpVvm *******");
indentedWriter.println("======= Configs =======");
indentedWriter.increaseIndent();
- for (PhoneAccountHandle handle : context.getSystemService(TelecomManager.class)
- .getCallCapablePhoneAccounts()) {
- int subId = PhoneAccountHandleConverter.toSubId(handle);
- indentedWriter.println(
- "VisualVoicemailPackageName:" + telephonyManager.createForSubscriptionId(subId)
- .getVisualVoicemailPackageName());
- indentedWriter.println(
- "VisualVoicemailSmsFilterSettings(" + subId + "):" + telephonyManager
- .getActiveVisualVoicemailSmsFilterSettings(subId));
+ try {
+ for (PhoneAccountHandle handle : context.getSystemService(TelecomManager.class)
+ .getCallCapablePhoneAccounts()) {
+ int subId = PhoneAccountHandleConverter.toSubId(handle);
+ indentedWriter.println(
+ "VisualVoicemailPackageName:" + telephonyManager.createForSubscriptionId(
+ subId)
+ .getVisualVoicemailPackageName());
+ indentedWriter.println(
+ "VisualVoicemailSmsFilterSettings(" + subId + "):" + telephonyManager
+ .getActiveVisualVoicemailSmsFilterSettings(subId));
+ }
+ } catch (SecurityException se) {
+ indentedWriter.println("Could not get vvm config " + se);
}
indentedWriter.decreaseIndent();
indentedWriter.println("======== Logs =========");
diff --git a/src/com/android/phone/vvm/VvmSimStateTracker.java b/src/com/android/phone/vvm/VvmSimStateTracker.java
index ab8329c..0362d02 100644
--- a/src/com/android/phone/vvm/VvmSimStateTracker.java
+++ b/src/com/android/phone/vvm/VvmSimStateTracker.java
@@ -116,12 +116,13 @@
final String action = intent.getAction();
if (action == null) {
- VvmLog.w(TAG, "Null action for intent.");
+ VvmLog.w(TAG, "onReceive: Null action for intent.");
return;
}
VvmLog.i(TAG, action);
switch (action) {
case Intent.ACTION_BOOT_COMPLETED:
+ VvmLog.i(TAG, "onReceive: ACTION_BOOT_COMPLETED");
onBootCompleted(context);
break;
case TelephonyIntents.ACTION_SIM_STATE_CHANGED:
@@ -131,6 +132,7 @@
// which SIM is removed.
// ACTION_SIM_STATE_CHANGED only provides subId which cannot be converted to a
// PhoneAccountHandle when the SIM is absent.
+ VvmLog.i(TAG, "onReceive: ACTION_SIM_STATE_CHANGED");
checkRemovedSim(context);
}
break;
@@ -139,7 +141,7 @@
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
if (!SubscriptionManager.isValidSubscriptionId(subId)) {
- VvmLog.i(TAG, "Received SIM change for invalid subscription id.");
+ VvmLog.i(TAG, "onReceive: Received carrier config for invalid sub id.");
checkRemovedSim(context);
return;
}
@@ -149,10 +151,11 @@
if ("null".equals(phoneAccountHandle.getId())) {
VvmLog.e(TAG,
- "null phone account handle ID, possible modem crash."
+ "onReceive: null phone account handle ID, possible modem crash."
+ " Ignoring carrier config changed event");
return;
}
+ VvmLog.i(TAG, "onReceive: ACTION_CARRIER_CONFIG_CHANGED; subId=" + subId);
onCarrierConfigChanged(context, phoneAccountHandle);
}
}
@@ -174,7 +177,7 @@
}
private void sendConnected(Context context, PhoneAccountHandle phoneAccountHandle) {
- VvmLog.i(TAG, "Service connected on " + phoneAccountHandle);
+ VvmLog.i(TAG, "sendConnected: Service connected on " + phoneAccountHandle);
RemoteVvmTaskManager.startCellServiceConnected(context, phoneAccountHandle);
}
@@ -210,7 +213,7 @@
}
private void sendSimRemoved(Context context, PhoneAccountHandle phoneAccountHandle) {
- VvmLog.i(TAG, "Sim removed on " + phoneAccountHandle);
+ VvmLog.i(TAG, "sendSimRemoved: Sim removed on " + phoneAccountHandle);
RemoteVvmTaskManager.startSimRemoved(context, phoneAccountHandle);
}
@@ -233,6 +236,8 @@
}
if (telephonyManager.getServiceState().getState()
== ServiceState.STATE_IN_SERVICE) {
+ VvmLog.i(TAG, "onCarrierConfigChanged: in service; send connected "
+ + phoneAccountHandle);
sendConnected(context, phoneAccountHandle);
sListeners.put(phoneAccountHandle, null);
} else {
@@ -243,6 +248,7 @@
private void listenToAccount(Context context, PhoneAccountHandle phoneAccountHandle) {
ServiceStateListener listener = new ServiceStateListener(context, phoneAccountHandle);
listener.listen();
+ VvmLog.i(TAG, "listenToAccount: " + phoneAccountHandle);
sListeners.put(phoneAccountHandle, listener);
}
diff --git a/src/com/android/phone/vvm/VvmSmsReceiver.java b/src/com/android/phone/vvm/VvmSmsReceiver.java
index 8265e50..d4fa751 100644
--- a/src/com/android/phone/vvm/VvmSmsReceiver.java
+++ b/src/com/android/phone/vvm/VvmSmsReceiver.java
@@ -38,22 +38,22 @@
.getParcelable(VoicemailContract.EXTRA_VOICEMAIL_SMS);
if (sms.getPhoneAccountHandle() == null) {
// This should never happen
- VvmLog.e(TAG, "Received message for null phone account");
+ VvmLog.e(TAG, "onReceive: Received message for null phone account");
return;
}
int subId = PhoneAccountHandleConverter.toSubId(sms.getPhoneAccountHandle());
if (!SubscriptionManager.isValidSubscriptionId(subId)) {
- VvmLog.e(TAG, "Received message for invalid subId");
+ VvmLog.e(TAG, "onReceive: Received message for invalid subId");
return;
}
String targetPackage = intent.getExtras().getString(VoicemailContract.EXTRA_TARGET_PACKAGE);
if (RemoteVvmTaskManager.hasRemoteService(context, subId, targetPackage)) {
- VvmLog.i(TAG, "Sending SMS received event to remote service");
+ VvmLog.i(TAG, "onReceive: Sending SMS received event to remote service");
RemoteVvmTaskManager.startSmsReceived(context, sms, targetPackage);
} else {
- VvmLog.w(TAG, "No remote service to handle SMS received event");
+ VvmLog.w(TAG, "onReceive: No remote service to handle SMS received event");
}
}
}
diff --git a/src/com/android/services/telephony/PstnIncomingCallNotifier.java b/src/com/android/services/telephony/PstnIncomingCallNotifier.java
index d58c211..3b74c6f 100644
--- a/src/com/android/services/telephony/PstnIncomingCallNotifier.java
+++ b/src/com/android/services/telephony/PstnIncomingCallNotifier.java
@@ -82,30 +82,7 @@
/**
* Used to listen to events from {@link #mPhone}.
*/
- private final Handler mHandler = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- switch(msg.what) {
- case EVENT_NEW_RINGING_CONNECTION:
- handleNewRingingConnection((AsyncResult) msg.obj);
- break;
- case EVENT_CDMA_CALL_WAITING:
- handleCdmaCallWaiting((AsyncResult) msg.obj);
- break;
- case EVENT_UNKNOWN_CONNECTION:
- handleNewUnknownConnection((AsyncResult) msg.obj);
- break;
- default:
- break;
- }
- }
-
- @Override
- public String toString() {
- return String.format("[PstnIncomingCallNotifierHandler; phoneId=[%s]",
- getPhoneIdAsString());
- }
- };
+ private final Handler mHandler;
/**
* Persists the specified parameters and starts listening to phone events.
@@ -118,6 +95,30 @@
}
mPhone = phone;
+ mHandler = new Handler(phone.getLooper()) {
+ @Override
+ public void handleMessage(Message msg) {
+ switch(msg.what) {
+ case EVENT_NEW_RINGING_CONNECTION:
+ handleNewRingingConnection((AsyncResult) msg.obj);
+ break;
+ case EVENT_CDMA_CALL_WAITING:
+ handleCdmaCallWaiting((AsyncResult) msg.obj);
+ break;
+ case EVENT_UNKNOWN_CONNECTION:
+ handleNewUnknownConnection((AsyncResult) msg.obj);
+ break;
+ default:
+ break;
+ }
+ }
+
+ @Override
+ public String toString() {
+ return String.format("[PstnIncomingCallNotifierHandler; phoneId=[%s]",
+ getPhoneIdAsString());
+ }
+ };
registerForNotifications();
}
diff --git a/src/com/android/services/telephony/PstnPhoneCapabilitiesNotifier.java b/src/com/android/services/telephony/PstnPhoneCapabilitiesNotifier.java
index 4038dd1..e91af83 100644
--- a/src/com/android/services/telephony/PstnPhoneCapabilitiesNotifier.java
+++ b/src/com/android/services/telephony/PstnPhoneCapabilitiesNotifier.java
@@ -39,18 +39,7 @@
private final Phone mPhone;
private final Listener mListener;
- private final Handler mHandler = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- switch (msg.what) {
- case EVENT_VIDEO_CAPABILITIES_CHANGED:
- handleVideoCapabilitesChanged((AsyncResult) msg.obj);
- break;
- default:
- break;
- }
- }
- };
+ private final Handler mHandler;
/*package*/
PstnPhoneCapabilitiesNotifier(Phone phone, Listener listener) {
@@ -59,6 +48,18 @@
}
mPhone = phone;
+ mHandler = new Handler(phone.getLooper()) {
+ @Override
+ public void handleMessage(Message msg) {
+ switch (msg.what) {
+ case EVENT_VIDEO_CAPABILITIES_CHANGED:
+ handleVideoCapabilitesChanged((AsyncResult) msg.obj);
+ break;
+ default:
+ break;
+ }
+ }
+ };
mListener = listener;
registerForNotifications();
diff --git a/src/com/android/services/telephony/TelecomAccountRegistry.java b/src/com/android/services/telephony/TelecomAccountRegistry.java
index 064c69b..c39d121 100644
--- a/src/com/android/services/telephony/TelecomAccountRegistry.java
+++ b/src/com/android/services/telephony/TelecomAccountRegistry.java
@@ -32,12 +32,14 @@
import android.graphics.drawable.Drawable;
import android.graphics.drawable.Icon;
import android.net.Uri;
+import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.HandlerExecutor;
import android.os.HandlerThread;
import android.os.Looper;
import android.os.PersistableBundle;
+import android.os.SystemProperties;
import android.os.UserHandle;
import android.provider.Settings;
import android.provider.Telephony;
@@ -99,6 +101,8 @@
private static final int REGISTER_START_DELAY_MS = 1 * 1000; // 1 second
private static final int REGISTER_MAXIMUM_DELAY_MS = 60 * 1000; // 1 minute
+ private static final int TELECOM_CONNECT_START_DELAY_MS = 250; // 250 milliseconds
+ private static final int TELECOM_CONNECT_MAX_DELAY_MS = 4 * 1000; // 4 second
/**
* Indicates the {@link SubscriptionManager.OnSubscriptionsChangedListener} has not yet been
@@ -475,11 +479,13 @@
isHandoverFromSupported);
}
- final boolean isTelephonyAudioDeviceSupported = mContext.getResources().getBoolean(
- R.bool.config_support_telephony_audio_device);
- if (isTelephonyAudioDeviceSupported && !isEmergency
- && isCarrierUseCallRecordingTone()) {
- extras.putBoolean(PhoneAccount.EXTRA_PLAY_CALL_RECORDING_TONE, true);
+ if (!com.android.server.telecom.flags.Flags.telecomResolveHiddenDependencies()) {
+ final boolean isTelephonyAudioDeviceSupported = mContext.getResources().getBoolean(
+ R.bool.config_support_telephony_audio_device);
+ if (isTelephonyAudioDeviceSupported && !isEmergency
+ && isCarrierUseCallRecordingTone()) {
+ extras.putBoolean(PhoneAccount.EXTRA_PLAY_CALL_RECORDING_TONE, true);
+ }
}
extras.putBoolean(EXTRA_SUPPORTS_VIDEO_CALLING_FALLBACK,
@@ -502,14 +508,9 @@
// Set CAPABILITY_EMERGENCY_CALLS_ONLY flag if either
// - Carrier config overrides subscription is not voice capable, or
// - Resource config overrides it be emergency_calls_only
- // TODO(b/316183370:): merge the two cases when clearing up flag
- if (Flags.dataOnlyServiceAllowEmergencyCallOnly()) {
- if (!isSubscriptionVoiceCapableByCarrierConfig()) {
- capabilities |= PhoneAccount.CAPABILITY_EMERGENCY_CALLS_ONLY;
- }
- }
- if (isEmergency && mContext.getResources().getBoolean(
- R.bool.config_emergency_account_emergency_calls_only)) {
+ if (!isSubscriptionVoiceCapableByCarrierConfig()
+ || (isEmergency && mContext.getResources().getBoolean(
+ R.bool.config_emergency_account_emergency_calls_only))) {
capabilities |= PhoneAccount.CAPABILITY_EMERGENCY_CALLS_ONLY;
}
@@ -1220,7 +1221,8 @@
setupAccounts();
} else if (CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED.equals(
intent.getAction())) {
- Log.i(this, "Carrier-config changed, checking for phone account updates.");
+ Log.i(this, "TelecomAccountRegistry: Carrier-config changed, "
+ + "checking for phone account updates.");
int subId = intent.getIntExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX,
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
handleCarrierConfigChange(subId);
@@ -1231,7 +1233,8 @@
private BroadcastReceiver mLocaleChangeReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
- Log.i(this, "Locale change; re-registering phone accounts.");
+ Log.i(this, "TelecomAccountRegistry: Locale change; re-registering "
+ + "phone accounts.");
tearDownAccounts();
setupAccounts();
}
@@ -1245,10 +1248,11 @@
@Override
public void onServiceStateChanged(ServiceState serviceState) {
int newState = serviceState.getState();
- Log.i(this, "onServiceStateChanged: newState=%d, mServiceState=%d",
- newState, mServiceState);
+ Log.i(this, "TelecomAccountRegistry: onServiceStateChanged: "
+ + "newState=%d, mServiceState=%d", newState, mServiceState);
if (newState == ServiceState.STATE_IN_SERVICE && mServiceState != newState) {
- Log.i(this, "onServiceStateChanged: Tearing down and re-setting up accounts.");
+ Log.i(this, "TelecomAccountRegistry: onServiceStateChanged: "
+ + "Tearing down and re-setting up accounts.");
tearDownAccounts();
setupAccounts();
} else {
@@ -1285,6 +1289,7 @@
private int mActiveDataSubscriptionId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
private boolean mIsPrimaryUser = UserHandle.of(ActivityManager.getCurrentUser()).isSystem();
private ExponentialBackoff mRegisterSubscriptionListenerBackoff;
+ private ExponentialBackoff mTelecomReadyBackoff;
private final HandlerThread mHandlerThread = new HandlerThread("TelecomAccountRegistry");
// TODO: Remove back-pointer from app singleton to Service, since this is not a preferred
@@ -1303,6 +1308,53 @@
}
};
+ /**
+ * When {@link #setupOnBoot()} is called, there is a chance that Telecom is not up yet. This
+ * runnable checks whether or not Telecom is up and if it isn't we wait until ready.
+ */
+ private final Runnable mCheckTelecomReadyRunnable = new Runnable() {
+ @Override
+ public void run() {
+ if (isTelecomReady()) {
+ setupOnBootInternal();
+ } else {
+ mTelecomReadyBackoff.notifyFailed();
+ Log.i(this, "TelecomAccountRegistry: telecom not ready, retrying in "
+ + mTelecomReadyBackoff.getCurrentDelay() + " ms");
+ }
+ }
+ };
+
+ /**
+ * Test TelecomManager to determine if telecom is up yet.
+ * @return true if telecom is ready, false if it is not
+ */
+ private boolean isTelecomReady() {
+ if (mTelecomManager == null) {
+ Log.i(this, "TelecomAccountRegistry: isTelecomReady: "
+ + "telecom null");
+ return true;
+ }
+ try {
+ // Assumption: this method should not return null unless Telecom is not ready yet
+ String result = mTelecomManager.getSystemDialerPackage();
+ if (result == null) {
+ Log.i(this, "TelecomAccountRegistry: isTelecomReady: "
+ + "telecom not ready");
+ return false;
+ } else {
+ Log.i(this, "TelecomAccountRegistry: isTelecomReady: "
+ + "telecom ready");
+ return true;
+ }
+ } catch (Exception e) {
+ Log.i(this, "TelecomAccountRegistry: isTelecomReady: "
+ + "telecom exception");
+ // Any exception means that the service is at least up!
+ return true;
+ }
+ }
+
TelecomAccountRegistry(Context context) {
mContext = context;
mTelecomManager = context.getSystemService(TelecomManager.class);
@@ -1317,6 +1369,12 @@
2, /* multiplier */
mHandlerThread.getLooper(),
mRegisterOnSubscriptionsChangedListenerRunnable);
+ mTelecomReadyBackoff = new ExponentialBackoff(
+ TELECOM_CONNECT_START_DELAY_MS,
+ TELECOM_CONNECT_MAX_DELAY_MS,
+ 2, /* multiplier */
+ mContext.getMainLooper(),
+ mCheckTelecomReadyRunnable);
}
/**
@@ -1324,8 +1382,12 @@
*/
public static synchronized TelecomAccountRegistry getInstance(Context context) {
if (sInstance == null && context != null) {
- if (Flags.enforceTelephonyFeatureMappingForPublicApis()) {
- PackageManager pm = context.getPackageManager();
+ int vendorApiLevel = SystemProperties.getInt("ro.vendor.api_level",
+ Build.VERSION.DEVICE_INITIAL_SDK_INT);
+ PackageManager pm = context.getPackageManager();
+
+ if (Flags.enforceTelephonyFeatureMappingForPublicApis()
+ && vendorApiLevel >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
if (pm != null && pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
&& pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_CALLING)) {
sInstance = new TelecomAccountRegistry(context);
@@ -1334,7 +1396,14 @@
+ "missing telephony/calling feature(s)");
}
} else {
- sInstance = new TelecomAccountRegistry(context);
+ // One of features is defined, create instance
+ if (pm != null && (pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
+ || pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_CALLING))) {
+ sInstance = new TelecomAccountRegistry(context);
+ } else {
+ Log.d(LOG_TAG, "Not initializing TelecomAccountRegistry: "
+ + "missing telephony or calling feature(s)");
+ }
}
}
return sInstance;
@@ -1533,9 +1602,21 @@
}
/**
- * Sets up all the phone accounts for SIMs on first boot.
+ * Waits for Telecom to come up first and then sets up.
*/
public void setupOnBoot() {
+ if (Flags.delayPhoneAccountRegistration() && !isTelecomReady()) {
+ Log.i(this, "setupOnBoot: delaying start for Telecom...");
+ mTelecomReadyBackoff.start();
+ } else {
+ setupOnBootInternal();
+ }
+ }
+
+ /**
+ * Sets up all the phone accounts for SIMs on first boot.
+ */
+ private void setupOnBootInternal() {
// TODO: When this object "finishes" we should unregister by invoking
// SubscriptionManager.getInstance(mContext).unregister(mOnSubscriptionsChangedListener);
// This is not strictly necessary because it will be unregistered if the
@@ -1543,7 +1624,8 @@
// Register for SubscriptionInfo list changes which is guaranteed
// to invoke onSubscriptionsChanged the first time.
- Log.i(this, "TelecomAccountRegistry: setupOnBoot - register subscription listener");
+ Log.i(this, "TelecomAccountRegistry: setupOnBootInternal - register "
+ + "subscription listener");
SubscriptionManager.from(mContext).addOnSubscriptionsChangedListener(
mOnSubscriptionsChangedListener);
@@ -1687,6 +1769,21 @@
continue;
}
+ // Skip the sim for bootstrap
+ if (info.getProfileClass() == SubscriptionManager
+ .PROFILE_CLASS_PROVISIONING) {
+ Log.d(this, "setupAccounts: skipping bootstrap sub id "
+ + subscriptionId);
+ continue;
+ }
+
+ // Skip the sim for satellite as it does not support call for now
+ if (Flags.oemEnabledSatelliteFlag() && info.isOnlyNonTerrestrialNetwork()) {
+ Log.d(this, "setupAccounts: skipping satellite sub id "
+ + subscriptionId);
+ continue;
+ }
+
mAccounts.add(new AccountEntry(phone, false /* emergency */,
false /* isTest */));
}
diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 5bfad6b..3dbae8e 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -962,6 +962,7 @@
new ConcurrentHashMap<TelephonyConnectionListener, Boolean>(8, 0.9f, 1));
private Integer mEmergencyServiceCategory = null;
+ private List<String> mEmergencyUrns = null;
protected TelephonyConnection(com.android.internal.telephony.Connection originalConnection,
String callId, int callDirection) {
@@ -2505,6 +2506,7 @@
if (numberInfo != null) {
mEmergencyServiceCategory =
numberInfo.getEmergencyServiceCategoryBitmask();
+ mEmergencyUrns = numberInfo.getEmergencyUrns();
} else {
Log.i(this, "mEmergencyServiceCategory no EmergencyNumber");
}
@@ -2513,6 +2515,9 @@
Log.i(this, "mEmergencyServiceCategory="
+ mEmergencyServiceCategory);
}
+ if (mEmergencyUrns != null) {
+ Log.i(this, "mEmergencyUrns=" + mEmergencyUrns);
+ }
}
}
}
@@ -3930,4 +3935,21 @@
public void setEmergencyServiceCategory(int eccCategory) {
mEmergencyServiceCategory = eccCategory;
}
+
+ /**
+ * @return a {@link List} of {@link String}s that are the emrgency URNs.
+ */
+ public @Nullable List<String> getEmergencyUrns() {
+ return mEmergencyUrns;
+ }
+
+ /**
+ * Set the emergency URNs.
+ *
+ * @param emergencyUrns The emergency URNs.
+ */
+ @VisibleForTesting
+ public void setEmergencyUrns(@Nullable List<String> emergencyUrns) {
+ mEmergencyUrns = emergencyUrns;
+ }
}
diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index df87d4e..6a4ea3e 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -18,6 +18,8 @@
import static android.telephony.CarrierConfigManager.KEY_USE_ONLY_DIALED_SIM_ECC_LIST_BOOL;
import static android.telephony.DomainSelectionService.SELECTOR_TYPE_CALLING;
+import static android.telephony.ServiceState.STATE_EMERGENCY_ONLY;
+import static android.telephony.ServiceState.STATE_IN_SERVICE;
import static android.telephony.TelephonyManager.HAL_SERVICE_VOICE;
import static com.android.internal.telephony.PhoneConstants.PHONE_TYPE_GSM;
@@ -34,10 +36,12 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.PackageManager;
+import android.content.res.Resources;
import android.net.Uri;
import android.os.Bundle;
import android.os.ParcelUuid;
import android.os.PersistableBundle;
+import android.os.UserHandle;
import android.telecom.Conference;
import android.telecom.Conferenceable;
import android.telecom.Connection;
@@ -89,6 +93,8 @@
import com.android.internal.telephony.emergency.EmergencyStateTracker;
import com.android.internal.telephony.emergency.RadioOnHelper;
import com.android.internal.telephony.emergency.RadioOnStateListener;
+import com.android.internal.telephony.flags.FeatureFlags;
+import com.android.internal.telephony.flags.FeatureFlagsImpl;
import com.android.internal.telephony.flags.Flags;
import com.android.internal.telephony.imsphone.ImsExternalCallTracker;
import com.android.internal.telephony.imsphone.ImsPhone;
@@ -104,6 +110,7 @@
import com.android.phone.R;
import com.android.phone.callcomposer.CallComposerPictureManager;
import com.android.phone.settings.SuppServicesUiUtil;
+import com.android.services.telephony.domainselection.DynamicRoutingController;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
@@ -212,6 +219,9 @@
new TelephonyConferenceController(mTelephonyConnectionServiceProxy);
private final CdmaConferenceController mCdmaConferenceController =
new CdmaConferenceController(this);
+
+ private FeatureFlags mFeatureFlags = new FeatureFlagsImpl();
+
private ImsConferenceController mImsConferenceController;
private ComponentName mExpectedComponentName = null;
@@ -232,10 +242,13 @@
public Pair<WeakReference<TelephonyConnection>, Queue<Phone>> mEmergencyRetryCache;
private DeviceState mDeviceState = new DeviceState();
private EmergencyStateTracker mEmergencyStateTracker;
+ private DynamicRoutingController mDynamicRoutingController;
private SatelliteSOSMessageRecommender mSatelliteSOSMessageRecommender;
private DomainSelectionResolver mDomainSelectionResolver;
private EmergencyCallDomainSelectionConnection mEmergencyCallDomainSelectionConnection;
private TelephonyConnection mEmergencyConnection;
+ private TelephonyConnection mAlternateEmergencyConnection;
+ private TelephonyConnection mNormalRoutingEmergencyConnection;
private Executor mDomainSelectionMainExecutor;
private ImsManager mImsManager = null;
private DomainSelectionConnection mDomainSelectionConnection;
@@ -566,6 +579,22 @@
}
/**
+ * A listener for normal routing emergency calls.
+ */
+ private final TelephonyConnection.TelephonyConnectionListener
+ mNormalRoutingEmergencyConnectionListener =
+ new TelephonyConnection.TelephonyConnectionListener() {
+ @Override
+ public void onStateChanged(Connection connection,
+ @Connection.ConnectionState int state) {
+ TelephonyConnection c = (TelephonyConnection) connection;
+ Log.i(this, "onStateChanged normal routing callId=" + c.getTelecomCallId()
+ + ", state=" + state);
+ mEmergencyStateTracker.onNormalRoutingEmergencyCallStateChanged(c, state);
+ }
+ };
+
+ /**
* A listener for emergency calls.
*/
private final TelephonyConnection.TelephonyConnectionListener mEmergencyConnectionListener =
@@ -744,6 +773,15 @@
if (cause == android.telephony.DisconnectCause.EMERGENCY_TEMP_FAILURE
|| cause == android.telephony.DisconnectCause.EMERGENCY_PERM_FAILURE) {
if (mEmergencyConnection != null) {
+ if (Flags.hangupEmergencyCallForCrossSimRedialing()) {
+ if (mEmergencyConnection.getOriginalConnection() != null) {
+ if (mEmergencyConnection.getOriginalConnection()
+ .getState().isAlive()) {
+ mEmergencyConnection.hangup(cause);
+ }
+ return;
+ }
+ }
boolean isPermanentFailure =
cause == android.telephony.DisconnectCause.EMERGENCY_PERM_FAILURE;
Log.i(this, "onSelectionTerminated permanent=" + isPermanentFailure);
@@ -1121,7 +1159,7 @@
// so they will only need the special emergency call setup when the phone is out of
// service.
if (phone == null || phone.getServiceState().getState()
- != ServiceState.STATE_IN_SERVICE) {
+ != STATE_IN_SERVICE) {
String convertedNumber = mPhoneNumberUtilsProxy.convertToEmergencyNumber(this,
number);
if (!TextUtils.equals(convertedNumber, number)) {
@@ -1135,26 +1173,50 @@
final boolean isAirplaneModeOn = mDeviceState.isAirplaneModeOn(this);
- boolean needToTurnOffSatellite = isSatelliteBlockingCall(isEmergencyNumber);
-
// Get the right phone object from the account data passed in.
final Phone phone = getPhoneForAccount(request.getAccountHandle(), isEmergencyNumber,
/* Note: when not an emergency, handle can be null for unknown callers */
handle == null ? null : handle.getSchemeSpecificPart());
ImsPhone imsPhone = phone != null ? (ImsPhone) phone.getImsPhone() : null;
+ boolean needToTurnOffSatellite = shouldExitSatelliteModeForEmergencyCall(isEmergencyNumber);
+
boolean isPhoneWifiCallingEnabled = phone != null && phone.isWifiCallingEnabled();
boolean needToTurnOnRadio = (isEmergencyNumber && (!isRadioOn() || isAirplaneModeOn))
|| (isRadioPowerDownOnBluetooth() && !isPhoneWifiCallingEnabled);
+ if (mSatelliteController.isSatelliteEnabled()
+ || mSatelliteController.isSatelliteBeingEnabled()) {
+ Log.d(this, "onCreateOutgoingConnection, "
+ + " needToTurnOnRadio=" + needToTurnOnRadio
+ + " needToTurnOffSatellite=" + needToTurnOffSatellite
+ + " isEmergencyNumber=" + isEmergencyNumber);
+
+ if (!needToTurnOffSatellite) {
+ // Block outgoing call and do not turn off satellite
+ Log.d(this, "onCreateOutgoingConnection, "
+ + "cannot make call in satellite mode.");
+ return Connection.createFailedConnection(
+ mDisconnectCauseFactory.toTelecomDisconnectCause(
+ android.telephony.DisconnectCause.SATELLITE_ENABLED,
+ DISCONNECT_REASON_SATELLITE_ENABLED));
+ }
+ }
+
+ boolean forNormalRoutingEmergencyCall = false;
if (mDomainSelectionResolver.isDomainSelectionSupported()) {
- // Normal routing emergency number shall be handled by normal call domain selctor.
- if (isEmergencyNumber && !isNormalRouting(phone, number)) {
- final Connection resultConnection =
- placeEmergencyConnection(phone,
- request, numberToDial, isTestEmergencyNumber,
- handle, needToTurnOnRadio);
- if (resultConnection != null) return resultConnection;
+ if (isEmergencyNumber) {
+ // Normal routing emergency number shall be handled by normal call domain selector.
+ int routing = getEmergencyCallRouting(phone, number, needToTurnOnRadio);
+ if (routing != EmergencyNumber.EMERGENCY_CALL_ROUTING_NORMAL) {
+ final Connection resultConnection =
+ placeEmergencyConnection(phone,
+ request, numberToDial, isTestEmergencyNumber,
+ handle, needToTurnOnRadio, routing);
+ if (resultConnection != null) return resultConnection;
+ }
+ forNormalRoutingEmergencyCall = true;
+ Log.d(this, "onCreateOutgoingConnection, forNormalRoutingEmergencyCall");
}
}
@@ -1169,6 +1231,11 @@
if (isEmergencyNumber) {
mIsEmergencyCallPending = true;
+ if (mDomainSelectionResolver.isDomainSelectionSupported()) {
+ if (resultConnection instanceof TelephonyConnection) {
+ setNormalRoutingEmergencyConnection((TelephonyConnection)resultConnection);
+ }
+ }
}
int timeoutToOnTimeoutCallback = mDomainSelectionResolver.isDomainSelectionSupported()
? TIMEOUT_TO_DYNAMIC_ROUTING_MS : 0;
@@ -1220,7 +1287,8 @@
// reporting the OUT_OF_SERVICE state.
return phone.getState() == PhoneConstants.State.OFFHOOK
|| (phone.getServiceStateTracker().isRadioOn()
- && !mSatelliteController.isSatelliteEnabled());
+ && (!mSatelliteController.isSatelliteEnabled()
+ && !mSatelliteController.isSatelliteBeingEnabled()));
} else {
SubscriptionInfoInternal subInfo = SubscriptionManagerService
.getInstance().getSubscriptionInfoInternal(phone.getSubId());
@@ -1232,12 +1300,12 @@
return phone.getState() == PhoneConstants.State.OFFHOOK
// Do not wait for voice in service on opportunistic SIMs.
|| subInfo != null && subInfo.isOpportunistic()
- || (serviceState == ServiceState.STATE_IN_SERVICE
- && !isSatelliteBlockingCall(isEmergencyNumber));
+ || (serviceState == STATE_IN_SERVICE
+ && !needToTurnOffSatellite);
}
}
}, isEmergencyNumber && !isTestEmergencyNumber, phone, isTestEmergencyNumber,
- timeoutToOnTimeoutCallback);
+ timeoutToOnTimeoutCallback, forNormalRoutingEmergencyCall);
// Return the still unconnected GsmConnection and wait for the Radios to boot before
// connecting it to the underlying Phone.
return resultConnection;
@@ -1254,14 +1322,7 @@
}
if (!isEmergencyNumber) {
- if (mSatelliteController.isSatelliteEnabled()) {
- Log.d(this, "onCreateOutgoingConnection, cannot make call in "
- + "satellite mode.");
- return Connection.createFailedConnection(
- mDisconnectCauseFactory.toTelecomDisconnectCause(
- android.telephony.DisconnectCause.SATELLITE_ENABLED,
- DISCONNECT_REASON_SATELLITE_ENABLED));
- } else if (isCallDisallowedDueToSatellite(phone)
+ if (isCallDisallowedDueToSatellite(phone)
&& (imsPhone == null || !imsPhone.canMakeWifiCall())) {
Log.d(this, "onCreateOutgoingConnection, cannot make call "
+ "when device is connected to carrier roaming satellite network");
@@ -1304,6 +1365,12 @@
final Connection resultConnection = getTelephonyConnection(request, numberToDial,
true, handle, phone);
+ if (mDomainSelectionResolver.isDomainSelectionSupported()) {
+ if (resultConnection instanceof TelephonyConnection) {
+ setNormalRoutingEmergencyConnection((TelephonyConnection)resultConnection);
+ }
+ }
+
CompletableFuture<Void> maybeHoldFuture =
checkAndHoldCallsOnOtherSubsForEmergencyCall(request,
resultConnection, phone);
@@ -1433,7 +1500,7 @@
});
}
} else {
- if (isSatelliteBlockingCall(isEmergencyNumber)) {
+ if (shouldExitSatelliteModeForEmergencyCall(isEmergencyNumber)) {
Log.w(LOG_TAG, "handleOnComplete, failed to turn off satellite modem");
closeOrDestroyConnection(originalConnection,
mDisconnectCauseFactory.toTelecomDisconnectCause(
@@ -1522,7 +1589,7 @@
simUnlockUiPackage, simUnlockUiClass));
simUnlockIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
try {
- context.startActivity(simUnlockIntent);
+ context.startActivityAsUser(simUnlockIntent, UserHandle.CURRENT);
} catch (ActivityNotFoundException exception) {
Log.e(this, exception, "Unable to find SIM unlock UI activity.");
}
@@ -1574,8 +1641,8 @@
if (!isEmergencyNumber) {
switch (state) {
- case ServiceState.STATE_IN_SERVICE:
- case ServiceState.STATE_EMERGENCY_ONLY:
+ case STATE_IN_SERVICE:
+ case STATE_EMERGENCY_ONLY:
break;
case ServiceState.STATE_OUT_OF_SERVICE:
if (phone.isUtEnabled() && number.endsWith("#")) {
@@ -1840,7 +1907,6 @@
// different underlying signaling (CDMA), which is already encapsulated in
// TelephonyConnection.
connection.onReject();
- connection.close();
}
/**
@@ -2074,7 +2140,7 @@
return imsPhone != null
&& (imsPhone.isVoiceOverCellularImsEnabled() || imsPhone.isWifiCallingEnabled())
- && (imsPhone.getServiceState().getState() == ServiceState.STATE_IN_SERVICE);
+ && (imsPhone.getServiceState().getState() == STATE_IN_SERVICE);
}
private boolean isRadioOn() {
@@ -2085,12 +2151,49 @@
return result;
}
- private boolean isSatelliteBlockingCall(boolean isEmergencyNumber) {
- if (isEmergencyNumber) {
- return mSatelliteController.isSatelliteEnabled();
- } else {
- return mSatelliteController.isDemoModeEnabled();
+ private boolean shouldExitSatelliteModeForEmergencyCall(boolean isEmergencyNumber) {
+ if (!mSatelliteController.isSatelliteEnabled()
+ && !mSatelliteController.isSatelliteBeingEnabled()) {
+ return false;
}
+
+ if (isEmergencyNumber) {
+ if (mSatelliteController.isDemoModeEnabled()) {
+ // If user makes emergency call in demo mode, end the satellite session
+ return true;
+ } else if (mFeatureFlags.carrierRoamingNbIotNtn()
+ && !mSatelliteController.getRequestIsEmergency()) {
+ // If satellite is not for emergency, end the satellite session
+ return true;
+ } else { // satellite is for emergency
+ if (mFeatureFlags.carrierRoamingNbIotNtn()) {
+ Phone satellitePhone = mSatelliteController.getSatellitePhone();
+ if (satellitePhone == null) {
+ loge("satellite is/being enabled, but satellitePhone is null");
+ return false;
+ }
+ SubscriptionInfoInternal info = SubscriptionManagerService.getInstance()
+ .getSubscriptionInfoInternal(satellitePhone.getSubId());
+ if (info == null) {
+ loge("satellite is/being enabled, but satellite sub "
+ + satellitePhone.getSubId() + " is null");
+ return false;
+ }
+
+ if (info.getOnlyNonTerrestrialNetwork() == 1) {
+ // OEM
+ return getTurnOffOemEnabledSatelliteDuringEmergencyCall();
+ } else {
+ // Carrier
+ return mSatelliteController.shouldTurnOffCarrierSatelliteForEmergencyCall();
+ }
+ } else {
+ return getTurnOffOemEnabledSatelliteDuringEmergencyCall();
+ }
+ }
+ }
+
+ return false;
}
private Pair<WeakReference<TelephonyConnection>, Queue<Phone>> makeCachedConnectionPhonePair(
@@ -2166,7 +2269,7 @@
updatePhoneAccount(c, newPhoneToUse);
}
if (mDomainSelectionResolver.isDomainSelectionSupported()) {
- onEmergencyRedial(c, newPhoneToUse);
+ onEmergencyRedial(c, newPhoneToUse, false);
return;
}
placeOutgoingConnection(c, newPhoneToUse, videoState, connExtras);
@@ -2263,12 +2366,58 @@
}
}
if (mDomainSelectionResolver.isDomainSelectionSupported()) {
- if (isNormalRouting(phone, number)
- && handleOutgoingCallConnection(number, connection,
- phone, videoState)) {
- /** Normal routing emergency number shall be handled
- * by normal call domain selctor.*/
+ mIsEmergencyCallPending = false;
+ if (connection == mNormalRoutingEmergencyConnection) {
+ if (getEmergencyCallRouting(phone, number, false)
+ != EmergencyNumber.EMERGENCY_CALL_ROUTING_NORMAL) {
+ Log.i(this, "placeOutgoingConnection dynamic routing");
+ // A normal routing number is dialed when airplane mode is enabled,
+ // but normal service is not acquired.
+ setNormalRoutingEmergencyConnection(null);
+ mAlternateEmergencyConnection = connection;
+ onEmergencyRedial(connection, phone, true);
+ return;
+ }
+ /* Normal routing emergency number shall be handled
+ * by normal call domain selector.*/
Log.i(this, "placeOutgoingConnection normal routing number");
+ mEmergencyStateTracker.startNormalRoutingEmergencyCall(
+ phone, connection, result -> {
+ Log.i(this, "placeOutgoingConnection normal routing number:"
+ + " result = " + result);
+ if (connection.getState()
+ == Connection.STATE_DISCONNECTED) {
+ Log.i(this, "placeOutgoingConnection "
+ + "reject incoming, dialing canceled");
+ return;
+ }
+ if (!handleOutgoingCallConnection(number, connection,
+ phone, videoState)) {
+ Log.w(this, "placeOriginalConnection - Unexpected, "
+ + "domain selector not available.");
+ // Notify EmergencyStateTracker to reset the state.
+ onLocalHangup(connection);
+ // Try dialing without domain selection
+ // as a best-effort.
+ try {
+ // EmergencyStateTracker ensures this is
+ // on the main thread.
+ connection.setOriginalConnection(phone.dial(number,
+ new ImsPhone.ImsDialArgs.Builder()
+ .setVideoState(videoState)
+ .setIntentExtras(extras)
+ .setRttTextStream(
+ connection.getRttTextStream())
+ .build(),
+ connection::registerForCallEvents));
+ } catch (CallStateException e) {
+ connection.unregisterForCallEvents();
+ handleCallStateException(e, connection, phone);
+ }
+ }
+ });
+ connection.addTelephonyConnectionListener(
+ mNormalRoutingEmergencyConnectionListener);
return;
}
}
@@ -2336,12 +2485,37 @@
if (SubscriptionManager.isValidSubscriptionId(subId)) {
SubscriptionManager.putSubscriptionIdExtra(intent, subId);
}
- startActivity(intent);
+ startActivityAsUser(intent, UserHandle.CURRENT);
}
return disconnectCause;
}
private void handleOutgoingCallConnectionByCallDomainSelection(
+ int domain, Phone phone, String number, int videoState,
+ TelephonyConnection connection) {
+ if (mNormalRoutingEmergencyConnection == connection) {
+ CompletableFuture<Void> rejectFuture = checkAndRejectIncomingCall(phone, (ret) -> {
+ if (!ret) {
+ Log.i(this, "handleOutgoingCallConnectionByCallDomainSelection "
+ + "reject incoming call failed");
+ }
+ });
+ CompletableFuture<Void> unused = rejectFuture.thenRun(() -> {
+ if (connection.getState() == Connection.STATE_DISCONNECTED) {
+ Log.i(this, "handleOutgoingCallConnectionByCallDomainSelection "
+ + "reject incoming, dialing canceled");
+ return;
+ }
+ handleOutgoingCallConnectionByCallDomainSelection(
+ domain, phone, number, videoState);
+ });
+ return;
+ }
+
+ handleOutgoingCallConnectionByCallDomainSelection(domain, phone, number, videoState);
+ }
+
+ private void handleOutgoingCallConnectionByCallDomainSelection(
int domain, Phone phone, String number, int videoState) {
Log.d(this, "Call Domain Selected : " + domain);
try {
@@ -2443,7 +2617,7 @@
Log.d(LOG_TAG, "Selecting same domain as ongoing call on same subId");
mNormalCallConnection = connection;
handleOutgoingCallConnectionByCallDomainSelection(
- activeCallDomain, phone, number, videoState);
+ activeCallDomain, phone, number, videoState, connection);
return true;
}
@@ -2470,7 +2644,7 @@
mNormalCallConnection = connection;
future.thenAcceptAsync((domain) -> handleOutgoingCallConnectionByCallDomainSelection(
- domain, phone, number, videoState), mDomainSelectionMainExecutor);
+ domain, phone, number, videoState, connection), mDomainSelectionMainExecutor);
if (isPotentialUssdCode) {
Log.v(LOG_TAG, "PotentialUssdCode. Closing connection with DisconnectCause.DIALED_MMI");
@@ -2487,7 +2661,7 @@
private Connection placeEmergencyConnection(
final Phone phone, final ConnectionRequest request,
final String numberToDial, final boolean isTestEmergencyNumber,
- final Uri handle, final boolean needToTurnOnRadio) {
+ final Uri handle, final boolean needToTurnOnRadio, int routing) {
final Connection resultConnection =
getTelephonyConnection(request, numberToDial, true, handle, phone);
@@ -2497,6 +2671,11 @@
mIsEmergencyCallPending = true;
mEmergencyConnection = (TelephonyConnection) resultConnection;
+ if (routing == EmergencyNumber.EMERGENCY_CALL_ROUTING_EMERGENCY) {
+ mAlternateEmergencyConnection = (TelephonyConnection) resultConnection;
+ }
+ handleEmergencyCallStartedForSatelliteSOSMessageRecommender(mEmergencyConnection,
+ phone);
}
CompletableFuture<Void> maybeHoldFuture =
@@ -2541,8 +2720,15 @@
createEmergencyConnection(phone, (TelephonyConnection) resultConnection,
numberToDial, isTestEmergencyNumber, request, needToTurnOnRadio,
mEmergencyStateTracker.getEmergencyRegistrationResult());
+ } else if (result == android.telephony.DisconnectCause.EMERGENCY_PERM_FAILURE) {
+ mEmergencyConnection.removeTelephonyConnectionListener(
+ mEmergencyConnectionListener);
+ TelephonyConnection c = mEmergencyConnection;
+ releaseEmergencyCallDomainSelection(true, false);
+ retryOutgoingOriginalConnection(c, phone, true);
} else {
mEmergencyConnection = null;
+ mAlternateEmergencyConnection = null;
String reason = "Couldn't setup emergency call";
if (result == android.telephony.DisconnectCause.POWER_OFF) {
reason = "Failed to turn on radio.";
@@ -2571,17 +2757,6 @@
return;
}
- ImsManager imsManager = mImsManager;
- if (imsManager == null) {
- // mImsManager is not null only while unit test.
- imsManager = ImsManager.getInstance(phone.getContext(), phone.getPhoneId());
- }
- if (!imsManager.isNonTtyOrTtyOnVolteEnabled()) {
- Log.w(this, "createEmergencyConnection - TTY on VoLTE is not supported.");
- dialCsEmergencyCall(phone, resultConnection, request);
- return;
- }
-
DomainSelectionConnection selectConnection =
mDomainSelectionResolver.getDomainSelectionConnection(
phone, SELECTOR_TYPE_CALLING, true);
@@ -2615,13 +2790,22 @@
}
Bundle extras = request.getExtras();
extras.putInt(PhoneConstants.EXTRA_DIAL_DOMAIN, result);
+ if (resultConnection == mAlternateEmergencyConnection) {
+ extras.putBoolean(PhoneConstants.EXTRA_USE_EMERGENCY_ROUTING, true);
+ }
CompletableFuture<Void> rejectFuture = checkAndRejectIncomingCall(phone, (ret) -> {
if (!ret) {
Log.i(this, "createEmergencyConnection reject incoming call failed");
}
});
- rejectFuture.thenRun(() -> placeEmergencyConnectionOnSelectedDomain(request,
- resultConnection, phone));
+ rejectFuture.thenRun(() -> {
+ if (resultConnection.getState() == Connection.STATE_DISCONNECTED) {
+ Log.i(this, "createEmergencyConnection "
+ + "reject incoming, dialing canceled");
+ return;
+ }
+ placeEmergencyConnectionOnSelectedDomain(request, resultConnection, phone);
+ });
}, mDomainSelectionMainExecutor);
}
@@ -2641,8 +2825,14 @@
Log.i(this, "dialCsEmergencyCall reject incoming call failed");
}
});
- future.thenRun(() -> placeEmergencyConnectionOnSelectedDomain(request,
- resultConnection, phone));
+ CompletableFuture<Void> unused = future.thenRun(() -> {
+ if (resultConnection.getState() == Connection.STATE_DISCONNECTED) {
+ Log.i(this, "dialCsEmergencyCall "
+ + "reject incoming, dialing canceled");
+ return;
+ }
+ placeEmergencyConnectionOnSelectedDomain(request, resultConnection, phone);
+ });
});
}
@@ -2663,6 +2853,7 @@
mEmergencyCallDomainSelectionConnection = null;
}
mIsEmergencyCallPending = false;
+ mAlternateEmergencyConnection = null;
if (!isActive) {
mEmergencyConnection = null;
}
@@ -2702,13 +2893,15 @@
int extraCode = reasonInfo.getExtraCode();
if ((reasonCode == ImsReasonInfo.CODE_SIP_ALTERNATE_EMERGENCY_CALL)
|| (reasonCode == ImsReasonInfo.CODE_LOCAL_CALL_CS_RETRY_REQUIRED
- && extraCode == ImsReasonInfo.EXTRA_CODE_CALL_RETRY_EMERGENCY)) {
+ && extraCode == ImsReasonInfo.EXTRA_CODE_CALL_RETRY_EMERGENCY
+ && mNormalRoutingEmergencyConnection != c)) {
// clear normal call domain selector
c.removeTelephonyConnectionListener(mNormalCallConnectionListener);
clearNormalCallDomainSelectionConnection();
mNormalCallConnection = null;
- onEmergencyRedial(c, c.getPhone().getDefaultPhone());
+ mAlternateEmergencyConnection = c;
+ onEmergencyRedial(c, c.getPhone().getDefaultPhone(), false);
return true;
}
}
@@ -2723,9 +2916,19 @@
+ "csCause=" + callFailCause + ", psCause=" + reasonInfo
+ ", showPreciseCause=" + showPreciseCause + ", overrideCause=" + overrideCause);
- if (c.getOriginalConnection() != null
+ boolean isLocalHangup = c.getOriginalConnection() != null
&& c.getOriginalConnection().getDisconnectCause()
- != android.telephony.DisconnectCause.LOCAL
+ == android.telephony.DisconnectCause.LOCAL;
+
+ // Do not treat it as local hangup if it is a cross-sim redial.
+ if (Flags.hangupEmergencyCallForCrossSimRedialing()) {
+ isLocalHangup = isLocalHangup
+ && overrideCause != android.telephony.DisconnectCause.EMERGENCY_TEMP_FAILURE
+ && overrideCause != android.telephony.DisconnectCause.EMERGENCY_PERM_FAILURE;
+ }
+
+ // If it is neither a local hangup nor a power off hangup, then reselect domain.
+ if (c.getOriginalConnection() != null && (!isLocalHangup)
&& c.getOriginalConnection().getDisconnectCause()
!= android.telephony.DisconnectCause.POWER_OFF) {
@@ -2786,6 +2989,26 @@
return true;
}
+ private int getEmergencyCallRouting(Phone phone, String number, boolean needToTurnOnRadio) {
+ if (phone == null) {
+ return EmergencyNumber.EMERGENCY_CALL_ROUTING_UNKNOWN;
+ }
+ // This method shall be called only if AOSP domain selection is enabled.
+ if (mDynamicRoutingController == null) {
+ mDynamicRoutingController = DynamicRoutingController.getInstance();
+ }
+ if (mDynamicRoutingController.isDynamicRoutingEnabled()) {
+ return mDynamicRoutingController.getEmergencyCallRouting(phone, number,
+ isNormalRoutingNumber(phone, number),
+ isEmergencyNumberAllowedOnDialedSim(phone, number),
+ needToTurnOnRadio);
+ }
+
+ return isNormalRouting(phone, number)
+ ? EmergencyNumber.EMERGENCY_CALL_ROUTING_NORMAL
+ : EmergencyNumber.EMERGENCY_CALL_ROUTING_UNKNOWN;
+ }
+
private boolean isNormalRouting(Phone phone, String number) {
// Check isEmergencyNumberAllowedOnDialedSim(): some carriers do not want to handle
// dial requests for numbers which are in the emergency number list on another SIM,
@@ -2849,7 +3072,7 @@
}
ServiceState ss = phone.getServiceStateTracker().getServiceState();
- if (ss.getState() != ServiceState.STATE_IN_SERVICE) return false;
+ if (ss.getState() != STATE_IN_SERVICE) return false;
NetworkRegistrationInfo regState = ss.getNetworkRegistrationInfo(
NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
@@ -2920,7 +3143,7 @@
mNormalCallConnection = c;
future.thenAcceptAsync((result) -> {
- onNormalCallRedial(c, phone, result, videoState);
+ onNormalCallRedial(phone, result, videoState, c);
}, mDomainSelectionMainExecutor);
return true;
}
@@ -2940,13 +3163,31 @@
final Bundle extras = new Bundle();
extras.putInt(PhoneConstants.EXTRA_DIAL_DOMAIN, domain);
+ if (connection == mAlternateEmergencyConnection) {
+ extras.putBoolean(PhoneConstants.EXTRA_USE_EMERGENCY_ROUTING, true);
+ if (connection.getEmergencyServiceCategory() != null) {
+ extras.putInt(PhoneConstants.EXTRA_EMERGENCY_SERVICE_CATEGORY,
+ connection.getEmergencyServiceCategory());
+ }
+ if (connection.getEmergencyUrns() != null) {
+ extras.putStringArrayList(PhoneConstants.EXTRA_EMERGENCY_URNS,
+ new ArrayList<>(connection.getEmergencyUrns()));
+ }
+ }
CompletableFuture<Void> future = checkAndRejectIncomingCall(phone, (ret) -> {
if (!ret) {
Log.i(this, "onEmergencyRedialOnDomain reject incoming call failed");
}
});
- future.thenRun(() -> onEmergencyRedialOnDomainInternal(connection, phone, extras));
+ CompletableFuture<Void> unused = future.thenRun(() -> {
+ if (connection.getState() == Connection.STATE_DISCONNECTED) {
+ Log.i(this, "onEmergencyRedialOnDomain "
+ + "reject incoming, dialing canceled");
+ return;
+ }
+ onEmergencyRedialOnDomainInternal(connection, phone, extras);
+ });
}
private void onEmergencyRedialOnDomainInternal(TelephonyConnection connection,
@@ -3001,8 +3242,10 @@
}
@SuppressWarnings("FutureReturnValueIgnored")
- private void onEmergencyRedial(final TelephonyConnection c, final Phone phone) {
- Log.i(this, "onEmergencyRedial phoneId=" + phone.getPhoneId());
+ private void onEmergencyRedial(final TelephonyConnection c, final Phone phone,
+ boolean airplaneMode) {
+ Log.i(this, "onEmergencyRedial phoneId=" + phone.getPhoneId()
+ + ", ariplaneMode=" + airplaneMode);
final String number = c.getAddress().getSchemeSpecificPart();
final boolean isTestEmergencyNumber = isEmergencyNumberTestNumber(number);
@@ -3044,7 +3287,7 @@
DomainSelectionService.SelectionAttributes attr =
EmergencyCallDomainSelectionConnection.getSelectionAttributes(
phone.getPhoneId(),
- phone.getSubId(), false,
+ phone.getSubId(), airplaneMode,
c.getTelecomCallId(),
c.getAddress().getSchemeSpecificPart(), isTestEmergencyNumber,
0, null, mEmergencyStateTracker.getEmergencyRegistrationResult());
@@ -3058,8 +3301,15 @@
recreateEmergencyConnection(c, phone, domain);
mIsEmergencyCallPending = false;
}, mDomainSelectionMainExecutor);
+ } else if (result == android.telephony.DisconnectCause.EMERGENCY_PERM_FAILURE) {
+ mEmergencyConnection.removeTelephonyConnectionListener(
+ mEmergencyConnectionListener);
+ TelephonyConnection ec = mEmergencyConnection;
+ releaseEmergencyCallDomainSelection(true, false);
+ retryOutgoingOriginalConnection(ec, phone, true);
} else {
mEmergencyConnection = null;
+ mAlternateEmergencyConnection = null;
c.setTelephonyConnectionDisconnected(
mDisconnectCauseFactory.toTelecomDisconnectCause(result, "unknown error"));
c.close();
@@ -3112,6 +3362,28 @@
onEmergencyRedialOnDomain(connection, phone, result);
}
+ private void onNormalCallRedial(Phone phone, @NetworkRegistrationInfo.Domain int domain,
+ int videoState, TelephonyConnection connection) {
+ if (mNormalRoutingEmergencyConnection == connection) {
+ CompletableFuture<Void> rejectFuture = checkAndRejectIncomingCall(phone, (ret) -> {
+ if (!ret) {
+ Log.i(this, "onNormalCallRedial reject incoming call failed");
+ }
+ });
+ CompletableFuture<Void> unused = rejectFuture.thenRun(() -> {
+ if (connection.getState() == Connection.STATE_DISCONNECTED) {
+ Log.i(this, "onNormalCallRedial "
+ + "reject incoming, dialing canceled");
+ return;
+ }
+ onNormalCallRedial(connection, phone, domain, videoState);
+ });
+ return;
+ }
+
+ onNormalCallRedial(connection, phone, domain, videoState);
+ }
+
private void onNormalCallRedial(TelephonyConnection connection, Phone phone,
@NetworkRegistrationInfo.Domain int domain, int videocallState) {
@@ -3162,6 +3434,12 @@
releaseEmergencyCallDomainSelection(true, false);
mEmergencyStateTracker.endCall(c);
}
+ if (mNormalRoutingEmergencyConnection == c) {
+ Log.i(this, "onLocalHangup normal routing " + c.getTelecomCallId());
+ mNormalRoutingEmergencyConnection = null;
+ mEmergencyStateTracker.endNormalRoutingEmergencyCall(c);
+ mIsEmergencyCallPending = false;
+ }
}
@VisibleForTesting
@@ -3180,6 +3458,22 @@
}
@VisibleForTesting
+ public TelephonyConnection getNormalRoutingEmergencyConnection() {
+ return mNormalRoutingEmergencyConnection;
+ }
+
+ @VisibleForTesting
+ public void setNormalRoutingEmergencyConnection(TelephonyConnection c) {
+ mNormalRoutingEmergencyConnection = c;
+ }
+
+ @VisibleForTesting
+ public TelephonyConnection.TelephonyConnectionListener
+ getNormalRoutingEmergencyConnectionListener() {
+ return mNormalRoutingEmergencyConnectionListener;
+ }
+
+ @VisibleForTesting
public TelephonyConnection.TelephonyConnectionListener
getEmergencyConnectionSatelliteListener() {
return mEmergencyConnectionSatelliteListener;
@@ -3568,9 +3862,20 @@
}
Call ringingCall = phone.getRingingCall();
- if (ringingCall == null || !ringingCall.isRinging()) {
- completeConsumer.accept(true);
- return CompletableFuture.completedFuture(null);
+ if (ringingCall == null
+ || ringingCall.getState() == Call.State.IDLE
+ || ringingCall.getState() == Call.State.DISCONNECTED) {
+ // Check the ImsPhoneCall in DISCONNECTING state.
+ Phone imsPhone = phone.getImsPhone();
+ if (imsPhone != null) {
+ ringingCall = imsPhone.getRingingCall();
+ }
+ if (imsPhone == null || ringingCall == null
+ || ringingCall.getState() == Call.State.IDLE
+ || ringingCall.getState() == Call.State.DISCONNECTED) {
+ completeConsumer.accept(true);
+ return CompletableFuture.completedFuture(null);
+ }
}
Log.i(this, "checkAndRejectIncomingCall found a ringing call");
@@ -3841,7 +4146,7 @@
@VisibleForTesting
public boolean isAvailableForEmergencyCalls(Phone phone,
@EmergencyNumber.EmergencyCallRouting int routing) {
- if (isCallDisallowedDueToSatellite(phone)) {
+ if (isCallDisallowedDueToSatellite(phone) && isTerrestrialNetworkAvailable()) {
// Phone is connected to satellite due to which it is not preferred for emergency call.
return false;
}
@@ -3855,7 +4160,7 @@
}
// In service phones are always appropriate for emergency calls.
- if (ServiceState.STATE_IN_SERVICE == phone.getServiceState().getState()) {
+ if (STATE_IN_SERVICE == phone.getServiceState().getState()) {
return true;
}
@@ -3866,6 +4171,23 @@
&& phone.getServiceState().isEmergencyOnly());
}
+ private boolean isTerrestrialNetworkAvailable() {
+ for (Phone phone : mPhoneFactoryProxy.getPhones()) {
+ ServiceState serviceState = phone.getServiceState();
+ if (serviceState != null) {
+ int state = serviceState.getState();
+ if ((state == STATE_IN_SERVICE || state == STATE_EMERGENCY_ONLY
+ || serviceState.isEmergencyOnly())
+ && !serviceState.isUsingNonTerrestrialNetwork()) {
+ Log.d(this, "isTerrestrialNetworkAvailable true");
+ return true;
+ }
+ }
+ }
+ Log.d(this, "isTerrestrialNetworkAvailable false");
+ return false;
+ }
+
/**
* Determines if the connection should allow mute.
*
@@ -4060,9 +4382,9 @@
context.getString(
R.string.mobile_network_settings_package),
context.getString(
- R.string.mobile_network_settings_class));
+ R.string.sims_settings_class));
intent.setComponent(mobileNetworkSettingsComponent);
- context.startActivity(intent);
+ context.startActivityAsUser(intent, UserHandle.CURRENT);
}
};
Dialog dialog = builder.setMessage(message)
@@ -4505,8 +4827,14 @@
mSatelliteSOSMessageRecommender = new SatelliteSOSMessageRecommender(phone.getContext(),
phone.getContext().getMainLooper());
}
+
+ String number = connection.getAddress().getSchemeSpecificPart();
+ final boolean isTestEmergencyNumber = isEmergencyNumberTestNumber(number);
+
connection.addTelephonyConnectionListener(mEmergencyConnectionSatelliteListener);
- mSatelliteSOSMessageRecommender.onEmergencyCallStarted(connection);
+ mSatelliteSOSMessageRecommender.onEmergencyCallStarted(connection, isTestEmergencyNumber);
+ mSatelliteSOSMessageRecommender.onEmergencyCallConnectionStateChanged(
+ connection.getTelecomCallId(), connection.STATE_DIALING);
}
/**
@@ -4539,4 +4867,25 @@
// Call is disallowed while using satellite
return true;
}
+
+ private boolean getTurnOffOemEnabledSatelliteDuringEmergencyCall() {
+ boolean turnOffSatellite = false;
+ try {
+ turnOffSatellite = getApplicationContext().getResources().getBoolean(
+ R.bool.config_turn_off_oem_enabled_satellite_during_emergency_call);
+ } catch (Resources.NotFoundException ex) {
+ Log.e(this, ex, "getTurnOffOemEnabledSatelliteDuringEmergencyCall: ex=" + ex);
+ }
+ return turnOffSatellite;
+ }
+
+ /* Only for testing */
+ @VisibleForTesting
+ public void setFeatureFlags(FeatureFlags featureFlags) {
+ mFeatureFlags = featureFlags;
+ }
+
+ private void loge(String s) {
+ Log.d(this, s);
+ }
}
diff --git a/src/com/android/services/telephony/domainselection/CrossSimRedialingController.java b/src/com/android/services/telephony/domainselection/CrossSimRedialingController.java
index d368d46..3a69459 100644
--- a/src/com/android/services/telephony/domainselection/CrossSimRedialingController.java
+++ b/src/com/android/services/telephony/domainselection/CrossSimRedialingController.java
@@ -227,6 +227,8 @@
if (isThereOtherSlot()) {
mSelector.notifyCrossStackTimerExpired();
+ } else if (!mPermanentRejectedSlots.isEmpty()) {
+ mSelector.maybeHangupOngoingDialing();
}
}
diff --git a/src/com/android/services/telephony/domainselection/DynamicRoutingController.java b/src/com/android/services/telephony/domainselection/DynamicRoutingController.java
new file mode 100644
index 0000000..2690847
--- /dev/null
+++ b/src/com/android/services/telephony/domainselection/DynamicRoutingController.java
@@ -0,0 +1,389 @@
+/*
+ * Copyright (C) 2024 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.services.telephony.domainselection;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Resources;
+import android.os.SystemProperties;
+import android.telephony.PhoneNumberUtils;
+import android.telephony.ServiceState;
+import android.telephony.TelephonyManager;
+import android.telephony.emergency.EmergencyNumber;
+import android.text.TextUtils;
+import android.util.ArrayMap;
+import android.util.Log;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.telephony.LocaleTracker;
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneConstants;
+import com.android.internal.telephony.PhoneFactory;
+import com.android.internal.telephony.ServiceStateTracker;
+import com.android.phone.R;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Manages dynamic routing of emergency numbers.
+ *
+ * Normal routing shall be tried if noraml service is available.
+ * Otherwise, emergency routing shall be tried.
+ */
+public class DynamicRoutingController {
+ private static final String TAG = "DynamicRoutingController";
+ private static final boolean DBG = (SystemProperties.getInt("ro.debuggable", 0) == 1);
+
+ private static final DynamicRoutingController sInstance =
+ new DynamicRoutingController();
+
+ /** PhoneFactory Dependencies for testing. */
+ @VisibleForTesting
+ public interface PhoneFactoryProxy {
+ Phone getPhone(int phoneId);
+ }
+
+ private static class PhoneFactoryProxyImpl implements PhoneFactoryProxy {
+ @Override
+ public Phone getPhone(int phoneId) {
+ return PhoneFactory.getPhone(phoneId);
+ }
+ }
+
+ private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ if (intent.getAction().equals(
+ TelephonyManager.ACTION_NETWORK_COUNTRY_CHANGED)) {
+ int phoneId = intent.getIntExtra(PhoneConstants.PHONE_KEY, -1);
+ String countryIso = intent.getStringExtra(
+ TelephonyManager.EXTRA_NETWORK_COUNTRY);
+ Log.i(TAG, "ACTION_NETWORK_COUNTRY_CHANGED phoneId: " + phoneId
+ + " countryIso: " + countryIso);
+ if (TextUtils.isEmpty(countryIso)) {
+ countryIso = getLastKnownCountryIso(phoneId);
+ if (TextUtils.isEmpty(countryIso)) {
+ return;
+ }
+ }
+ String prevIso = mNetworkCountries.get(Integer.valueOf(phoneId));
+ if (!TextUtils.equals(prevIso, countryIso)) {
+ mNetworkCountries.put(Integer.valueOf(phoneId), countryIso);
+ updateDynamicEmergencyNumbers(phoneId);
+ }
+ mLastCountryIso = countryIso;
+ }
+ }
+ };
+
+ private String getLastKnownCountryIso(int phoneId) {
+ try {
+ Phone phone = mPhoneFactoryProxy.getPhone(phoneId);
+ if (phone == null) return "";
+
+ ServiceStateTracker sst = phone.getServiceStateTracker();
+ if (sst == null) return "";
+
+ LocaleTracker lt = sst.getLocaleTracker();
+ if (lt != null) {
+ String iso = lt.getLastKnownCountryIso();
+ Log.e(TAG, "getLastKnownCountryIso iso=" + iso);
+ return iso;
+ }
+ } catch (Exception e) {
+ Log.e(TAG, "getLastKnownCountryIso e=" + e);
+ }
+ return "";
+ }
+
+ private final PhoneFactoryProxy mPhoneFactoryProxy;
+ private final ArrayMap<Integer, String> mNetworkCountries = new ArrayMap<>();
+ private final ArrayMap<Integer, List<EmergencyNumber>> mEmergencyNumbers = new ArrayMap<>();
+
+ private String mLastCountryIso;
+ private boolean mEnabled;
+ private List<String> mCountriesEnabled = null;
+ private List<String> mDynamicNumbers = null;
+
+
+ /**
+ * Returns the singleton instance of DynamicRoutingController.
+ *
+ * @return A {@link DynamicRoutingController} instance.
+ */
+ public static DynamicRoutingController getInstance() {
+ return sInstance;
+ }
+
+ private DynamicRoutingController() {
+ this(new PhoneFactoryProxyImpl());
+ }
+
+ @VisibleForTesting
+ public DynamicRoutingController(PhoneFactoryProxy phoneFactoryProxy) {
+ mPhoneFactoryProxy = phoneFactoryProxy;
+ }
+
+ /**
+ * Initializes the instance.
+ *
+ * @param context The context of the application.
+ */
+ public void initialize(Context context) {
+ try {
+ mEnabled = context.getResources().getBoolean(R.bool.dynamic_routing_emergency_enabled);
+ } catch (Resources.NotFoundException nfe) {
+ Log.e(TAG, "init exception=" + nfe);
+ } catch (NullPointerException npe) {
+ Log.e(TAG, "init exception=" + npe);
+ }
+
+ mCountriesEnabled = readResourceConfiguration(context,
+ R.array.config_countries_dynamic_routing_emergency_enabled);
+
+ mDynamicNumbers = readResourceConfiguration(context,
+ R.array.config_dynamic_routing_emergency_numbers);
+
+ Log.i(TAG, "init enabled=" + mEnabled + ", countriesEnabled=" + mCountriesEnabled);
+
+ if (mEnabled) {
+ //register country change listener
+ IntentFilter filter = new IntentFilter(TelephonyManager.ACTION_NETWORK_COUNTRY_CHANGED);
+ context.registerReceiver(mIntentReceiver, filter);
+ }
+ }
+
+ private List<String> readResourceConfiguration(Context context, int id) {
+ Log.i(TAG, "readResourceConfiguration id=" + id);
+
+ List<String> resource = null;
+ try {
+ resource = Arrays.asList(context.getResources().getStringArray(id));
+ } catch (Resources.NotFoundException nfe) {
+ Log.e(TAG, "readResourceConfiguration exception=" + nfe);
+ } catch (NullPointerException npe) {
+ Log.e(TAG, "readResourceConfiguration exception=" + npe);
+ } finally {
+ if (resource == null) {
+ resource = new ArrayList<String>();
+ }
+ }
+ return resource;
+ }
+
+ /**
+ * Returns whether the dynamic routing feature is enabled.
+ */
+ public boolean isDynamicRoutingEnabled() {
+ Log.i(TAG, "isDynamicRoutingEnabled " + mEnabled);
+ return mEnabled;
+ }
+
+ /**
+ * Returns whether the dynamic routing is enabled with the given {@link Phone}.
+ * @param phone A {@link Phone} instance.
+ */
+ public boolean isDynamicRoutingEnabled(Phone phone) {
+ Log.i(TAG, "isDynamicRoutingEnabled");
+ if (phone == null) return false;
+ String iso = mNetworkCountries.get(Integer.valueOf(phone.getPhoneId()));
+ Log.i(TAG, "isDynamicRoutingEnabled phoneId=" + phone.getPhoneId() + ", iso=" + iso
+ + ", lastIso=" + mLastCountryIso);
+ if (TextUtils.isEmpty(iso)) {
+ iso = mLastCountryIso;
+ }
+ boolean ret = mEnabled && mCountriesEnabled.contains(iso);
+ Log.i(TAG, "isDynamicRoutingEnabled returns " + ret);
+ return ret;
+ }
+
+ /**
+ * Returns emergency call routing that to be used for the given number.
+ * @param phone A {@link Phone} instance.
+ * @param number The dialed number.
+ * @param isNormal Indicates whether it is normal routing number.
+ * @param isAllowed Indicates whether it is allowed emergency number.
+ * @param needToTurnOnRadio Indicates whether it needs to turn on radio power.
+ */
+ public int getEmergencyCallRouting(Phone phone, String number,
+ boolean isNormal, boolean isAllowed, boolean needToTurnOnRadio) {
+ Log.i(TAG, "getEmergencyCallRouting isNormal=" + isNormal + ", isAllowed=" + isAllowed
+ + ", needToTurnOnRadio=" + needToTurnOnRadio);
+ number = PhoneNumberUtils.stripSeparators(number);
+ boolean isDynamic = isDynamicNumber(phone, number);
+ if ((!isNormal && !isDynamic && isAllowed) || isFromNetworkOrSim(phone, number)) {
+ return EmergencyNumber.EMERGENCY_CALL_ROUTING_UNKNOWN;
+ }
+ if (isDynamicRoutingEnabled(phone)) {
+ // If airplane mode is enabled, check the service state
+ // after turning on the radio power.
+ return (phone.getServiceState().getState() == ServiceState.STATE_IN_SERVICE
+ || needToTurnOnRadio)
+ ? EmergencyNumber.EMERGENCY_CALL_ROUTING_NORMAL
+ : EmergencyNumber.EMERGENCY_CALL_ROUTING_EMERGENCY;
+ }
+ return EmergencyNumber.EMERGENCY_CALL_ROUTING_NORMAL;
+ }
+
+ private boolean isFromNetworkOrSim(Phone phone, String number) {
+ if (phone == null) return false;
+ Log.i(TAG, "isFromNetworkOrSim phoneId=" + phone.getPhoneId());
+ if (phone.getEmergencyNumberTracker() == null) return false;
+ for (EmergencyNumber num : phone.getEmergencyNumberTracker().getEmergencyNumbers(
+ number)) {
+ if (num.getNumber().equals(number)) {
+ if (num.isFromSources(EmergencyNumber.EMERGENCY_NUMBER_SOURCE_NETWORK_SIGNALING)
+ || num.isFromSources(EmergencyNumber.EMERGENCY_NUMBER_SOURCE_SIM)) {
+ Log.i(TAG, "isFromNetworkOrSim SIM or NETWORK emergency number");
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ private String getNetworkCountryIso(int phoneId) {
+ String iso = mNetworkCountries.get(Integer.valueOf(phoneId));
+ if (TextUtils.isEmpty(iso)) {
+ iso = mLastCountryIso;
+ }
+ return iso;
+ }
+
+ @VisibleForTesting
+ public boolean isDynamicNumber(Phone phone, String number) {
+ if (phone == null || phone.getEmergencyNumberTracker() == null
+ || TextUtils.isEmpty(number)
+ || mDynamicNumbers == null || mDynamicNumbers.isEmpty()) {
+ return false;
+ }
+
+ List<EmergencyNumber> emergencyNumbers =
+ mEmergencyNumbers.get(Integer.valueOf(phone.getPhoneId()));
+ if (emergencyNumbers == null) {
+ updateDynamicEmergencyNumbers(phone.getPhoneId());
+ emergencyNumbers =
+ mEmergencyNumbers.get(Integer.valueOf(phone.getPhoneId()));
+ }
+ String iso = getNetworkCountryIso(phone.getPhoneId());
+ if (TextUtils.isEmpty(iso)
+ || emergencyNumbers == null || emergencyNumbers.isEmpty()) {
+ return false;
+ }
+
+ // Filter the list with the number.
+ List<EmergencyNumber> dynamicNumbers =
+ getDynamicEmergencyNumbers(emergencyNumbers, number);
+
+ // Compare the dynamicNumbers with the list of EmergencyNumber from EmergencyNumberTracker.
+ emergencyNumbers = phone.getEmergencyNumberTracker().getEmergencyNumbers(number);
+
+ if (dynamicNumbers == null || emergencyNumbers == null
+ || dynamicNumbers.isEmpty() || emergencyNumbers.isEmpty()) {
+ return false;
+ }
+
+ if (DBG) {
+ Log.i(TAG, "isDynamicNumber " + emergencyNumbers);
+ }
+
+ // Compare coutry ISO and MNC. MNC is optional.
+ for (EmergencyNumber dynamicNumber: dynamicNumbers) {
+ if (emergencyNumbers.stream().anyMatch(n ->
+ TextUtils.equals(n.getCountryIso(), dynamicNumber.getCountryIso())
+ && (TextUtils.equals(n.getMnc(), dynamicNumber.getMnc())
+ || TextUtils.isEmpty(dynamicNumber.getMnc())))) {
+ Log.i(TAG, "isDynamicNumber found");
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /** Filter the list of {@link EmergencyNumber} with given number. */
+ private static List<EmergencyNumber> getDynamicEmergencyNumbers(
+ List<EmergencyNumber> emergencyNumbers, String number) {
+ List<EmergencyNumber> filteredNumbers = emergencyNumbers.stream()
+ .filter(num -> num.getNumber().equals(number))
+ .toList();
+
+ if (DBG) {
+ Log.i(TAG, "getDynamicEmergencyNumbers " + filteredNumbers);
+ }
+ return filteredNumbers;
+ }
+
+ /**
+ * Generates the lis of {@link EmergencyNumber} for the given phoneId
+ * based on the detected country from the resource configuration.
+ */
+ private void updateDynamicEmergencyNumbers(int phoneId) {
+ if (mDynamicNumbers == null || mDynamicNumbers.isEmpty()) {
+ // No resource configuration.
+ mEmergencyNumbers.put(Integer.valueOf(phoneId),
+ new ArrayList<EmergencyNumber>());
+ return;
+ }
+
+ String iso = getNetworkCountryIso(phoneId);
+ if (TextUtils.isEmpty(iso)) {
+ // Update again later.
+ return;
+ }
+ List<EmergencyNumber> emergencyNumbers = new ArrayList<EmergencyNumber>();
+ for (String numberInfo : mDynamicNumbers) {
+ if (!TextUtils.isEmpty(numberInfo) && numberInfo.startsWith(iso)) {
+ emergencyNumbers.addAll(getEmergencyNumbers(numberInfo));
+ }
+ }
+ mEmergencyNumbers.put(Integer.valueOf(phoneId), emergencyNumbers);
+ }
+
+ /** Returns an {@link EmergencyNumber} instance from the resource configuration. */
+ private List<EmergencyNumber> getEmergencyNumbers(String numberInfo) {
+ ArrayList<EmergencyNumber> emergencyNumbers = new ArrayList<EmergencyNumber>();
+ if (TextUtils.isEmpty(numberInfo)) {
+ return emergencyNumbers;
+ }
+
+ String[] fields = numberInfo.split(",");
+ // Format: "iso,mnc,number1,number2,..."
+ if (fields == null || fields.length < 3
+ || TextUtils.isEmpty(fields[0])
+ || TextUtils.isEmpty(fields[2])) {
+ return emergencyNumbers;
+ }
+
+ for (int i = 2; i < fields.length; i++) {
+ if (TextUtils.isEmpty(fields[i])) {
+ continue;
+ }
+ emergencyNumbers.add(new EmergencyNumber(fields[i] /* number */,
+ fields[0] /* iso */, fields[1] /* mnc */,
+ EmergencyNumber.EMERGENCY_SERVICE_CATEGORY_UNSPECIFIED,
+ new ArrayList<String>(),
+ EmergencyNumber.EMERGENCY_NUMBER_SOURCE_DATABASE,
+ EmergencyNumber.EMERGENCY_CALL_ROUTING_UNKNOWN));
+ }
+
+ return emergencyNumbers;
+ }
+}
diff --git a/src/com/android/services/telephony/domainselection/EmergencyCallDomainSelector.java b/src/com/android/services/telephony/domainselection/EmergencyCallDomainSelector.java
index a073397..0d373de 100644
--- a/src/com/android/services/telephony/domainselection/EmergencyCallDomainSelector.java
+++ b/src/com/android/services/telephony/domainselection/EmergencyCallDomainSelector.java
@@ -18,6 +18,7 @@
import static android.telephony.AccessNetworkConstants.AccessNetworkType.CDMA2000;
import static android.telephony.AccessNetworkConstants.AccessNetworkType.EUTRAN;
+import static android.telephony.AccessNetworkConstants.AccessNetworkType.GERAN;
import static android.telephony.AccessNetworkConstants.AccessNetworkType.NGRAN;
import static android.telephony.AccessNetworkConstants.AccessNetworkType.UNKNOWN;
import static android.telephony.AccessNetworkConstants.AccessNetworkType.UTRAN;
@@ -25,6 +26,7 @@
import static android.telephony.AccessNetworkConstants.TRANSPORT_TYPE_WLAN;
import static android.telephony.AccessNetworkConstants.TRANSPORT_TYPE_WWAN;
import static android.telephony.BarringInfo.BARRING_SERVICE_TYPE_EMERGENCY;
+import static android.telephony.CarrierConfigManager.KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL;
import static android.telephony.CarrierConfigManager.ImsEmergency.DOMAIN_CS;
import static android.telephony.CarrierConfigManager.ImsEmergency.DOMAIN_PS_3GPP;
import static android.telephony.CarrierConfigManager.ImsEmergency.DOMAIN_PS_NON_3GPP;
@@ -57,6 +59,7 @@
import static android.telephony.PreciseDisconnectCause.EMERGENCY_TEMP_FAILURE;
import static android.telephony.PreciseDisconnectCause.NO_VALID_SIM;
import static android.telephony.PreciseDisconnectCause.SERVICE_OPTION_NOT_AVAILABLE;
+import static android.telephony.SubscriptionManager.PROFILE_CLASS_PROVISIONING;
import static android.telephony.TelephonyManager.DATA_CONNECTED;
import static android.telephony.TelephonyManager.DATA_DISCONNECTED;
import static android.telephony.TelephonyManager.DATA_DISCONNECTING;
@@ -75,6 +78,7 @@
import android.os.PersistableBundle;
import android.os.PowerManager;
import android.os.SystemProperties;
+import android.telecom.TelecomManager;
import android.telephony.AccessNetworkConstants.AccessNetworkType;
import android.telephony.AccessNetworkConstants.RadioAccessNetworkType;
import android.telephony.AccessNetworkConstants.TransportType;
@@ -85,6 +89,7 @@
import android.telephony.DomainSelectionService.SelectionAttributes;
import android.telephony.EmergencyRegistrationResult;
import android.telephony.NetworkRegistrationInfo;
+import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.telephony.TransportSelectorCallback;
@@ -96,6 +101,7 @@
import android.util.LocalLog;
import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.telephony.flags.Flags;
import com.android.phone.R;
import java.util.ArrayList;
@@ -119,6 +125,11 @@
*/
private static final int DEFAULT_DATA_DISCONNECTION_TIMEOUT_MS = 2 * 1000; // 2 seconds
+ /**
+ * Timeout of waiting for the IMS state change before selecting domain from initial state.
+ */
+ private static final int DEFAULT_WAIT_FOR_IMS_STATE_TIMEOUT_MS = 3 * 1000; // 3 seconds
+
private static final int MSG_START_DOMAIN_SELECTION = 11;
@VisibleForTesting
public static final int MSG_NETWORK_SCAN_TIMEOUT = 12;
@@ -127,6 +138,9 @@
public static final int MSG_MAX_CELLULAR_TIMEOUT = 14;
@VisibleForTesting
public static final int MSG_WAIT_DISCONNECTION_TIMEOUT = 15;
+ @VisibleForTesting
+ public static final int MSG_WAIT_FOR_IMS_STATE_TIMEOUT = 16;
+ private static final int MSG_WIFI_AVAILABLE = 17;
private static final int NOT_SUPPORTED = -1;
@@ -136,11 +150,15 @@
ImsReasonInfo.CODE_LOCAL_NOT_REGISTERED,
ImsReasonInfo.CODE_SIP_ALTERNATE_EMERGENCY_CALL);
+ private static List<Integer> sDisconnectCauseForTerminatation = List.of(
+ SERVICE_OPTION_NOT_AVAILABLE);
+
private static final LocalLog sLocalLog = new LocalLog(LOG_SIZE);
private static List<String> sSimReadyAllowList;
private static List<String> sPreferSlotWithNormalServiceList;
private static List<String> sPreferCsAfterCsfbFailure;
+ private static List<String> sPreferGeranWhenSimAbsent;
/**
* Network callback used to determine whether Wi-Fi is connected or not.
@@ -150,18 +168,30 @@
@Override
public void onAvailable(Network network) {
logi("onAvailable: " + network);
+ if (network != null && !mWiFiNetworksAvailable.contains(network)) {
+ mWiFiNetworksAvailable.add(network);
+ }
mWiFiAvailable = true;
+ sendEmptyMessage(MSG_WIFI_AVAILABLE);
}
@Override
public void onLost(Network network) {
logi("onLost: " + network);
+ if (network != null) {
+ mWiFiNetworksAvailable.remove(network);
+ }
+ if (!mWiFiNetworksAvailable.isEmpty()) {
+ logi("onLost: available networks=" + mWiFiNetworksAvailable);
+ return;
+ }
mWiFiAvailable = false;
}
@Override
public void onUnavailable() {
logi("onUnavailable");
+ mWiFiNetworksAvailable.clear();
mWiFiAvailable = false;
}
};
@@ -205,6 +235,7 @@
private boolean mLtePreferredAfterNrFailure;
private boolean mScanLimitedOnlyAfterVolteFailure;
private List<Integer> mRetryReasonCodes;
+ private boolean mNonTtyOrTtySupported;
// Members for states
private boolean mIsMonitoringConnectivity;
@@ -213,6 +244,8 @@
private boolean mTryCsWhenPsFails;
private boolean mTryEsFallback;
private boolean mIsWaitingForDataDisconnection;
+ private boolean mSwitchRatPreferenceWithLocalNotRegistered;
+ private boolean mTerminateAfterCsFailure;
private int mModemCount;
/** Indicates whether this instance is deactivated. */
@@ -225,6 +258,8 @@
private boolean mCrossStackTimerExpired = false;
/** Indicates whether max cellular timer expired. */
private boolean mMaxCellularTimerExpired = false;
+ /** Indicates whether network scan timer expired. */
+ private boolean mNetworkScanTimerExpired = false;
/**
* Indicates whether {@link #selectDomain(SelectionAttributes, TransportSelectionCallback)}
@@ -235,6 +270,8 @@
private final PowerManager.WakeLock mPartialWakeLock;
private final CrossSimRedialingController mCrossSimRedialingController;
private final DataConnectionStateHelper mEpdnHelper;
+ private final List<Network> mWiFiNetworksAvailable = new ArrayList<>();
+ private final ImsEmergencyRegistrationStateHelper mImsEmergencyRegistrationHelper;
/** Constructor. */
public EmergencyCallDomainSelector(Context context, int slotId, int subId,
@@ -253,6 +290,8 @@
mCrossSimRedialingController = csrController;
mEpdnHelper = epdnHelper;
epdnHelper.setEmergencyCallDomainSelector(this);
+ mImsEmergencyRegistrationHelper = new ImsEmergencyRegistrationStateHelper(
+ mContext, getSlotId(), getSubId(), getLooper());
acquireWakeLock();
}
@@ -281,6 +320,14 @@
requestScanDelayed();
break;
+ case MSG_WAIT_FOR_IMS_STATE_TIMEOUT:
+ handleWaitForImsStateTimeout();
+ break;
+
+ case MSG_WIFI_AVAILABLE:
+ handleWifiAvailable();
+ break;
+
default:
super.handleMessage(msg);
break;
@@ -307,6 +354,9 @@
}
if (result.getAccessNetwork() == UNKNOWN) {
+ if (maybeRedialOnTheOtherSlotInNormalService(mLastRegResult)) {
+ return;
+ }
if ((mPreferredNetworkScanType == SCAN_TYPE_FULL_SERVICE_FOLLOWED_BY_LIMITED_SERVICE)
&& (mScanType == DomainSelectionService.SCAN_TYPE_FULL_SERVICE)) {
mScanType = DomainSelectionService.SCAN_TYPE_LIMITED_SERVICE;
@@ -316,6 +366,15 @@
logi("requestScan-onComplete");
sendMessage(obtainMessage(MSG_NETWORK_SCAN_RESULT, regResult));
});
+ } else if ((mPreferredNetworkScanType
+ == CarrierConfigManager.ImsEmergency.SCAN_TYPE_FULL_SERVICE)
+ && (mScanType == DomainSelectionService.SCAN_TYPE_FULL_SERVICE)) {
+ mWwanSelectorCallback.onRequestEmergencyNetworkScan(
+ mLastPreferredNetworks, mScanType, true, mCancelSignal,
+ (regResult) -> {
+ logi("requestScan-onComplete");
+ sendMessage(obtainMessage(MSG_NETWORK_SCAN_RESULT, regResult));
+ });
} else {
// Continuous scan, do not start a new timer.
requestScan(false);
@@ -323,6 +382,15 @@
return;
}
+ checkAndSetTerminateAfterCsFailure(result);
+
+ if (result.getRegState() != REGISTRATION_STATE_HOME
+ && result.getRegState() != REGISTRATION_STATE_ROAMING) {
+ if (maybeRedialOnTheOtherSlotInNormalService(result)) {
+ return;
+ }
+ }
+
mLastRegResult = result;
removeMessages(MSG_NETWORK_SCAN_TIMEOUT);
onWwanNetworkTypeSelected(getAccessNetworkType(result));
@@ -341,11 +409,10 @@
if (accessNetworkType != EUTRAN) return accessNetworkType;
int regState = result.getRegState();
- int domain = result.getDomain();
// Emergency is not supported with LTE, but CSFB is possible.
if ((regState == REGISTRATION_STATE_HOME || regState == REGISTRATION_STATE_ROAMING)
- && (domain == NetworkRegistrationInfo.DOMAIN_CS)) {
+ && isCsDomainOnlyAvailable(result)) {
logi("getAccessNetworkType emergency not supported but CSFB is possible");
accessNetworkType = UTRAN;
}
@@ -353,6 +420,16 @@
return accessNetworkType;
}
+ private boolean isCsDomainOnlyAvailable(EmergencyRegistrationResult result) {
+ int domain = result.getDomain();
+ if (domain == NetworkRegistrationInfo.DOMAIN_CS) return true;
+ if ((domain & NetworkRegistrationInfo.DOMAIN_CS) > 0) {
+ // b/341865236, check emcBearer only
+ return (!result.isEmcBearerSupported());
+ }
+ return false;
+ }
+
@Override
public void reselectDomain(SelectionAttributes attr) {
logi("reselectDomain attr=" + attr);
@@ -384,6 +461,8 @@
return;
}
+ mTerminateAfterCsFailure = false;
+
if (mTryCsWhenPsFails) {
mTryCsWhenPsFails = false;
// Initial state was CSFB available and dial PS failed.
@@ -443,14 +522,18 @@
}
if (mLastNetworkType == EUTRAN && mLastRegResult != null
- && mSelectionAttributes.getPsDisconnectCause() != null) {
+ && mSelectionAttributes.getPsDisconnectCause() != null
+ && !mScanLimitedOnlyAfterVolteFailure
+ && !mSwitchRatPreferenceWithLocalNotRegistered) {
int regState = mLastRegResult.getRegState();
int reasonCode = mSelectionAttributes.getPsDisconnectCause().getCode();
if (reasonCode == ImsReasonInfo.CODE_LOCAL_NOT_REGISTERED
&& regState != REGISTRATION_STATE_HOME
- && regState != REGISTRATION_STATE_ROAMING) {
+ && regState != REGISTRATION_STATE_ROAMING
+ && isSimReady()) {
// b/326292100, ePDN setup failed in limited state, request PS preferred scan.
mLastNetworkType = UNKNOWN;
+ mSwitchRatPreferenceWithLocalNotRegistered = true;
}
}
@@ -544,6 +627,11 @@
mDomainSelectionRequested = true;
startCrossStackTimer();
if (SubscriptionManager.isValidSubscriptionId(getSubId())) {
+ if (mCallSetupTimerOnCurrentRat > 0) {
+ mImsEmergencyRegistrationHelper.start();
+ }
+ sendEmptyMessageDelayed(MSG_WAIT_FOR_IMS_STATE_TIMEOUT,
+ DEFAULT_WAIT_FOR_IMS_STATE_TIMEOUT_MS);
selectDomain();
} else {
logi("startDomainSelection invalid subId");
@@ -552,6 +640,12 @@
}
}
+ private void handleWaitForImsStateTimeout() {
+ logi("handleWaitForImsStateTimeout");
+ onImsRegistrationStateChanged();
+ onImsMmTelCapabilitiesChanged();
+ }
+
@Override
public void onImsMmTelFeatureAvailableChanged() {
// DOMAIN_CS shall be selected when ImsService is not available.
@@ -564,6 +658,7 @@
mImsRegistered = mImsStateTracker.isImsRegistered();
logi("onImsRegistrationStateChanged " + mImsRegistered);
selectDomain();
+ handleImsStateChange();
}
@Override
@@ -572,6 +667,14 @@
mIsVoiceCapable = mImsStateTracker.isImsVoiceCapable();
logi("onImsMmTelCapabilitiesChanged " + mIsVoiceCapable);
selectDomain();
+ handleImsStateChange();
+ }
+
+ private void handleImsStateChange() {
+ if (!mVoWifiOverEmergencyPdn && !mDomainSelected
+ && (mMaxCellularTimerExpired || mNetworkScanTimerExpired)) {
+ maybeDialOverWlan();
+ }
}
private boolean isSimReady() {
@@ -605,6 +708,7 @@
KEY_EMERGENCY_LTE_PREFERRED_AFTER_NR_FAILED_BOOL,
KEY_SCAN_LIMITED_SERVICE_AFTER_VOLTE_FAILURE_BOOL,
KEY_IMS_REASONINFO_CODE_TO_RETRY_EMERGENCY_INT_ARRAY,
+ KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL,
KEY_EMERGENCY_CDMA_PREFERRED_NUMBERS_STRING_ARRAY);
if (b == null) {
b = CarrierConfigManager.getDefaultConfig();
@@ -640,6 +744,8 @@
String[] numbers = b.getStringArray(KEY_EMERGENCY_CDMA_PREFERRED_NUMBERS_STRING_ARRAY);
int[] imsReasonCodes =
b.getIntArray(KEY_IMS_REASONINFO_CODE_TO_RETRY_EMERGENCY_INT_ARRAY);
+ boolean ttySupported = b.getBoolean(KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL);
+ mNonTtyOrTtySupported = isNonTtyOrTtySupported(ttySupported);
if (mImsRatsConfig == null) mImsRatsConfig = new int[0];
if (mCsRatsConfig == null) mCsRatsConfig = new int[0];
@@ -680,6 +786,7 @@
+ ", ltePreferredAfterNr=" + mLtePreferredAfterNrFailure
+ ", scanLimitedOnly=" + mScanLimitedOnlyAfterVolteFailure
+ ", retryReasonCodes=" + mRetryReasonCodes
+ + ", ttySupported=" + ttySupported
+ ", cdmaPreferredNumbers=" + arrayToString(numbers));
mCdmaPreferredNumbers = Arrays.asList(numbers);
@@ -716,6 +823,13 @@
}
logi("readResourceConfiguration preferCsAfterCsfbFailure="
+ sPreferCsAfterCsfbFailure);
+
+ if (sPreferGeranWhenSimAbsent == null) {
+ sPreferGeranWhenSimAbsent = readResourceConfiguration(
+ R.array.config_countries_prefer_geran_when_sim_absent);
+ }
+ logi("readResourceConfiguration preferGeranWhenSimAbsent="
+ + sPreferGeranWhenSimAbsent);
}
private List<String> readResourceConfiguration(int id) {
@@ -742,6 +856,7 @@
sSimReadyAllowList = null;
sPreferSlotWithNormalServiceList = null;
sPreferCsAfterCsfbFailure = null;
+ sPreferGeranWhenSimAbsent = null;
}
private void selectDomain() {
@@ -753,6 +868,7 @@
+ " BarringInfo, IMS registration state, or MMTEL capabilities");
return;
}
+ removeMessages(MSG_WAIT_FOR_IMS_STATE_TIMEOUT);
// The statements below should be executed only once to select domain from initial state.
// Next domain selection shall be triggered by reselectDomain().
@@ -796,7 +912,7 @@
boolean psInService = isPsInService();
if (!csInService && !psInService) {
- if (maybeRedialOnTheOtherSlotInNormalService()) {
+ if (maybeRedialOnTheOtherSlotInNormalService(mLastRegResult)) {
return;
}
mCsNetworkType = getSelectableCsNetworkType();
@@ -809,10 +925,10 @@
requestScan(true);
return;
}
- // If NGRAN, request scan to trigger emergency registration.
- if (mPsNetworkType == EUTRAN) {
+ if (mPsNetworkType != UNKNOWN) {
onWwanNetworkTypeSelected(mPsNetworkType);
} else if (mCsNetworkType != UNKNOWN) {
+ checkAndSetTerminateAfterCsFailure(mLastRegResult);
onWwanNetworkTypeSelected(mCsNetworkType);
} else {
requestScan(true);
@@ -927,7 +1043,7 @@
sendMessage(obtainMessage(MSG_NETWORK_SCAN_RESULT, result));
});
- if (startVoWifiTimer && SubscriptionManager.isValidSubscriptionId(getSubId())) {
+ if (startVoWifiTimer && isSimReady()) {
if (isEmcOverWifiSupported()
&& mScanTimeout > 0 && mVoWifiTrialCount < mMaxNumOfVoWifiTries) {
logi("requestScan start scan timer");
@@ -967,6 +1083,17 @@
+ ", csPreferred=" + csPreferred + ", esFallback=" + tryEsFallback
+ ", lastNetworkType=" + accessNetworkTypeToString(mLastNetworkType));
+ if (mLastRegResult != null
+ && sPreferGeranWhenSimAbsent.contains(mLastRegResult.getCountryIso())
+ && !isSimReady()) {
+ logi("getNextPreferredNetworks preferGeran");
+ preferredNetworks.add(GERAN);
+ preferredNetworks.add(UTRAN);
+ preferredNetworks.add(EUTRAN);
+ preferredNetworks.add(NGRAN);
+ return preferredNetworks;
+ }
+
if (!csPreferred && (mLastNetworkType == UNKNOWN || tryEsFallback)) {
// Generate the list per the domain preference.
@@ -1029,6 +1156,15 @@
preferredNetworks.add(NGRAN);
}
+ if (!mNonTtyOrTtySupported) {
+ logi("getNextPreferredNetworks adjust for TTY");
+ preferredNetworks.remove(Integer.valueOf(NGRAN));
+ preferredNetworks.remove(Integer.valueOf(EUTRAN));
+ if (preferredNetworks.isEmpty()) {
+ preferredNetworks.add(Integer.valueOf(UTRAN));
+ preferredNetworks.add(Integer.valueOf(GERAN));
+ }
+ }
return preferredNetworks;
}
@@ -1041,6 +1177,12 @@
return preferredNetworks;
}
+ private void handleWifiAvailable() {
+ if (!mDomainSelected && (mMaxCellularTimerExpired || mNetworkScanTimerExpired)) {
+ maybeDialOverWlan();
+ }
+ }
+
private void handleMaxCellularTimeout() {
logi("handleMaxCellularTimeout");
if (mVoWifiTrialCount >= mMaxNumOfVoWifiTries) {
@@ -1063,13 +1205,14 @@
private void handleNetworkScanTimeout() {
logi("handleNetworkScanTimeout");
+ mNetworkScanTimerExpired = true;
maybeDialOverWlan();
}
private boolean maybeDialOverWlan() {
- logi("maybeDialOverWlan overEmergencyPdn=" + mVoWifiOverEmergencyPdn
- + ", wifiAvailable=" + mWiFiAvailable);
boolean available = mWiFiAvailable;
+ logi("maybeDialOverWlan overEmergencyPdn=" + mVoWifiOverEmergencyPdn
+ + ", wifiAvailable=" + available);
if (mVoWifiOverEmergencyPdn) {
// SOS APN
if (!available && isImsRegisteredOverCrossSim()) {
@@ -1184,7 +1327,8 @@
*/
private @RadioAccessNetworkType int getSelectablePsNetworkType(boolean inService) {
List<Integer> domains = getDomainPreference();
- if (domains.indexOf(DOMAIN_PS_3GPP) == NOT_SUPPORTED) {
+ if ((domains.indexOf(DOMAIN_PS_3GPP) == NOT_SUPPORTED)
+ || !mNonTtyOrTtySupported) {
return UNKNOWN;
}
EmergencyRegistrationResult regResult =
@@ -1199,13 +1343,19 @@
int accessNetwork = regResult.getAccessNetwork();
List<Integer> ratList = getImsNetworkTypeConfiguration();
+ if (!inService && !ratList.contains(NGRAN) && !isSimReady()
+ && !TextUtils.isEmpty(regResult.getCountryIso())) {
+ ratList.add(NGRAN);
+ logi("getSelectablePsNetworkType ratList=" + ratList);
+ }
if (ratList.contains(accessNetwork)) {
if (mIsEmergencyBarred) {
logi("getSelectablePsNetworkType barred");
return UNKNOWN;
}
if (accessNetwork == NGRAN) {
- return (regResult.getNwProvidedEmc() > 0 && regResult.isVopsSupported())
+ return (regResult.getNwProvidedEmc() > 0
+ && (regResult.isVopsSupported() || !inService))
? NGRAN : UNKNOWN;
} else if (accessNetwork == EUTRAN) {
return (regResult.isEmcBearerSupported()
@@ -1251,7 +1401,7 @@
* @return {@code true} if emergency call over Wi-Fi allowed.
*/
private boolean isEmcOverWifiSupported() {
- if (isSimReady()) {
+ if (isSimReady() && mNonTtyOrTtySupported) {
List<Integer> domains = getDomainPreference();
boolean ret = domains.contains(DOMAIN_PS_NON_3GPP);
logi("isEmcOverWifiSupported " + ret);
@@ -1342,6 +1492,16 @@
for (int i = 0; i < rats.length; i++) {
ratList.add(rats[i]);
}
+
+ // Prefer LTE if UE is located in non-NR coverage.
+ if (ratList.contains(NGRAN) && mLastRegResult != null
+ && mLastRegResult.getAccessNetwork() != UNKNOWN
+ && mLastRegResult.getAccessNetwork() != NGRAN
+ && !TextUtils.isEmpty(mLastRegResult.getCountryIso())) {
+ ratList.remove(Integer.valueOf(NGRAN));
+ ratList.add(NGRAN);
+ }
+
return ratList;
}
@@ -1454,6 +1614,9 @@
}
mDomainSelected = true;
+ mNetworkScanTimerExpired = false;
+ mIsWaitingForDataDisconnection = false;
+ removeMessages(MSG_WAIT_DISCONNECTION_TIMEOUT);
mLastTransportType = TRANSPORT_TYPE_WLAN;
mVoWifiTrialCount++;
mTransportSelectorCallback.onWlanSelected(mVoWifiOverEmergencyPdn);
@@ -1484,6 +1647,7 @@
}
mDomainSelected = true;
+ mNetworkScanTimerExpired = false;
mLastNetworkType = accessNetworkType;
int domain = NetworkRegistrationInfo.DOMAIN_CS;
if (accessNetworkType == EUTRAN || accessNetworkType == NGRAN) {
@@ -1501,6 +1665,7 @@
return;
}
+ mWiFiNetworksAvailable.clear();
ConnectivityManager cm = mContext.getSystemService(ConnectivityManager.class);
if (cm != null) {
logi("registerForConnectivityChanges");
@@ -1519,6 +1684,7 @@
return;
}
+ mWiFiNetworksAvailable.clear();
ConnectivityManager cm = mContext.getSystemService(ConnectivityManager.class);
if (cm != null) {
logi("unregisterForConnectivityChanges");
@@ -1541,7 +1707,6 @@
}
private boolean allowEmergencyCalls(EmergencyRegistrationResult regResult) {
- if (mModemCount < 2) return true;
if (regResult == null) {
loge("allowEmergencyCalls null regResult");
return true;
@@ -1549,28 +1714,46 @@
String iso = regResult.getCountryIso();
if (sSimReadyAllowList.contains(iso)) {
- TelephonyManager tm = mContext.getSystemService(TelephonyManager.class);
- int simState = tm.getSimState(getSlotId());
- if (simState != TelephonyManager.SIM_STATE_READY) {
- logi("allowEmergencyCalls not ready, simState=" + simState + ", iso=" + iso);
- if (mCrossSimRedialingController.isThereOtherSlot()) {
+ if (isSimReady()) {
+ SubscriptionManager sm = mContext.getSystemService(SubscriptionManager.class);
+ SubscriptionInfo subInfo = sm.getActiveSubscriptionInfo(getSubId());
+ if (subInfo != null
+ && subInfo.getProfileClass() == PROFILE_CLASS_PROVISIONING) {
+ // b/334773484, bootstrap profile
+ logi("allowEmergencyCalls bootstrap profile, iso=" + iso);
return false;
}
- logi("allowEmergencyCalls there is no other slot available");
+ } else {
+ logi("allowEmergencyCalls SIM state not ready, iso=" + iso);
+ return false;
}
}
return true;
}
- private boolean maybeRedialOnTheOtherSlotInNormalService() {
- EmergencyRegistrationResult regResult =
- mSelectionAttributes.getEmergencyRegistrationResult();
+ private String getCountryIso(String iso) {
+ if (TextUtils.isEmpty(iso)) {
+ TelephonyManager tm = mContext.getSystemService(TelephonyManager.class);
+ iso = tm.getNetworkCountryIso(getSlotId());
+ if (TextUtils.isEmpty(iso)) {
+ for (int i = 0; i < mModemCount; i++) {
+ iso = tm.getNetworkCountryIso(i);
+ if (!TextUtils.isEmpty(iso)) break;
+ }
+ }
+ }
+ return iso;
+ }
+
+ private boolean maybeRedialOnTheOtherSlotInNormalService(
+ EmergencyRegistrationResult regResult) {
if (regResult == null) return false;
- String iso = regResult.getCountryIso();
+ String iso = getCountryIso(regResult.getCountryIso());
if (sPreferSlotWithNormalServiceList.contains(iso)
&& mCrossSimRedialingController.isThereOtherSlotInService()) {
+ logi("maybeRedialOnTheOtherSlotInNormalService");
terminateSelectionForCrossSimRedialing(false);
return true;
}
@@ -1579,7 +1762,12 @@
private void terminateSelectionPermanentlyForSlot() {
logi("terminateSelectionPermanentlyForSlot");
- terminateSelection(DisconnectCause.EMERGENCY_PERM_FAILURE);
+ mCrossSimRedialingController.notifyCallFailure(EMERGENCY_PERM_FAILURE);
+ if (mCrossSimRedialingController.isThereOtherSlot()) {
+ terminateSelection(DisconnectCause.EMERGENCY_PERM_FAILURE);
+ } else {
+ terminateSelection(DisconnectCause.ICC_ERROR);
+ }
}
private void terminateSelectionForCrossSimRedialing(boolean permanent) {
@@ -1589,6 +1777,8 @@
}
private void terminateSelection(int cause) {
+ removeMessages(MSG_NETWORK_SCAN_TIMEOUT);
+ removeMessages(MSG_MAX_CELLULAR_TIMEOUT);
mTransportSelectorCallback.onSelectionTerminated(cause);
}
@@ -1602,7 +1792,6 @@
break;
}
- // If CS call fails, retry always. Otherwise, check the reason code.
ImsReasonInfo reasonInfo = mSelectionAttributes.getPsDisconnectCause();
if (mRetryReasonCodes != null && reasonInfo != null) {
if (!mRetryReasonCodes.contains(reasonInfo.getCode())) {
@@ -1610,6 +1799,13 @@
terminateSelection(DisconnectCause.NOT_VALID);
return true;
}
+ } else if (reasonInfo == null
+ && sDisconnectCauseForTerminatation.contains(cause)
+ && mTerminateAfterCsFailure) {
+ // b/341055741
+ logi("maybeTerminateSelection terminate after CS failure");
+ terminateSelection(DisconnectCause.NOT_VALID);
+ return true;
}
return false;
}
@@ -1644,13 +1840,32 @@
logi("notifyCrossStackTimerExpired");
mCrossStackTimerExpired = true;
- if (mDomainSelected) {
+ boolean isHangupOngoingDialing = hangupOngoingDialing();
+ if (mDomainSelected && !isHangupOngoingDialing) {
// When reselecting domain, terminateSelection will be called.
return;
}
mIsWaitingForDataDisconnection = false;
removeMessages(MSG_WAIT_DISCONNECTION_TIMEOUT);
- terminateSelectionForCrossSimRedialing(false);
+ terminateSelectionForCrossSimRedialing(isHangupOngoingDialing);
+ }
+
+ /**
+ * If another slot has already permanently failed,
+ * and IMS REG is not completed in the current slot, hang up the ongoing call.
+ */
+ public void maybeHangupOngoingDialing() {
+ logi("maybeHangupOngoingDialing");
+
+ if (mDomainSelected && hangupOngoingDialing()) {
+ notifyCrossStackTimerExpired();
+ }
+ }
+
+ private boolean hangupOngoingDialing() {
+ return Flags.hangupEmergencyCallForCrossSimRedialing()
+ && (mCallSetupTimerOnCurrentRat > 0)
+ && (!mImsEmergencyRegistrationHelper.isImsEmergencyRegistered());
}
/** Notifies the ePDN connection state changes. */
@@ -1747,6 +1962,7 @@
if (DBG) logd("destroy");
mEpdnHelper.setEmergencyCallDomainSelector(null);
+ mImsEmergencyRegistrationHelper.destroy();
mCrossSimRedialingController.stopTimer();
releaseWakeLock();
@@ -1790,6 +2006,47 @@
&& mEpdnHelper.getDataConnectionState(getSlotId()) == DATA_CONNECTED;
}
+ /**
+ * Indicates whether the call is non-TTY or if TTY is supported.
+ */
+ private boolean isNonTtyOrTtySupported(boolean ttySupported) {
+ if (ttySupported) {
+ return true;
+ }
+
+ TelecomManager tm = mContext.getSystemService(TelecomManager.class);
+ if (tm == null) {
+ logi("isNonTtyOrTtySupported telecom not available");
+ return true;
+ }
+
+ boolean ret = (tm.getCurrentTtyMode() == TelecomManager.TTY_MODE_OFF);
+ logi("isNonTtyOrTtySupported ret=" + ret);
+
+ return ret;
+ }
+
+ private void checkAndSetTerminateAfterCsFailure(EmergencyRegistrationResult result) {
+ if (result == null) return;
+ String mcc = result.getMcc();
+ int accessNetwork = result.getAccessNetwork();
+ if (!TextUtils.isEmpty(mcc) && mcc.startsWith("00") // test network
+ && (accessNetwork == UTRAN || accessNetwork == GERAN)) {
+ // b/341055741
+ mTerminateAfterCsFailure = true;
+ }
+ }
+
+ @VisibleForTesting
+ public boolean isWiFiAvailable() {
+ return mWiFiAvailable;
+ }
+
+ @VisibleForTesting
+ public List<Network> getWiFiNetworksAvailable() {
+ return mWiFiNetworksAvailable;
+ }
+
@Override
protected void logi(String msg) {
super.logi(msg);
diff --git a/src/com/android/services/telephony/domainselection/ImsEmergencyRegistrationStateHelper.java b/src/com/android/services/telephony/domainselection/ImsEmergencyRegistrationStateHelper.java
new file mode 100644
index 0000000..a6ac9c4
--- /dev/null
+++ b/src/com/android/services/telephony/domainselection/ImsEmergencyRegistrationStateHelper.java
@@ -0,0 +1,212 @@
+/*
+ * Copyright (C) 2024 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.services.telephony.domainselection;
+
+import android.annotation.NonNull;
+import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+import android.telephony.SubscriptionManager;
+import android.telephony.ims.ImsException;
+import android.telephony.ims.ImsManager;
+import android.telephony.ims.ImsMmTelManager;
+import android.telephony.ims.ImsReasonInfo;
+import android.telephony.ims.ImsRegistrationAttributes;
+import android.telephony.ims.ImsStateCallback;
+import android.telephony.ims.RegistrationManager;
+import android.util.Log;
+
+import com.android.internal.annotations.VisibleForTesting;
+
+/**
+ * A class to listen to the IMS emergency registration state.
+ */
+public class ImsEmergencyRegistrationStateHelper {
+ private static final String TAG = ImsEmergencyRegistrationStateHelper.class.getSimpleName();
+
+ protected static final long MMTEL_FEATURE_AVAILABLE_WAIT_TIME_MILLIS = 2 * 1000; // 2 seconds
+
+ private final Context mContext;
+ private final int mSlotId;
+ private final int mSubId;
+ private final Handler mHandler;
+
+ private ImsMmTelManager mMmTelManager;
+ private ImsStateCallback mImsStateCallback;
+ private RegistrationManager.RegistrationCallback mRegistrationCallback;
+ private boolean mImsEmergencyRegistered;
+
+ public ImsEmergencyRegistrationStateHelper(@NonNull Context context,
+ int slotId, int subId, @NonNull Looper looper) {
+ mContext = context;
+ mSlotId = slotId;
+ mSubId = subId;
+ mHandler = new Handler(looper);
+ }
+
+ /**
+ * Destroys this instance.
+ */
+ public void destroy() {
+ stopListeningForImsEmergencyRegistrationState();
+ mHandler.removeCallbacksAndMessages(null);
+ }
+
+ /**
+ * Returns the Handler instance.
+ */
+ @VisibleForTesting
+ public @NonNull Handler getHandler() {
+ return mHandler;
+ }
+
+ /**
+ * Returns {@code true} if IMS is registered, {@code false} otherwise.
+ */
+ public boolean isImsEmergencyRegistered() {
+ return mImsEmergencyRegistered;
+ }
+
+ /**
+ * Starts listening for IMS emergency registration state.
+ */
+ public void start() {
+ startListeningForImsEmergencyRegistrationState();
+ }
+
+ /**
+ * Starts listening to monitor the IMS states -
+ * connection state, IMS emergency registration state.
+ */
+ private void startListeningForImsEmergencyRegistrationState() {
+ if (!SubscriptionManager.isValidSubscriptionId(mSubId)) {
+ return;
+ }
+
+ ImsManager imsMngr = mContext.getSystemService(ImsManager.class);
+ mMmTelManager = imsMngr.getImsMmTelManager(mSubId);
+ mImsEmergencyRegistered = false;
+ registerImsStateCallback();
+ }
+
+ /**
+ * Stops listening to monitor the IMS states -
+ * connection state, IMS emergency registration state.
+ */
+ private void stopListeningForImsEmergencyRegistrationState() {
+ if (mMmTelManager != null) {
+ unregisterImsEmergencyRegistrationCallback();
+ unregisterImsStateCallback();
+ mMmTelManager = null;
+ }
+ }
+
+ private void registerImsStateCallback() {
+ if (mImsStateCallback != null) {
+ loge("ImsStateCallback is already registered for sub-" + mSubId);
+ return;
+ }
+
+ // Listens to the IMS connection state change.
+ mImsStateCallback = new ImsStateCallback() {
+ @Override
+ public void onUnavailable(@DisconnectedReason int reason) {
+ unregisterImsEmergencyRegistrationCallback();
+ }
+
+ @Override
+ public void onAvailable() {
+ registerImsEmergencyRegistrationCallback();
+ }
+
+ @Override
+ public void onError() {
+ mImsStateCallback = null;
+ mHandler.postDelayed(
+ ImsEmergencyRegistrationStateHelper.this::registerImsStateCallback,
+ MMTEL_FEATURE_AVAILABLE_WAIT_TIME_MILLIS);
+ }
+ };
+
+ try {
+ mMmTelManager.registerImsStateCallback(mHandler::post, mImsStateCallback);
+ } catch (ImsException e) {
+ loge("Exception when registering ImsStateCallback: " + e);
+ mImsStateCallback = null;
+ }
+ }
+
+ private void unregisterImsStateCallback() {
+ if (mImsStateCallback != null) {
+ try {
+ mMmTelManager.unregisterImsStateCallback(mImsStateCallback);
+ } catch (Exception ignored) {
+ // Ignore the runtime exception while unregistering callback.
+ logd("Exception when unregistering ImsStateCallback: " + ignored);
+ }
+ mImsStateCallback = null;
+ }
+ }
+
+ private void registerImsEmergencyRegistrationCallback() {
+ if (mRegistrationCallback != null) {
+ logd("RegistrationCallback is already registered for sub-" + mSubId);
+ return;
+ }
+
+ // Listens to the IMS emergency registration state change.
+ mRegistrationCallback = new RegistrationManager.RegistrationCallback() {
+ @Override
+ public void onRegistered(@NonNull ImsRegistrationAttributes attributes) {
+ mImsEmergencyRegistered = true;
+ }
+
+ @Override
+ public void onUnregistered(@NonNull ImsReasonInfo info) {
+ mImsEmergencyRegistered = false;
+ }
+ };
+
+ try {
+ mMmTelManager.registerImsEmergencyRegistrationCallback(mHandler::post,
+ mRegistrationCallback);
+ } catch (ImsException e) {
+ loge("Exception when registering RegistrationCallback: " + e);
+ mRegistrationCallback = null;
+ }
+ }
+
+ private void unregisterImsEmergencyRegistrationCallback() {
+ if (mRegistrationCallback != null) {
+ try {
+ mMmTelManager.unregisterImsEmergencyRegistrationCallback(mRegistrationCallback);
+ } catch (Exception ignored) {
+ // Ignore the runtime exception while unregistering callback.
+ logd("Exception when unregistering RegistrationCallback: " + ignored);
+ }
+ mRegistrationCallback = null;
+ }
+ }
+
+ private void logd(String s) {
+ Log.d(TAG, "[" + mSlotId + "|" + mSubId + "] " + s);
+ }
+
+ private void loge(String s) {
+ Log.e(TAG, "[" + mSlotId + "|" + mSubId + "] " + s);
+ }
+}
diff --git a/src/com/android/services/telephony/domainselection/NormalCallDomainSelector.java b/src/com/android/services/telephony/domainselection/NormalCallDomainSelector.java
index 31a1cc2..a7ed708 100644
--- a/src/com/android/services/telephony/domainselection/NormalCallDomainSelector.java
+++ b/src/com/android/services/telephony/domainselection/NormalCallDomainSelector.java
@@ -21,6 +21,7 @@
import android.annotation.NonNull;
import android.content.Context;
import android.os.Looper;
+import android.os.Message;
import android.os.PersistableBundle;
import android.telecom.TelecomManager;
import android.telephony.Annotation.DisconnectCauses;
@@ -35,6 +36,7 @@
import android.telephony.ims.ImsReasonInfo;
import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.telephony.CallFailCause;
/**
* Implements domain selector for outgoing non-emergency calls.
@@ -44,6 +46,13 @@
private static final String LOG_TAG = "NCDS";
+ // Wait-time for IMS state change callback.
+ @VisibleForTesting
+ protected static final int WAIT_FOR_IMS_STATE_TIMEOUT_MS = 3000; // 3 seconds
+
+ @VisibleForTesting
+ protected static final int MSG_WAIT_FOR_IMS_STATE_TIMEOUT = 11;
+
@VisibleForTesting
protected enum SelectorState {
ACTIVE,
@@ -66,12 +75,40 @@
logd("Subscribing to state callbacks. Subid:" + subId);
mImsStateTracker.addServiceStateListener(this);
mImsStateTracker.addImsStateListener(this);
+
} else {
loge("Invalid Subscription. Subid:" + subId);
}
}
@Override
+ public void handleMessage(Message message) {
+ switch (message.what) {
+
+ case MSG_WAIT_FOR_IMS_STATE_TIMEOUT: {
+ loge("ImsStateTimeout. ImsState callback not received");
+ if (mSelectorState != SelectorState.ACTIVE) {
+ return;
+ }
+
+ if (!mImsRegStateReceived) {
+ onImsRegistrationStateChanged();
+ }
+
+ if (!mMmTelCapabilitiesReceived) {
+ onImsMmTelCapabilitiesChanged();
+ }
+ }
+ break;
+
+ default: {
+ super.handleMessage(message);
+ }
+ break;
+ }
+ }
+
+ @Override
public void selectDomain(SelectionAttributes attributes, TransportSelectorCallback callback) {
mSelectionAttributes = attributes;
mTransportSelectorCallback = callback;
@@ -103,12 +140,16 @@
if (subId == getSubId()) {
logd("NormalCallDomainSelection triggered. Sub-id:" + subId);
+ if (!mReselectDomain) {
+ sendEmptyMessageDelayed(MSG_WAIT_FOR_IMS_STATE_TIMEOUT,
+ WAIT_FOR_IMS_STATE_TIMEOUT_MS);
+ }
post(() -> selectDomain());
} else {
mSelectorState = SelectorState.INACTIVE;
loge("Subscription-ids doesn't match. This instance is associated with sub-id:"
+ getSubId() + ", requested sub-id:" + subId);
- // TODO: Throw anamoly here. This condition should never occur.
+ // TODO: Throw anomaly here. This condition should never occur.
}
}
@@ -225,6 +266,12 @@
}
private void notifyCsSelected() {
+ if (isOutOfService()) {
+ loge("Cannot place call in current ServiceState: " + mServiceState.getState());
+ notifySelectionTerminated(DisconnectCause.OUT_OF_SERVICE);
+ return;
+ }
+
logd("notifyCsSelected");
mSelectorState = SelectorState.INACTIVE;
if (mWwanSelectorCallback == null) {
@@ -279,16 +326,47 @@
logd("WPS call placed over PS");
notifyPsSelected();
} else {
- if (isOutOfService()) {
- loge("Cannot place call in current ServiceState: " + mServiceState.getState());
- notifySelectionTerminated(DisconnectCause.OUT_OF_SERVICE);
- } else {
- logd("WPS call placed over CS");
- notifyCsSelected();
- }
+ logd("WPS call placed over CS");
+ notifyCsSelected();
}
}
+ private void handleReselectDomain(ImsReasonInfo imsReasonInfo) {
+ mReselectDomain = false;
+
+ // IMS -> CS
+ if (imsReasonInfo != null) {
+ logd("PsDisconnectCause:" + imsReasonInfo.getCode());
+ if (imsReasonInfo.getCode() == ImsReasonInfo.CODE_LOCAL_CALL_CS_RETRY_REQUIRED) {
+ logd("Redialing over CS");
+ notifyCsSelected();
+ } else {
+ // Not a valid redial
+ logd("Redialing cancelled.");
+ notifySelectionTerminated(DisconnectCause.NOT_VALID);
+ }
+ return;
+ }
+
+ // CS -> IMS
+ int csDisconnectCause = mSelectionAttributes.getCsDisconnectCause();
+ if (csDisconnectCause == CallFailCause.EMC_REDIAL_ON_IMS
+ || csDisconnectCause == CallFailCause.EMC_REDIAL_ON_VOWIFI) {
+ // Check IMS registration state.
+ if (mImsStateTracker.isImsRegistered()) {
+ logd("IMS is registered");
+ notifyPsSelected();
+ return;
+ }
+
+ logd("IMS is NOT registered");
+ }
+
+ // Not a valid redial
+ logd("Redialing cancelled.");
+ notifySelectionTerminated(DisconnectCause.NOT_VALID);
+ }
+
private boolean isTtySupportedByIms() {
CarrierConfigManager configManager = mContext.getSystemService(CarrierConfigManager.class);
@@ -314,6 +392,7 @@
private synchronized void selectDomain() {
if (mSelectorState != SelectorState.ACTIVE || mSelectionAttributes == null
|| mTransportSelectorCallback == null) {
+ mSelectorState = SelectorState.INACTIVE;
logd("Domain Selection is stopped.");
return;
}
@@ -324,45 +403,14 @@
}
// Check if this is a re-dial scenario
- // IMS -> CS
- ImsReasonInfo imsReasonInfo = mSelectionAttributes.getPsDisconnectCause();
- if (mReselectDomain && imsReasonInfo != null) {
- logd("PsDisconnectCause:" + imsReasonInfo.getCode());
- mReselectDomain = false;
- if (imsReasonInfo.getCode() == ImsReasonInfo.CODE_LOCAL_CALL_CS_RETRY_REQUIRED) {
- if (isOutOfService()) {
- loge("Cannot place call in current ServiceState: " + mServiceState.getState());
- notifySelectionTerminated(DisconnectCause.OUT_OF_SERVICE);
- } else {
- logd("Redialing over CS");
- notifyCsSelected();
- }
- return;
- } else {
- logd("Redialing cancelled.");
- // Not a valid redial
- notifySelectionTerminated(DisconnectCause.NOT_VALID);
- return;
- }
- }
-
- // CS -> IMS
- // TODO: @PreciseDisconnectCauses doesn't contain cause code related to redial on IMS.
- if (mReselectDomain /*mSelectionAttributes.getCsDisconnectCause() == IMS_REDIAL_CODE*/) {
- logd("Redialing cancelled.");
- // Not a valid redial
- notifySelectionTerminated(DisconnectCause.NOT_VALID);
+ if (mReselectDomain) {
+ handleReselectDomain(mSelectionAttributes.getPsDisconnectCause());
return;
}
if (!mImsStateTracker.isMmTelFeatureAvailable()) {
logd("MmTelFeatureAvailable unavailable");
- if (isOutOfService()) {
- loge("Cannot place call in current ServiceState: " + mServiceState.getState());
- notifySelectionTerminated(DisconnectCause.OUT_OF_SERVICE);
- } else {
- notifyCsSelected();
- }
+ notifyCsSelected();
return;
}
@@ -371,26 +419,20 @@
return;
}
+ if (hasMessages(MSG_WAIT_FOR_IMS_STATE_TIMEOUT)) {
+ removeMessages(MSG_WAIT_FOR_IMS_STATE_TIMEOUT);
+ }
+
// Check IMS registration state.
if (!mImsStateTracker.isImsRegistered()) {
logd("IMS is NOT registered");
- if (isOutOfService()) {
- loge("Cannot place call in current ServiceState: " + mServiceState.getState());
- notifySelectionTerminated(DisconnectCause.OUT_OF_SERVICE);
- } else {
- notifyCsSelected();
- }
+ notifyCsSelected();
return;
}
// Check TTY
if (isTtyModeEnabled() && !isTtySupportedByIms()) {
- if (isOutOfService()) {
- loge("Cannot place call in current ServiceState: " + mServiceState.getState());
- notifySelectionTerminated(DisconnectCause.OUT_OF_SERVICE);
- } else {
- notifyCsSelected();
- }
+ notifyCsSelected();
return;
}
@@ -419,17 +461,12 @@
} else {
logd("IMS is not voice capable");
// Voice call CS fallback
- if (isOutOfService()) {
- loge("Cannot place call in current ServiceState: " + mServiceState.getState());
- notifySelectionTerminated(DisconnectCause.OUT_OF_SERVICE);
- } else {
- notifyCsSelected();
- }
+ notifyCsSelected();
}
}
@VisibleForTesting
- public SelectorState getSelectorState() {
+ protected SelectorState getSelectorState() {
return mSelectorState;
}
}
diff --git a/src/com/android/services/telephony/domainselection/OWNERS b/src/com/android/services/telephony/domainselection/OWNERS
index 2a76770..5874c98 100644
--- a/src/com/android/services/telephony/domainselection/OWNERS
+++ b/src/com/android/services/telephony/domainselection/OWNERS
@@ -1,7 +1,7 @@
# automatically inherit owners from fw/opt/telephony
hwangoo@google.com
-forestchoi@google.com
+jaesikkong@google.com
avinashmp@google.com
mkoon@google.com
seheele@google.com
diff --git a/testapps/GbaTestApp/res/values-as/strings.xml b/testapps/GbaTestApp/res/values-as/strings.xml
index 3fbba0f..48b8163 100644
--- a/testapps/GbaTestApp/res/values-as/strings.xml
+++ b/testapps/GbaTestApp/res/values-as/strings.xml
@@ -20,7 +20,7 @@
<string name="request_naf_url" msgid="4487793541217737042">"নেটৱৰ্ক এপ্লিকেশ্বন ফাংশ্বন (NAF) URL"</string>
<string name="request_force_bootstrapping" msgid="206043602616214325">"বলেৰে বুটষ্ট্ৰেপিং কৰিবনে?"</string>
<string name="request_org" msgid="8416693445448308975">"প্ৰতিষ্ঠানৰ ক’ড"</string>
- <string name="request_security_protocol" msgid="1444164827561010482">"UA সুৰক্ষা প্ৰ’ট’কল আইডি"</string>
+ <string name="request_security_protocol" msgid="1444164827561010482">"UA সুৰক্ষা প্ৰ্ৰ\'টকল আইডি"</string>
<string name="request_tls_cipher_suite" msgid="6659854717595308404">"TLS Cipher Suite আইডি"</string>
<string name="response_success" msgid="2469204471244527663">"GBA প্ৰমাণীকৰণ সফল হৈছে নেকি?"</string>
<string name="response_fail_reason" msgid="3401426967253202496">"ব্যৰ্থতাৰ কাৰণৰ আইডি"</string>
diff --git a/testapps/GbaTestApp/res/values-fr-rCA/strings.xml b/testapps/GbaTestApp/res/values-fr-rCA/strings.xml
index 2c7abc6..a23732e 100644
--- a/testapps/GbaTestApp/res/values-fr-rCA/strings.xml
+++ b/testapps/GbaTestApp/res/values-fr-rCA/strings.xml
@@ -16,8 +16,8 @@
<string name="title_activity_test_config" msgid="7585204485536359713">"TestConfigActivity"</string>
<string name="service_package_name" msgid="7204809439090483315">"Nom de l\'ensemble de service GBA"</string>
<string name="service_release_time" msgid="532937496122890892">"Délai de libération du service après un appel"</string>
- <string name="request_app_type" msgid="3975978141673475612">"Type d\'application UICC"</string>
- <string name="request_naf_url" msgid="4487793541217737042">"URL de fonction d\'application réseau (NAF)"</string>
+ <string name="request_app_type" msgid="3975978141673475612">"Type d\'appli UICC"</string>
+ <string name="request_naf_url" msgid="4487793541217737042">"URL de fonction d\'appli réseau (NAF)"</string>
<string name="request_force_bootstrapping" msgid="206043602616214325">"Forcer l\'amorçage?"</string>
<string name="request_org" msgid="8416693445448308975">"Code d\'organisation"</string>
<string name="request_security_protocol" msgid="1444164827561010482">"Identifiant de protocole de sécurité UA"</string>
diff --git a/testapps/GbaTestApp/res/values-mn/strings.xml b/testapps/GbaTestApp/res/values-mn/strings.xml
index 0aa62b0..1559c33 100644
--- a/testapps/GbaTestApp/res/values-mn/strings.xml
+++ b/testapps/GbaTestApp/res/values-mn/strings.xml
@@ -25,7 +25,7 @@
<string name="response_success" msgid="2469204471244527663">"GBA-г амжилттай баталгаажуулсан уу?"</string>
<string name="response_fail_reason" msgid="3401426967253202496">"Амжилтгүй болсон шалтгааны ID"</string>
<string name="response_key" msgid="8839847772051686309">"GBA-н түлхүүр (CK + IK)"</string>
- <string name="response_btid" msgid="2550216722679350756">"Эхлүүлэх гүйлгээний таниулбар (B-TID)"</string>
+ <string name="response_btid" msgid="2550216722679350756">"Эхлүүлэх гүйлгээний танигч (B-TID)"</string>
<string name="sample_naf" msgid="255371174145881001">"3GPP-bootstrapping@naf1.operator.com"</string>
<string name="sample_btid" msgid="6967620309576384966">"(B-TID)"</string>
<string name="sample_key" msgid="3337589659405527482">"6629fae49393a05397450978507c4ef1"</string>
diff --git a/testapps/SmsManagerTestApp/src/com/android/phone/testapps/smsmanagertestapp/SmsManagerTestApp.java b/testapps/SmsManagerTestApp/src/com/android/phone/testapps/smsmanagertestapp/SmsManagerTestApp.java
index cc3769e..d599a86 100644
--- a/testapps/SmsManagerTestApp/src/com/android/phone/testapps/smsmanagertestapp/SmsManagerTestApp.java
+++ b/testapps/SmsManagerTestApp/src/com/android/phone/testapps/smsmanagertestapp/SmsManagerTestApp.java
@@ -184,7 +184,7 @@
intent.setComponent(SETTINGS_SUB_PICK_ACTIVITY);
intent.putExtra(DIALOG_TYPE_KEY, SMS_PICK);
try {
- startActivity(intent, null);
+ startActivity(intent);
} catch (ActivityNotFoundException anfe) {
// If Settings is not installed, only log the error as we do not want to break
// legacy applications.
diff --git a/testapps/TestRcsApp/TestApp/Android.bp b/testapps/TestRcsApp/TestApp/Android.bp
index ea62925..3bc31b1 100644
--- a/testapps/TestRcsApp/TestApp/Android.bp
+++ b/testapps/TestRcsApp/TestApp/Android.bp
@@ -17,14 +17,14 @@
"libphonenumber-platform",
],
- libs: ["org.apache.http.legacy"],
+ libs: ["org.apache.http.legacy.stubs.system"],
certificate: "platform",
privileged: true,
product_specific: true,
sdk_version: "system_current",
- min_sdk_version: "30",
+ min_sdk_version: "31",
required: ["privapp-permissions-com.google.android.sample.rcsclient.xml"],
lint: {
baseline_filename: "lint-baseline.xml",
diff --git a/testapps/TestRcsApp/aosp_test_rcsclient/Android.bp b/testapps/TestRcsApp/aosp_test_rcsclient/Android.bp
index e1de685..f6ed10f 100644
--- a/testapps/TestRcsApp/aosp_test_rcsclient/Android.bp
+++ b/testapps/TestRcsApp/aosp_test_rcsclient/Android.bp
@@ -17,7 +17,7 @@
libs: [
"auto_value_annotations",
- "org.apache.http.legacy",
+ "org.apache.http.legacy.stubs.system",
],
plugins: [
@@ -25,7 +25,7 @@
],
sdk_version: "system_current",
- min_sdk_version: "30",
+ min_sdk_version: "31",
lint: {
baseline_filename: "lint-baseline.xml",
},
diff --git a/testapps/TestSatelliteApp/res/layout/activity_Datagram.xml b/testapps/TestSatelliteApp/res/layout/activity_Datagram.xml
index 9e53f41..ba61328 100644
--- a/testapps/TestSatelliteApp/res/layout/activity_Datagram.xml
+++ b/testapps/TestSatelliteApp/res/layout/activity_Datagram.xml
@@ -15,12 +15,14 @@
~ limitations under the License
-->
-<LinearLayout
+<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center"
+ android:paddingTop="10dp"
+ android:paddingBottom="10dp"
android:paddingLeft="4dp">
<LinearLayout
@@ -125,4 +127,4 @@
android:textColor="@android:color/holo_blue_light"
android:textSize="15dp" />
</LinearLayout>
-</LinearLayout>
+</ScrollView>
diff --git a/testapps/TestSatelliteApp/res/layout/activity_MultipleSendReceive.xml b/testapps/TestSatelliteApp/res/layout/activity_MultipleSendReceive.xml
index 3632ecb..c81eb3b 100644
--- a/testapps/TestSatelliteApp/res/layout/activity_MultipleSendReceive.xml
+++ b/testapps/TestSatelliteApp/res/layout/activity_MultipleSendReceive.xml
@@ -15,12 +15,14 @@
~ limitations under the License
-->
-<LinearLayout
+<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center"
+ android:paddingTop="10dp"
+ android:paddingBottom="10dp"
android:paddingLeft="4dp">
<LinearLayout
@@ -95,4 +97,4 @@
android:layout_centerVertical="true"
android:textSize="15dp" />
</LinearLayout>
-</LinearLayout>
+</ScrollView>
diff --git a/testapps/TestSatelliteApp/res/layout/activity_NbIotSatellite.xml b/testapps/TestSatelliteApp/res/layout/activity_NbIotSatellite.xml
index c33522e..fef4292 100644
--- a/testapps/TestSatelliteApp/res/layout/activity_NbIotSatellite.xml
+++ b/testapps/TestSatelliteApp/res/layout/activity_NbIotSatellite.xml
@@ -15,79 +15,86 @@
~ limitations under the License
-->
-<LinearLayout
+<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center"
- android:paddingStart="4dp"
- android:paddingEnd="4dp">
+ android:paddingTop="10dp"
+ android:paddingBottom="10dp"
+ android:paddingLeft="4dp">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="0dp"
- android:layout_weight="0"
- android:textColor="@android:color/holo_blue_dark"
- android:textSize="20sp"
- android:text="@string/NbIotSatellite"/>
- <Button
- android:id="@+id/testRegisterForSupportedStateChanged"
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingStart="4dp"
- android:paddingEnd="4dp"
- android:text="@string/testRegisterForSupportedStateChanged"/>
- <Button
- android:id="@+id/testUnregisterForSupportedStateChanged"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingStart="4dp"
- android:paddingEnd="4dp"
- android:text="@string/testUnregisterForSupportedStateChanged"/>
- <Button
- android:id="@+id/testRequestIsSupported"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingStart="4dp"
- android:paddingEnd="4dp"
- android:text="@string/testRequestIsSupported"/>
- <Button
- android:id="@+id/reportSatelliteSupportedFromModem"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingStart="4dp"
- android:paddingEnd="4dp"
- android:text="@string/reportSatelliteSupportedFromModem"/>
- <Button
- android:id="@+id/reportSatelliteNotSupportedFromModem"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingStart="4dp"
- android:paddingEnd="4dp"
- android:text="@string/reportSatelliteNotSupportedFromModem"/>
- <Button
- android:id="@+id/showCurrentSatelliteSupportedStated"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingStart="4dp"
- android:paddingEnd="4dp"
- android:text="@string/showCurrentSatelliteSupportedStated"/>
- <Button
- android:id="@+id/Back"
- android:onClick="Back"
- android:textColor="@android:color/holo_blue_dark"
- android:layout_marginTop="100dp"
- android:layout_gravity="center"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingStart="4dp"
- android:paddingEnd="4dp"
- android:text="@string/Back"/>
- <TextView
- android:id="@+id/text_id"
- android:layout_width="300dp"
- android:layout_height="200dp"
- android:textColor="@android:color/holo_blue_light"
- android:textSize="15sp" />
-</LinearLayout>
+ android:orientation="vertical">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="0dp"
+ android:layout_weight="0"
+ android:textColor="@android:color/holo_blue_dark"
+ android:textSize="20sp"
+ android:text="@string/NbIotSatellite"/>
+ <Button
+ android:id="@+id/testRegisterForSupportedStateChanged"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="4dp"
+ android:paddingEnd="4dp"
+ android:text="@string/testRegisterForSupportedStateChanged"/>
+ <Button
+ android:id="@+id/testUnregisterForSupportedStateChanged"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="4dp"
+ android:paddingEnd="4dp"
+ android:text="@string/testUnregisterForSupportedStateChanged"/>
+ <Button
+ android:id="@+id/testRequestIsSupported"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="4dp"
+ android:paddingEnd="4dp"
+ android:text="@string/testRequestIsSupported"/>
+ <Button
+ android:id="@+id/reportSatelliteSupportedFromModem"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="4dp"
+ android:paddingEnd="4dp"
+ android:text="@string/reportSatelliteSupportedFromModem"/>
+ <Button
+ android:id="@+id/reportSatelliteNotSupportedFromModem"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="4dp"
+ android:paddingEnd="4dp"
+ android:text="@string/reportSatelliteNotSupportedFromModem"/>
+ <Button
+ android:id="@+id/showCurrentSatelliteSupportedStated"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="4dp"
+ android:paddingEnd="4dp"
+ android:text="@string/showCurrentSatelliteSupportedStated"/>
+ <Button
+ android:id="@+id/Back"
+ android:onClick="Back"
+ android:textColor="@android:color/holo_blue_dark"
+ android:layout_marginTop="100dp"
+ android:layout_gravity="center"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingStart="4dp"
+ android:paddingEnd="4dp"
+ android:text="@string/Back"/>
+ <TextView
+ android:id="@+id/text_id"
+ android:layout_width="300dp"
+ android:layout_height="200dp"
+ android:textColor="@android:color/holo_blue_light"
+ android:textSize="15sp" />
+ </LinearLayout>
+</ScrollView>
diff --git a/testapps/TestSatelliteApp/res/layout/activity_Provisioning.xml b/testapps/TestSatelliteApp/res/layout/activity_Provisioning.xml
index da5105d..afcc706 100644
--- a/testapps/TestSatelliteApp/res/layout/activity_Provisioning.xml
+++ b/testapps/TestSatelliteApp/res/layout/activity_Provisioning.xml
@@ -15,12 +15,14 @@
~ limitations under the License
-->
-<LinearLayout
+<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center"
+ android:paddingTop="10dp"
+ android:paddingBottom="10dp"
android:paddingLeft="4dp">
<LinearLayout
@@ -90,4 +92,4 @@
android:layout_centerVertical="true"
android:textSize="15dp" />
</LinearLayout>
-</LinearLayout>
+</ScrollView>
diff --git a/testapps/TestSatelliteApp/res/layout/activity_SatelliteControl.xml b/testapps/TestSatelliteApp/res/layout/activity_SatelliteControl.xml
index 6aec1da..2ace0ad 100644
--- a/testapps/TestSatelliteApp/res/layout/activity_SatelliteControl.xml
+++ b/testapps/TestSatelliteApp/res/layout/activity_SatelliteControl.xml
@@ -21,6 +21,8 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center"
+ android:paddingTop="10dp"
+ android:paddingBottom="10dp"
android:paddingLeft="4dp">
<LinearLayout
@@ -36,11 +38,17 @@
android:textSize="20dp"
android:text="Satellite Control APIs"/>
<Button
- android:id="@+id/enableSatellite"
+ android:id="@+id/enableSatelliteDemoMode"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingRight="4dp"
- android:text="@string/enableSatellite"/>
+ android:text="@string/enableSatelliteDemoMode"/>
+ <Button
+ android:id="@+id/enableSatelliteRealMode"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingRight="4dp"
+ android:text="@string/enableSatelliteRealMode"/>
<Button
android:id="@+id/disableSatellite"
android:layout_width="match_parent"
@@ -125,6 +133,18 @@
android:layout_height="wrap_content"
android:paddingRight="4dp"
android:text="@string/getIsEmergency"/>
+ <Button
+ android:id="@+id/requestSatelliteSubscriberProvisionStatus"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingRight="4dp"
+ android:text="@string/requestSatelliteSubscriberProvisionStatus"/>
+ <Button
+ android:id="@+id/provisionSatellite"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingRight="4dp"
+ android:text="@string/provisionSatellite"/>
<Button
android:id="@+id/Back"
android:onClick="Back"
diff --git a/testapps/TestSatelliteApp/res/layout/activity_SatelliteTestApp.xml b/testapps/TestSatelliteApp/res/layout/activity_SatelliteTestApp.xml
index 5ba7946..26b45e3 100644
--- a/testapps/TestSatelliteApp/res/layout/activity_SatelliteTestApp.xml
+++ b/testapps/TestSatelliteApp/res/layout/activity_SatelliteTestApp.xml
@@ -15,11 +15,14 @@
~ limitations under the License
-->
-<LinearLayout
+<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
+ android:gravity="center"
+ android:paddingTop="10dp"
+ android:paddingBottom="10dp"
android:paddingLeft="4dp">
<LinearLayout
@@ -79,4 +82,4 @@
android:paddingEnd="4dp"
android:text="@string/TestSatelliteWrapper"/>
</LinearLayout>
-</LinearLayout>
+</ScrollView>
diff --git a/testapps/TestSatelliteApp/res/layout/activity_SendReceive.xml b/testapps/TestSatelliteApp/res/layout/activity_SendReceive.xml
index 6490e5d..4ac3483 100644
--- a/testapps/TestSatelliteApp/res/layout/activity_SendReceive.xml
+++ b/testapps/TestSatelliteApp/res/layout/activity_SendReceive.xml
@@ -15,12 +15,14 @@
~ limitations under the License
-->
-<LinearLayout
+<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center"
+ android:paddingTop="10dp"
+ android:paddingBottom="10dp"
android:paddingLeft="4dp">
<LinearLayout
@@ -94,4 +96,4 @@
android:layout_centerVertical="true"
android:textSize="15dp" />
</LinearLayout>
-</LinearLayout>
+</ScrollView>
diff --git a/testapps/TestSatelliteApp/res/layout/activity_TestSatelliteWrapper.xml b/testapps/TestSatelliteApp/res/layout/activity_TestSatelliteWrapper.xml
index 7f2f026..f4ed82e 100644
--- a/testapps/TestSatelliteApp/res/layout/activity_TestSatelliteWrapper.xml
+++ b/testapps/TestSatelliteApp/res/layout/activity_TestSatelliteWrapper.xml
@@ -14,10 +14,16 @@
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
+
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:gravity="center"
+ android:paddingTop="10dp"
+ android:paddingBottom="10dp"
+ android:paddingLeft="4dp">
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
@@ -25,7 +31,8 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center"
- android:paddingStart="4dp">
+ android:paddingStart="4dp"
+ android:paddingTop="68dp">
<TextView
android:layout_width="wrap_content"
@@ -130,6 +137,42 @@
android:layout_height="wrap_content"
android:paddingRight="4dp"
android:text="@string/getSatellitePlmnsForCarrier"/>
+ <Button
+ android:id="@+id/registerForCarrierRoamingNtnModeChanged"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingRight="4dp"
+ android:text="@string/registerForCarrierRoamingNtnModeChanged"/>
+ <Button
+ android:id="@+id/unregisterForCarrierRoamingNtnModeChanged"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingRight="4dp"
+ android:text="@string/unregisterForCarrierRoamingNtnModeChanged"/>
+ <Button
+ android:id="@+id/registerForCommunicationAllowedStateChanged"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingRight="4dp"
+ android:text="@string/registerForCommunicationAllowedStateChanged"/>
+ <Button
+ android:id="@+id/unregisterForCommunicationAllowedStateChanged"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingRight="4dp"
+ android:text="@string/unregisterForCommunicationAllowedStateChanged"/>
+ <Button
+ android:id="@+id/registerForModemStateChanged"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingRight="4dp"
+ android:text="@string/registerForModemStateChanged"/>
+ <Button
+ android:id="@+id/unregisterForModemStateChanged"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingRight="4dp"
+ android:text="@string/unregisterForModemStateChanged"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -166,5 +209,4 @@
android:layout_centerVertical="true"
android:textSize="8dp" />
</LinearLayout>
-
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/testapps/TestSatelliteApp/res/values/donottranslate_strings.xml b/testapps/TestSatelliteApp/res/values/donottranslate_strings.xml
index df2aaf7..b0aa492 100644
--- a/testapps/TestSatelliteApp/res/values/donottranslate_strings.xml
+++ b/testapps/TestSatelliteApp/res/values/donottranslate_strings.xml
@@ -23,7 +23,8 @@
<string name="SendReceive">Send and Receive datagrams</string>
<string name="NbIotSatellite">NB IoT Satellite modem interface test</string>
- <string name="enableSatellite">enableSatellite</string>
+ <string name="enableSatelliteRealMode">enableSatellite Real Mode</string>
+ <string name="enableSatelliteDemoMode">enableSatellite Demo Mode</string>
<string name="disableSatellite">disableSatellite</string>
<string name="requestIsSatelliteEnabled">requestIsSatelliteEnabled</string>
<string name="requestIsDemoModeEnabled">requestIsDemoModeEnabled</string>
@@ -44,6 +45,8 @@
<string name="stopSatelliteTransmissionUpdates">stopSatelliteTransmissionUpdates</string>
<string name="showDatagramSendStateTransition">showDatagramSendStateTransition</string>
<string name="showDatagramReceiveStateTransition">showDatagramReceiveStateTransition</string>
+ <string name="registerForCommunicationAllowedStateChanged">registerForCommunicationAllowedStateChanged</string>
+ <string name="unregisterForCommunicationAllowedStateChanged">unregisterForCommunicationAllowedStateChanged</string>
<string name="provisionSatelliteService">provisionSatelliteService</string>
<string name="deprovisionSatelliteService">deprovisionSatelliteService</string>
@@ -91,6 +94,15 @@
<string name="reportSatelliteNotSupportedFromModem">reportSatelliteNotSupportedFromModem</string>
<string name="showCurrentSatelliteSupportedStated">showCurrentSatelliteSupportedStated</string>
+ <string name="requestSatelliteSubscriberProvisionStatus">requestSatelliteSubscriberProvisionStatus</string>
+ <string name="provisionSatellite">provisionSatellite</string>
+
<string name="Back">Back</string>
<string name="ClearLog">Clear Log</string>
+
+ <string name="registerForCarrierRoamingNtnModeChanged">registerForCarrierRoamingNtnModeChanged</string>
+ <string name="unregisterForCarrierRoamingNtnModeChanged">unregisterForCarrierRoamingNtnModeChanged</string>
+
+ <string name="registerForModemStateChanged">registerForModemStateChanged</string>
+ <string name="unregisterForModemStateChanged">unregisterForModemStateChanged</string>
</resources>
diff --git a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/Provisioning.java b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/Provisioning.java
index 20c5ef5..15c8fd8 100644
--- a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/Provisioning.java
+++ b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/Provisioning.java
@@ -39,7 +39,7 @@
*/
public class Provisioning extends Activity {
- private static final String TAG = "Provisioning";
+ private static final String TAG = "SatelliteProvisioning";
private boolean mProvisioned = false;
diff --git a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/SatelliteControl.java b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/SatelliteControl.java
index a03f04e..5d47929 100644
--- a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/SatelliteControl.java
+++ b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/SatelliteControl.java
@@ -25,12 +25,15 @@
import android.telephony.satellite.EnableRequestAttributes;
import android.telephony.satellite.SatelliteCapabilities;
import android.telephony.satellite.SatelliteManager;
+import android.telephony.satellite.SatelliteSubscriberInfo;
+import android.telephony.satellite.SatelliteSubscriberProvisionStatus;
import android.telephony.satellite.stub.SatelliteResult;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.TextView;
import java.time.Duration;
+import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
@@ -45,6 +48,8 @@
private SatelliteManager mSatelliteManager;
private SubscriptionManager mSubscriptionManager;
+ private List<SatelliteSubscriberProvisionStatus> mSatelliteSubscriberProvisionStatuses =
+ new ArrayList<>();
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -53,8 +58,10 @@
mSubscriptionManager = getSystemService(SubscriptionManager.class);
setContentView(R.layout.activity_SatelliteControl);
- findViewById(R.id.enableSatellite)
- .setOnClickListener(this::enableSatelliteApp);
+ findViewById(R.id.enableSatelliteDemoMode)
+ .setOnClickListener(v -> enableSatelliteApp(/* isDemoMode */ true));
+ findViewById(R.id.enableSatelliteRealMode)
+ .setOnClickListener(v -> enableSatelliteApp(/* isDemoMode */ false));
findViewById(R.id.disableSatellite)
.setOnClickListener(this::disableSatelliteApp);
findViewById(R.id.requestIsSatelliteEnabled)
@@ -83,6 +90,10 @@
.setOnClickListener(this::isRequestIsSatelliteEnabledForCarrierApp);
findViewById(R.id.getIsEmergency)
.setOnClickListener(this::getIsEmergencyApp);
+ findViewById(R.id.requestSatelliteSubscriberProvisionStatus)
+ .setOnClickListener(this::requestSatelliteSubscriberProvisionStatusApp);
+ findViewById(R.id.provisionSatellite)
+ .setOnClickListener(this::provisionSatelliteApp);
findViewById(R.id.Back).setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
@@ -91,10 +102,12 @@
});
}
- private void enableSatelliteApp(View view) {
+ private void enableSatelliteApp(boolean isDemoMode) {
LinkedBlockingQueue<Integer> error = new LinkedBlockingQueue<>(1);
mSatelliteManager.requestEnabled(
- new EnableRequestAttributes.Builder(true).setDemoMode(true).setEmergencyMode(true)
+ new EnableRequestAttributes.Builder(true)
+ .setDemoMode(isDemoMode)
+ .setEmergencyMode(true)
.build(), Runnable::run, error::offer);
TextView textView = findViewById(R.id.text_id);
try {
@@ -383,4 +396,68 @@
+ SatelliteTestApp.getTestSatelliteService()
.getIsEmergency());
}
+
+ private void requestSatelliteSubscriberProvisionStatusApp(View view) {
+ final AtomicReference<List<SatelliteSubscriberProvisionStatus>> list =
+ new AtomicReference<>();
+ final AtomicReference<Integer> errorCode = new AtomicReference<>();
+ OutcomeReceiver<List<SatelliteSubscriberProvisionStatus>,
+ SatelliteManager.SatelliteException>
+ receiver =
+ new OutcomeReceiver<>() {
+ @Override
+ public void onResult(List<SatelliteSubscriberProvisionStatus> result) {
+ mSatelliteSubscriberProvisionStatuses = result;
+ list.set(result);
+ TextView textView = findViewById(R.id.text_id);
+ String text = "requestSatelliteSubscriberProvisionStatus: result=";
+ for (SatelliteSubscriberProvisionStatus psi : result) {
+ text += "" + psi + " , ";
+ }
+ textView.setText(text);
+ }
+
+ @Override
+ public void onError(SatelliteManager.SatelliteException exception) {
+ errorCode.set(exception.getErrorCode());
+ TextView textView = findViewById(R.id.text_id);
+ textView.setText(
+ "Status for requestSatelliteSubscriberProvisionStatus error : "
+ + SatelliteErrorUtils.mapError(errorCode.get()));
+ }
+ };
+ mSatelliteManager.requestSatelliteSubscriberProvisionStatus(Runnable::run, receiver);
+ }
+
+ private void provisionSatelliteApp(View view) {
+ final AtomicReference<Boolean> enabled = new AtomicReference<>();
+ final AtomicReference<Integer> errorCode = new AtomicReference<>();
+ OutcomeReceiver<Boolean, SatelliteManager.SatelliteException> receiver =
+ new OutcomeReceiver<>() {
+ @Override
+ public void onResult(Boolean result) {
+ enabled.set(result);
+ TextView textView = findViewById(R.id.text_id);
+ if (enabled.get()) {
+ textView.setText("provisionSatellite is true");
+ } else {
+ textView.setText("Status for provisionSatellite result : "
+ + enabled.get());
+ }
+ }
+
+ @Override
+ public void onError(SatelliteManager.SatelliteException exception) {
+ errorCode.set(exception.getErrorCode());
+ TextView textView = findViewById(R.id.text_id);
+ textView.setText("Status for provisionSatellite error : "
+ + SatelliteErrorUtils.mapError(errorCode.get()));
+ }
+ };
+ List<SatelliteSubscriberInfo> list = new ArrayList<>();
+ for (SatelliteSubscriberProvisionStatus status : mSatelliteSubscriberProvisionStatuses) {
+ list.add(status.getSatelliteSubscriberInfo());
+ }
+ mSatelliteManager.provisionSatellite(list, Runnable::run, receiver);
+ }
}
diff --git a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/TestSatelliteService.java b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/TestSatelliteService.java
index d79240e..9c75a84 100644
--- a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/TestSatelliteService.java
+++ b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/TestSatelliteService.java
@@ -33,9 +33,11 @@
import android.telephony.satellite.stub.SatelliteCapabilities;
import android.telephony.satellite.stub.SatelliteDatagram;
import android.telephony.satellite.stub.SatelliteImplBase;
+import android.telephony.satellite.stub.SatelliteModemEnableRequestAttributes;
import android.telephony.satellite.stub.SatelliteModemState;
import android.telephony.satellite.stub.SatelliteResult;
import android.telephony.satellite.stub.SatelliteService;
+import android.telephony.satellite.stub.SystemSelectionSpecifier;
import android.util.Log;
import com.android.internal.util.FunctionalUtils;
@@ -92,7 +94,6 @@
private boolean mIsCommunicationAllowedInLocation;
private boolean mIsEnabled;
- private boolean mIsProvisioned;
private boolean mIsSupported;
private int mModemState;
private boolean mIsCellularModemEnabledMode;
@@ -112,7 +113,6 @@
super(executor);
mIsCommunicationAllowedInLocation = true;
mIsEnabled = false;
- mIsProvisioned = false;
mIsSupported = true;
mModemState = SatelliteModemState.SATELLITE_MODEM_STATE_OFF;
mIsCellularModemEnabledMode = false;
@@ -185,21 +185,25 @@
}
@Override
- public void requestSatelliteEnabled(boolean enableSatellite, boolean enableDemoMode,
- boolean isEmergency, @NonNull IIntegerConsumer errorCallback) {
- logd("requestSatelliteEnabled: mErrorCode=" + mErrorCode + " enable = " + enableSatellite
- + " isEmergency=" + isEmergency);
+ public void requestSatelliteEnabled(SatelliteModemEnableRequestAttributes enableAttributes,
+ @NonNull IIntegerConsumer errorCallback) {
+ logd("requestSatelliteEnabled: mErrorCode=" + mErrorCode
+ + ", isEnabled=" + enableAttributes.isEnabled
+ + ", isDemoMode=" + enableAttributes.isDemoMode
+ + ", isEmergency= " + enableAttributes.isEmergencyMode
+ + ", iccId=" + enableAttributes.satelliteSubscriptionInfo.iccId
+ + ", niddApn=" + enableAttributes.satelliteSubscriptionInfo.niddApn);
if (mErrorCode != SatelliteResult.SATELLITE_RESULT_SUCCESS) {
runWithExecutor(() -> errorCallback.accept(mErrorCode));
return;
}
- if (enableSatellite) {
+ if (enableAttributes.isEnabled) {
enableSatellite(errorCallback);
} else {
disableSatellite(errorCallback);
}
- mIsEmergnecy = isEmergency;
+ mIsEmergnecy = enableAttributes.isEmergencyMode;
}
private void enableSatellite(@NonNull IIntegerConsumer errorCallback) {
@@ -296,41 +300,6 @@
}
@Override
- public void provisionSatelliteService(@NonNull String token, @NonNull byte[] provisionData,
- @NonNull IIntegerConsumer errorCallback) {
- logd("provisionSatelliteService: mErrorCode=" + mErrorCode);
- if (mErrorCode != SatelliteResult.SATELLITE_RESULT_SUCCESS) {
- runWithExecutor(() -> errorCallback.accept(mErrorCode));
- return;
- }
- runWithExecutor(() -> errorCallback.accept(SatelliteResult.SATELLITE_RESULT_SUCCESS));
- updateSatelliteProvisionState(true);
- }
-
- @Override
- public void deprovisionSatelliteService(@NonNull String token,
- @NonNull IIntegerConsumer errorCallback) {
- logd("deprovisionSatelliteService: mErrorCode=" + mErrorCode);
- if (mErrorCode != SatelliteResult.SATELLITE_RESULT_SUCCESS) {
- runWithExecutor(() -> errorCallback.accept(mErrorCode));
- return;
- }
- runWithExecutor(() -> errorCallback.accept(SatelliteResult.SATELLITE_RESULT_SUCCESS));
- updateSatelliteProvisionState(false);
- }
-
- @Override
- public void requestIsSatelliteProvisioned(@NonNull IIntegerConsumer errorCallback,
- @NonNull IBooleanConsumer callback) {
- logd("requestIsSatelliteProvisioned: mErrorCode=" + mErrorCode);
- if (mErrorCode != SatelliteResult.SATELLITE_RESULT_SUCCESS) {
- runWithExecutor(() -> errorCallback.accept(mErrorCode));
- return;
- }
- runWithExecutor(() -> callback.accept(mIsProvisioned));
- }
-
- @Override
public void pollPendingSatelliteDatagrams(@NonNull IIntegerConsumer errorCallback) {
logd("pollPendingSatelliteDatagrams: mErrorCode=" + mErrorCode);
if (mErrorCode != SatelliteResult.SATELLITE_RESULT_SUCCESS) {
@@ -434,6 +403,23 @@
mIsRequestIsSatelliteEnabledForCarrier = true;
}
+ @Override
+ public void updateSatelliteSubscription(@NonNull String iccId,
+ @NonNull IIntegerConsumer resultCallback) {
+ logd("updateSatelliteSubscription: iccId=" + iccId + " mErrorCode=" + mErrorCode);
+ runWithExecutor(() -> resultCallback.accept(mErrorCode));
+ }
+
+ @Override
+ public void updateSystemSelectionChannels(
+ @NonNull List<SystemSelectionSpecifier> systemSelectionSpecifiers,
+ @NonNull IIntegerConsumer resultCallback) {
+ logd(" updateSystemSelectionChannels: "
+ + "systemSelectionSpecifiers=" + systemSelectionSpecifiers
+ + " mErrorCode=" + mErrorCode);
+ runWithExecutor(() -> resultCallback.accept(mErrorCode));
+ }
+
public void setLocalSatelliteListener(@NonNull ILocalSatelliteListener listener) {
logd("setLocalSatelliteListener: listener=" + listener);
mLocalListener = listener;
@@ -494,11 +480,6 @@
SatelliteResult.SATELLITE_RESULT_REQUEST_NOT_SUPPORTED));
return false;
}
- if (!mIsProvisioned) {
- runWithExecutor(() -> errorCallback.accept(
- SatelliteResult.SATELLITE_RESULT_SERVICE_NOT_PROVISIONED));
- return false;
- }
if (!mIsEnabled) {
runWithExecutor(() -> errorCallback.accept(
SatelliteResult.SATELLITE_RESULT_INVALID_MODEM_STATE));
@@ -527,24 +508,6 @@
}
/**
- * Update the satellite provision state and notify listeners if it changed.
- *
- * @param isProvisioned {@code true} if the satellite is currently provisioned and
- * {@code false} if it is not.
- */
- private void updateSatelliteProvisionState(boolean isProvisioned) {
- logd("updateSatelliteProvisionState: isProvisioned=" + isProvisioned
- + ", mIsProvisioned=" + mIsProvisioned);
- if (isProvisioned == mIsProvisioned) {
- return;
- }
- mIsProvisioned = isProvisioned;
- logd("updateSatelliteProvisionState: mRemoteListeners.size=" + mRemoteListeners.size());
- mRemoteListeners.values().forEach(listener -> runWithExecutor(() ->
- listener.onSatelliteProvisionStateChanged(mIsProvisioned)));
- }
-
- /**
* Execute the given runnable using the executor that this service was created with.
*
* @param r A runnable that can throw an exception.
diff --git a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/TestSatelliteWrapper.java b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/TestSatelliteWrapper.java
index 27967f4..d8e6e7c 100644
--- a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/TestSatelliteWrapper.java
+++ b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/TestSatelliteWrapper.java
@@ -23,10 +23,13 @@
import android.os.OutcomeReceiver;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
+import android.telephony.satellite.wrapper.CarrierRoamingNtnModeListenerWrapper2;
import android.telephony.satellite.wrapper.NtnSignalStrengthCallbackWrapper;
import android.telephony.satellite.wrapper.NtnSignalStrengthWrapper;
import android.telephony.satellite.wrapper.SatelliteCapabilitiesCallbackWrapper;
+import android.telephony.satellite.wrapper.SatelliteCommunicationAllowedStateCallbackWrapper;
import android.telephony.satellite.wrapper.SatelliteManagerWrapper;
+import android.telephony.satellite.wrapper.SatelliteModemStateCallbackWrapper2;
import android.util.Log;
import android.view.View;
import android.view.View.OnClickListener;
@@ -53,6 +56,9 @@
private final ExecutorService mExecutor = Executors.newSingleThreadExecutor();
private SatelliteManagerWrapper mSatelliteManagerWrapper;
private NtnSignalStrengthCallback mNtnSignalStrengthCallback = null;
+ private SatelliteModemStateCallback mModemStateCallback = null;
+ private CarrierRoamingNtnModeListener mCarrierRoamingNtnModeListener = null;
+ private SatelliteCommunicationAllowedStateCallback mSatelliteCommunicationAllowedStateCallback;
private SatelliteCapabilitiesCallbackWrapper mSatelliteCapabilitiesCallback;
private SubscriptionManager mSubscriptionManager;
private int mSubId;
@@ -99,6 +105,19 @@
.setOnClickListener(this::getAttachRestrictionReasonsForCarrier);
findViewById(R.id.getSatellitePlmnsForCarrier)
.setOnClickListener(this::getSatellitePlmnsForCarrier);
+ findViewById(R.id.registerForCarrierRoamingNtnModeChanged)
+ .setOnClickListener(this::registerForCarrierRoamingNtnModeChanged);
+ findViewById(R.id.unregisterForCarrierRoamingNtnModeChanged)
+ .setOnClickListener(this::unregisterForCarrierRoamingNtnModeChanged);
+ findViewById(R.id.registerForCommunicationAllowedStateChanged)
+ .setOnClickListener(this::registerForCommunicationAllowedStateChanged);
+ findViewById(R.id.unregisterForCommunicationAllowedStateChanged)
+ .setOnClickListener(this::unregisterForCommunicationAllowedStateChanged);
+ findViewById(R.id.registerForModemStateChanged)
+ .setOnClickListener(this::registerForModemStateChanged);
+ findViewById(R.id.unregisterForModemStateChanged)
+ .setOnClickListener(this::unregisterForModemStateChanged);
+
findViewById(R.id.Back).setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
@@ -180,6 +199,71 @@
}
}
+ private void registerForCarrierRoamingNtnModeChanged(View view) {
+ addLogMessage("registerForCarrierRoamingNtnModeChanged");
+ logd("registerForCarrierRoamingNtnModeChanged()");
+ if (mCarrierRoamingNtnModeListener == null) {
+ logd("Creating new CarrierRoamingNtnModeListener instance.");
+ mCarrierRoamingNtnModeListener = new CarrierRoamingNtnModeListener();
+ }
+
+ try {
+ mSatelliteManagerWrapper.registerForCarrierRoamingNtnModeChanged(mSubId, mExecutor,
+ mCarrierRoamingNtnModeListener);
+ } catch (Exception ex) {
+ String errorMessage = "registerForCarrierRoamingNtnModeChanged: " + ex.getMessage();
+ logd(errorMessage);
+ addLogMessage(errorMessage);
+ mCarrierRoamingNtnModeListener = null;
+ }
+ }
+
+ private void unregisterForCarrierRoamingNtnModeChanged(View view) {
+ addLogMessage("unregisterForCarrierRoamingNtnModeChanged");
+ logd("unregisterForCarrierRoamingNtnModeChanged()");
+ if (mCarrierRoamingNtnModeListener != null) {
+ mSatelliteManagerWrapper.unregisterForCarrierRoamingNtnModeChanged(mSubId,
+ mCarrierRoamingNtnModeListener);
+ mCarrierRoamingNtnModeListener = null;
+ addLogMessage("mCarrierRoamingNtnModeListener was unregistered");
+ } else {
+ addLogMessage("mCarrierRoamingNtnModeListener is null, ignored.");
+ }
+ }
+
+ private void registerForCommunicationAllowedStateChanged(View view) {
+ addLogMessage("registerForCommunicationAllowedStateChanged");
+ logd("registerForCommunicationAllowedStateChanged()");
+ if (mSatelliteCommunicationAllowedStateCallback == null) {
+ logd("Creating new CarrierRoamingNtnModeListener instance.");
+ mSatelliteCommunicationAllowedStateCallback =
+ new SatelliteCommunicationAllowedStateCallback();
+ }
+
+ try {
+ mSatelliteManagerWrapper.registerForCommunicationAllowedStateChanged(mExecutor,
+ mSatelliteCommunicationAllowedStateCallback);
+ } catch (Exception ex) {
+ String errorMessage = "registerForCommunicationAllowedStateChanged: " + ex.getMessage();
+ logd(errorMessage);
+ addLogMessage(errorMessage);
+ mSatelliteCommunicationAllowedStateCallback = null;
+ }
+ }
+
+ private void unregisterForCommunicationAllowedStateChanged(View view) {
+ addLogMessage("unregisterForCommunicationAllowedStateChanged");
+ logd("unregisterForCommunicationAllowedStateChanged()");
+ if (mSatelliteCommunicationAllowedStateCallback != null) {
+ mSatelliteManagerWrapper.unregisterForCommunicationAllowedStateChanged(
+ mSatelliteCommunicationAllowedStateCallback);
+ mSatelliteCommunicationAllowedStateCallback = null;
+ addLogMessage("mSatelliteCommunicationAllowedStateCallback was unregistered");
+ } else {
+ addLogMessage("mSatelliteCommunicationAllowedStateCallback is null, ignored.");
+ }
+ }
+
private void registerForNtnSignalStrengthChanged(View view) {
addLogMessage("registerForNtnSignalStrengthChanged");
logd("registerForNtnSignalStrengthChanged()");
@@ -275,6 +359,38 @@
}
}
+ private void registerForModemStateChanged(View view) {
+ addLogMessage("registerForModemStateChanged");
+ logd("registerForSatelliteModemStateChanged()");
+ if (mModemStateCallback == null) {
+ logd("create new ModemStateCallback instance.");
+ mModemStateCallback = new SatelliteModemStateCallback();
+ }
+
+ try {
+ mSatelliteManagerWrapper.registerForModemStateChanged(mExecutor, mModemStateCallback);
+ } catch (Exception ex) {
+ String errorMessage = "registerForModemStateChanged: " + ex.getMessage();
+ logd(errorMessage);
+ addLogMessage(errorMessage);
+ mModemStateCallback = null;
+ }
+ }
+
+ private void unregisterForModemStateChanged(View view) {
+ addLogMessage("unregisterForModemStateChanged");
+ logd("unregisterForModemStateChanged()");
+ if (mModemStateCallback != null) {
+ mSatelliteManagerWrapper.unregisterForModemStateChanged(mModemStateCallback);
+ mModemStateCallback = null;
+ addLogMessage("mModemStateCallback was unregistered");
+ } else {
+ addLogMessage("mModemStateCallback is null, ignored.");
+ }
+ }
+
+
+
public class NtnSignalStrengthCallback implements NtnSignalStrengthCallbackWrapper {
@Override
public void onNtnSignalStrengthChanged(
@@ -285,6 +401,52 @@
}
}
+ private class CarrierRoamingNtnModeListener implements CarrierRoamingNtnModeListenerWrapper2 {
+
+ @Override
+ public void onCarrierRoamingNtnModeChanged(boolean active) {
+ String message = "Received onCarrierRoamingNtnModeChanged active: " + active;
+ logd(message);
+ addLogMessage(message);
+ }
+
+ @Override
+ public void onCarrierRoamingNtnEligibleStateChanged(boolean eligible) {
+ String message = "Received onCarrierRoamingNtnEligibleStateChanged "
+ + "eligible: " + eligible;
+ logd(message);
+ addLogMessage(message);
+ }
+ }
+
+ private class SatelliteCommunicationAllowedStateCallback implements
+ SatelliteCommunicationAllowedStateCallbackWrapper {
+
+ @Override
+ public void onSatelliteCommunicationAllowedStateChanged(boolean isAllowed) {
+ String message =
+ "Received onSatelliteCommunicationAllowedStateChanged isAllowed: " + isAllowed;
+ logd(message);
+ addLogMessage(message);
+ }
+ }
+
+ private class SatelliteModemStateCallback implements SatelliteModemStateCallbackWrapper2 {
+ @Override
+ public void onSatelliteModemStateChanged(int state) {
+ String message = "Received onSatelliteModemStateChanged state: " + state;
+ logd(message);
+ addLogMessage(message);
+ }
+
+ @Override
+ public void onEmergencyModeChanged(boolean isEmergency) {
+ String message = "Received onEmergencyModeChanged isEmergency: " + isEmergency;
+ logd(message);
+ addLogMessage(message);
+ }
+ }
+
private void isNonTerrestrialNetwork(View view) {
boolean isNonTerrestrialNetwork = mSatelliteManagerWrapper.isNonTerrestrialNetwork(mSubId);
addLogMessage("isNonTerrestrialNetwork=" + isNonTerrestrialNetwork);
diff --git a/testapps/TestSliceApp/app/src/main/Android.bp b/testapps/TestSliceApp/app/src/main/Android.bp
index b02d5ff..fa22c2b 100644
--- a/testapps/TestSliceApp/app/src/main/Android.bp
+++ b/testapps/TestSliceApp/app/src/main/Android.bp
@@ -12,7 +12,7 @@
"androidx-constraintlayout_constraintlayout",
"androidx.appcompat_appcompat",
],
- libs: ["org.apache.http.legacy"],
+ libs: ["org.apache.http.legacy.stubs.system"],
certificate: "platform",
privileged: true,
product_specific: true,
diff --git a/tests/Android.bp b/tests/Android.bp
index 6914839..22b2f46 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -25,12 +25,12 @@
srcs: ["src/**/*.java"],
libs: [
- "android.test.mock",
- "android.test.runner",
+ "android.test.mock.stubs.system",
+ "android.test.runner.stubs.system",
"telephony-common",
- "android.test.base",
+ "android.test.base.stubs.system",
"ims-common",
- "android.test.mock",
+ "android.test.mock.stubs.system",
],
platform_apis: true,
certificate: "platform",
@@ -50,7 +50,6 @@
"testables",
"platform-compat-test-rules",
"flag-junit",
- "telephony_flags_core_java_lib",
"satellite-s2storage-rw",
"satellite-s2storage-testutils",
"s2-geometry-library-java",
diff --git a/tests/src/com/android/TestContext.java b/tests/src/com/android/TestContext.java
index a96ce2e..e464ad5 100644
--- a/tests/src/com/android/TestContext.java
+++ b/tests/src/com/android/TestContext.java
@@ -33,6 +33,7 @@
import android.os.Looper;
import android.os.PersistableBundle;
import android.os.Process;
+import android.os.UserHandle;
import android.os.UserManager;
import android.telecom.TelecomManager;
import android.telephony.CarrierConfigManager;
@@ -112,6 +113,11 @@
}
@Override
+ public void startActivityAsUser(Intent intent, UserHandle user) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
public void sendBroadcast(Intent intent) {
mIntent = intent;
}
diff --git a/tests/src/com/android/phone/CarrierConfigLoaderTest.java b/tests/src/com/android/phone/CarrierConfigLoaderTest.java
index f4197d9..bda2313 100644
--- a/tests/src/com/android/phone/CarrierConfigLoaderTest.java
+++ b/tests/src/com/android/phone/CarrierConfigLoaderTest.java
@@ -429,11 +429,16 @@
@Test
@EnableCompatChanges({TelephonyManager.ENABLE_FEATURE_MAPPING})
- public void testGetConfigForSubIdWithFeature_withTelephonyFeatureMapping() {
+ public void testGetConfigForSubIdWithFeature_withTelephonyFeatureMapping() throws Exception {
doNothing().when(mContext).enforcePermission(
eq(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE),
anyInt(), anyInt(), anyString());
+ // Replace field to set SDK version of vendor partition to Android V
+ int vendorApiLevel = Build.VERSION_CODES.VANILLA_ICE_CREAM;
+ replaceInstance(CarrierConfigLoader.class, "mVendorApiLevel", mCarrierConfigLoader,
+ vendorApiLevel);
+
doReturn(true).when(mFeatureFlags).enforceTelephonyFeatureMappingForPublicApis();
doReturn(false).when(mPackageManager).hasSystemFeature(
eq(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
diff --git a/tests/src/com/android/phone/ImsProvisioningControllerTest.java b/tests/src/com/android/phone/ImsProvisioningControllerTest.java
index 6599f03..c696151 100644
--- a/tests/src/com/android/phone/ImsProvisioningControllerTest.java
+++ b/tests/src/com/android/phone/ImsProvisioningControllerTest.java
@@ -112,6 +112,7 @@
REGISTRATION_TECH_NR
};
private static final int RADIO_TECH_INVALID = ImsRegistrationImplBase.REGISTRATION_TECH_NONE;
+ private static final String TEST_ATTR = "TEST";
@Mock
Context mContext;
@@ -636,7 +637,8 @@
for (int i = 0; i < RADIO_TECHS.length; i++) {
// get provisioning status
provisioned = mTestImsProvisioningController
- .getImsProvisioningStatusForCapability(mSubId0, capability, RADIO_TECHS[i]);
+ .getImsProvisioningStatusForCapability(TEST_ATTR, mSubId0, capability,
+ RADIO_TECHS[i]);
// verify return value
assertEquals(expectedVoiceProvisioningStatus[i], provisioned);
@@ -651,7 +653,8 @@
for (int i = 0; i < RADIO_TECHS.length; i++) {
// get provisioning status
provisioned = mTestImsProvisioningController
- .getImsProvisioningStatusForCapability(mSubId0, capability, RADIO_TECHS[i]);
+ .getImsProvisioningStatusForCapability(TEST_ATTR, mSubId0, capability,
+ RADIO_TECHS[i]);
// verify return value
assertEquals(expectedVideoProvisioningStatus[i], provisioned);
@@ -666,7 +669,8 @@
for (int i = 0; i < RADIO_TECHS.length; i++) {
// get provisioning status
provisioned = mTestImsProvisioningController
- .getImsProvisioningStatusForCapability(mSubId0, capability, RADIO_TECHS[i]);
+ .getImsProvisioningStatusForCapability(TEST_ATTR, mSubId0, capability,
+ RADIO_TECHS[i]);
// verify return value
assertEquals(expectedUtProvisioningStatus[i], provisioned);
@@ -718,7 +722,7 @@
int capability = CAPABILITY_TYPE_VOICE;
int tech = REGISTRATION_TECH_LTE;
provisioned = mTestImsProvisioningController
- .getImsProvisioningStatusForCapability(mSubId0, capability, tech);
+ .getImsProvisioningStatusForCapability(TEST_ATTR, mSubId0, capability, tech);
// verify return value default false - not provisioned
assertEquals(true, provisioned);
@@ -741,7 +745,7 @@
capability = CAPABILITY_TYPE_VIDEO;
tech = REGISTRATION_TECH_LTE;
provisioned = mTestImsProvisioningController
- .getImsProvisioningStatusForCapability(mSubId0, capability, tech);
+ .getImsProvisioningStatusForCapability(TEST_ATTR, mSubId0, capability, tech);
// verify return value default false - not provisioned
assertEquals(false, provisioned);
@@ -891,17 +895,19 @@
for (int i = 0; i < RADIO_TECHS.length; i++) {
// get provisioning status
provisionedFirst = mTestImsProvisioningController
- .getImsProvisioningStatusForCapability(mSubId0, capability, RADIO_TECHS[i]);
+ .getImsProvisioningStatusForCapability(TEST_ATTR, mSubId0, capability,
+ RADIO_TECHS[i]);
// verify return value default false - not provisioned
assertEquals(false, provisionedFirst);
mTestImsProvisioningController.setImsProvisioningStatusForCapability(
- mSubId0, capability, RADIO_TECHS[i], !provisionedFirst);
+ TEST_ATTR, mSubId0, capability, RADIO_TECHS[i], !provisionedFirst);
processAllMessages();
provisionedSecond = mTestImsProvisioningController
- .getImsProvisioningStatusForCapability(mSubId0, capability, RADIO_TECHS[i]);
+ .getImsProvisioningStatusForCapability(TEST_ATTR, mSubId0, capability,
+ RADIO_TECHS[i]);
// verify return value default false - provisioned
assertEquals(!provisionedFirst, provisionedSecond);
@@ -968,17 +974,19 @@
for (int i = 0; i < RADIO_TECHS.length; i++) {
// get provisioning status
provisionedFirst = mTestImsProvisioningController
- .getImsProvisioningStatusForCapability(mSubId0, capability, RADIO_TECHS[i]);
+ .getImsProvisioningStatusForCapability(TEST_ATTR, mSubId0, capability,
+ RADIO_TECHS[i]);
// verify return value default false - not provisioned
assertEquals(false, provisionedFirst);
mTestImsProvisioningController.setImsProvisioningStatusForCapability(
- mSubId0, capability, RADIO_TECHS[i], !provisionedFirst);
+ TEST_ATTR, mSubId0, capability, RADIO_TECHS[i], !provisionedFirst);
processAllMessages();
provisionedSecond = mTestImsProvisioningController
- .getImsProvisioningStatusForCapability(mSubId0, capability, RADIO_TECHS[i]);
+ .getImsProvisioningStatusForCapability(TEST_ATTR, mSubId0, capability,
+ RADIO_TECHS[i]);
// verify return value default false - provisioned
assertEquals(!provisionedFirst, provisionedSecond);
@@ -1161,7 +1169,7 @@
for (int i = 0; i < keys.length; i++) {
clearInvocations(mIFeatureProvisioningCallback0);
result = mTestImsProvisioningController.setProvisioningValue(
- mSubId0, keys[i], PROVISIONING_VALUE_ENABLED);
+ TEST_ATTR, mSubId0, keys[i], PROVISIONING_VALUE_ENABLED);
processAllMessages();
// check return value
@@ -1220,7 +1228,7 @@
int capa = CAPABILITY_TYPE_PRESENCE_UCE;
int result = mTestImsProvisioningController.setProvisioningValue(
- mSubId0, key, PROVISIONING_VALUE_ENABLED);
+ TEST_ATTR, mSubId0, key, PROVISIONING_VALUE_ENABLED);
processAllMessages();
// check return value
@@ -1271,7 +1279,7 @@
};
for (int key : keys) {
int result = mTestImsProvisioningController.setProvisioningValue(
- mSubId0, key, PROVISIONING_VALUE_ENABLED);
+ TEST_ATTR, mSubId0, key, PROVISIONING_VALUE_ENABLED);
processAllMessages();
// check return value
@@ -1349,7 +1357,8 @@
REGISTRATION_TECH_IWLAN
};
for (int i = 0; i < keys.length; i++) {
- int result = mTestImsProvisioningController.getProvisioningValue(mSubId0, keys[i]);
+ int result = mTestImsProvisioningController.getProvisioningValue(TEST_ATTR, mSubId0,
+ keys[i]);
processAllMessages();
// check return value
@@ -1365,7 +1374,7 @@
int key = KEY_EAB_PROVISIONING_STATUS;
int capa = CAPABILITY_TYPE_PRESENCE_UCE;
- int result = mTestImsProvisioningController.getProvisioningValue(mSubId0, key);
+ int result = mTestImsProvisioningController.getProvisioningValue(TEST_ATTR, mSubId0, key);
processAllMessages();
// check return value
@@ -1453,7 +1462,8 @@
REGISTRATION_TECH_IWLAN
};
for (int i = 0; i < keys.length; i++) {
- int result = mTestImsProvisioningController.getProvisioningValue(mSubId0, keys[i]);
+ int result = mTestImsProvisioningController.getProvisioningValue(TEST_ATTR, mSubId0,
+ keys[i]);
processAllMessages();
// check return value
@@ -1481,7 +1491,7 @@
int key = KEY_EAB_PROVISIONING_STATUS;
int capa = CAPABILITY_TYPE_PRESENCE_UCE;
- int result = mTestImsProvisioningController.getProvisioningValue(mSubId0, key);
+ int result = mTestImsProvisioningController.getProvisioningValue(TEST_ATTR, mSubId0, key);
processAllMessages();
// check return value
@@ -1590,8 +1600,8 @@
int tech = REGISTRATION_TECH_LTE;
boolean provisioned;
provisioned = mTestImsProvisioningController.getImsProvisioningStatusForCapability(
- mSubId1, capability, tech);
- mTestImsProvisioningController.setImsProvisioningStatusForCapability(mSubId1,
+ TEST_ATTR, mSubId1, capability, tech);
+ mTestImsProvisioningController.setImsProvisioningStatusForCapability(TEST_ATTR, mSubId1,
capability, tech, !provisioned);
processAllMessages();
@@ -1643,7 +1653,7 @@
int capa = CAPABILITY_TYPE_PRESENCE_UCE;
int tech = REGISTRATION_TECH_LTE;
- int result = mTestImsProvisioningController.getProvisioningValue(mSubId0, key);
+ int result = mTestImsProvisioningController.getProvisioningValue(TEST_ATTR, mSubId0, key);
processAllMessages();
// check return value
@@ -1668,7 +1678,7 @@
clearInvocations(mImsConfig);
clearInvocations(mImsProvisioningLoader);
- mTestImsProvisioningController.setProvisioningValue(mSubId0, key,
+ mTestImsProvisioningController.setProvisioningValue(TEST_ATTR, mSubId0, key,
PROVISIONING_VALUE_DISABLED);
processAllMessages();
diff --git a/tests/src/com/android/phone/ImsStateCallbackControllerTest.java b/tests/src/com/android/phone/ImsStateCallbackControllerTest.java
index c86502b..0e902a8 100644
--- a/tests/src/com/android/phone/ImsStateCallbackControllerTest.java
+++ b/tests/src/com/android/phone/ImsStateCallbackControllerTest.java
@@ -37,6 +37,7 @@
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -60,6 +61,7 @@
import com.android.internal.telephony.IImsStateCallback;
import com.android.internal.telephony.ITelephony;
import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.flags.FeatureFlags;
import com.android.internal.telephony.ims.ImsResolver;
import org.junit.After;
@@ -121,6 +123,7 @@
@Mock private IImsStateCallback mCallback2;
@Mock private IImsStateCallback mCallback3;
@Mock private ImsResolver mImsResolver;
+ @Mock private FeatureFlags mFeatureFlags;
private Executor mExecutor = new Executor() {
@Override
@@ -908,6 +911,31 @@
assertNull(imsManager);
}
+ @Test
+ @SmallTest
+ public void testImsManagerInstanceWithInvalidSubId() throws Exception {
+ doReturn(true).when(mFeatureFlags).avoidDeletingImsObjectFromCache();
+
+ createController(1);
+
+ // MmTelConnection ready
+ mMmTelConnectorListenerSlot0.getValue()
+ .connectionReady(mMmTelFeatureManager, SLOT_0_SUB_ID);
+ processAllMessages();
+
+ // check ImsManager instance
+ ImsManager imsManager = mImsStateCallbackController.getImsManager(SLOT_0_SUB_ID);
+ assertNotNull(imsManager);
+
+ // SubId changed from SLOT_0_SUB_ID to INVALID_SUBSCRIPTION_ID
+ when(mPhoneSlot0.getSubId()).thenReturn(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+ mImsStateCallbackController.onSubChanged();
+
+ // ImsStateCallbackController should keep the ImsManager instance for SLOT_0_SUB_ID
+ imsManager = mImsStateCallbackController.getImsManager(SLOT_0_SUB_ID);
+ assertNotNull(imsManager);
+ }
+
private void createController(int slotCount) throws Exception {
if (Looper.myLooper() == null) {
Looper.prepare();
@@ -929,7 +957,8 @@
mImsStateCallbackController =
new ImsStateCallbackController(mPhone, mHandlerThread.getLooper(),
- slotCount, mMmTelFeatureFactory, mRcsFeatureFactory, mImsResolver);
+ slotCount, mMmTelFeatureFactory, mRcsFeatureFactory, mImsResolver,
+ mFeatureFlags);
replaceInstance(ImsStateCallbackController.class,
"mPhoneFactoryProxy", mImsStateCallbackController, mPhoneFactoryProxy);
diff --git a/tests/src/com/android/phone/LocationAccessPolicyTest.java b/tests/src/com/android/phone/LocationAccessPolicyTest.java
index 58e7fbd..551c2cb 100644
--- a/tests/src/com/android/phone/LocationAccessPolicyTest.java
+++ b/tests/src/com/android/phone/LocationAccessPolicyTest.java
@@ -225,6 +225,8 @@
try {
when(mPackageManager.getApplicationInfo(anyString(), anyInt()))
.thenReturn(fakeAppInfo);
+ when(mPackageManager.getApplicationInfoAsUser(anyString(), anyInt(),
+ any(UserHandle.class))).thenReturn(fakeAppInfo);
} catch (Exception e) {
// this is a formality
}
diff --git a/tests/src/com/android/phone/PhoneInterfaceManagerTest.java b/tests/src/com/android/phone/PhoneInterfaceManagerTest.java
index bd47b94..7464ba2 100644
--- a/tests/src/com/android/phone/PhoneInterfaceManagerTest.java
+++ b/tests/src/com/android/phone/PhoneInterfaceManagerTest.java
@@ -21,6 +21,7 @@
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
@@ -40,6 +41,8 @@
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.content.res.Resources;
+import android.os.Build;
+import android.os.UserHandle;
import android.permission.flags.Flags;
import android.platform.test.flag.junit.SetFlagsRule;
import android.telephony.RadioAccessFamily;
@@ -67,7 +70,6 @@
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.Collections;
-import java.util.HashSet;
import java.util.Locale;
/**
@@ -111,6 +113,9 @@
// alive on a test devices. You must use the spy to mock behavior. Mocks stemming from the
// passed context will remain unused.
mPhoneInterfaceManager = spy(PhoneInterfaceManager.init(mPhoneGlobals, mFeatureFlags));
+ doReturn(mPhoneGlobals).when(mPhoneGlobals).getBaseContext();
+ doReturn(mPhoneGlobals).when(mPhoneGlobals).createContextAsUser(
+ any(UserHandle.class), anyInt());
doReturn(mSubscriptionManagerService).when(mPhoneInterfaceManager)
.getSubscriptionManagerService();
TelephonyManager.setupISubForTest(mSubscriptionManagerService);
@@ -123,6 +128,7 @@
// and disabled enforce_telephony_feature_mapping_for_public_apis feature flag
mPhoneInterfaceManager.setFeatureFlags(mFeatureFlags);
doReturn(false).when(mFeatureFlags).enforceTelephonyFeatureMappingForPublicApis();
+ doReturn(true).when(mFeatureFlags).hsumPackageManager();
mPhoneInterfaceManager.setPackageManager(mPackageManager);
doReturn(true).when(mPackageManager).hasSystemFeature(anyString());
@@ -499,6 +505,11 @@
@Test
@EnableCompatChanges({TelephonyManager.ENABLE_FEATURE_MAPPING})
public void testWithoutTelephonyFeatureAndCompatChanges() throws Exception {
+ // Replace field to set SDK version of vendor partition to Android V
+ int vendorApiLevel = Build.VERSION_CODES.VANILLA_ICE_CREAM;
+ replaceInstance(PhoneInterfaceManager.class, "mVendorApiLevel", mPhoneInterfaceManager,
+ vendorApiLevel);
+
// telephony features is not defined, expect UnsupportedOperationException.
doReturn(false).when(mPackageManager).hasSystemFeature(
PackageManager.FEATURE_TELEPHONY_CALLING);
diff --git a/tests/src/com/android/phone/RcsProvisioningMonitorTest.java b/tests/src/com/android/phone/RcsProvisioningMonitorTest.java
index fe13d56..2614460 100644
--- a/tests/src/com/android/phone/RcsProvisioningMonitorTest.java
+++ b/tests/src/com/android/phone/RcsProvisioningMonitorTest.java
@@ -69,6 +69,7 @@
import com.android.ims.FeatureConnector;
import com.android.ims.RcsFeatureManager;
import com.android.internal.telephony.ITelephony;
+import com.android.internal.telephony.flags.FeatureFlags;
import com.android.internal.telephony.metrics.RcsStats;
import org.junit.After;
@@ -191,6 +192,9 @@
@Mock
private RcsStats.RcsProvisioningCallback mRcsProvisioningCallback;
+ @Mock
+ private FeatureFlags mFeatureFlags;
+
private Executor mExecutor = new Executor() {
@Override
public void execute(Runnable r) {
@@ -251,6 +255,7 @@
.thenReturn(mSubscriptionManager);
when(mPhone.getSystemService(eq(Context.TELEPHONY_REGISTRY_SERVICE)))
.thenReturn(mTelephonyRegistryManager);
+ when(mFeatureFlags.hsumBroadcast()).thenReturn(true);
mBundle = new PersistableBundle();
when(mCarrierConfigManager.getConfigForSubId(anyInt())).thenReturn(mBundle);
@@ -398,7 +403,7 @@
public void testCarrierConfigChanged() throws Exception {
createMonitor(1);
// should not broadcast message if carrier config is not ready
- verify(mPhone, never()).sendBroadcast(any(), any());
+ verify(mPhone, never()).sendBroadcastAsUser(any(), eq(UserHandle.ALL), any());
when(mPackageManager.hasSystemFeature(
eq(PackageManager.FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION))).thenReturn(true);
@@ -410,7 +415,8 @@
broadcastCarrierConfigChange(FAKE_SUB_ID_BASE);
processAllMessages();
- verify(mPhone, times(1)).sendBroadcast(captorIntent.capture(), any());
+ verify(mPhone, times(1)).sendBroadcastAsUser(captorIntent.capture(),
+ eq(UserHandle.ALL), any());
Intent capturedIntent = captorIntent.getValue();
assertEquals(capturedIntent.getAction(),
ProvisioningManager.ACTION_RCS_SINGLE_REGISTRATION_CAPABILITY_UPDATE);
@@ -424,7 +430,8 @@
broadcastCarrierConfigChange(FAKE_SUB_ID_BASE);
processAllMessages();
- verify(mPhone, times(2)).sendBroadcast(captorIntent.capture(), any());
+ verify(mPhone, times(2)).sendBroadcastAsUser(captorIntent.capture(),
+ eq(UserHandle.ALL), any());
capturedIntent = captorIntent.getValue();
assertEquals(capturedIntent.getAction(),
ProvisioningManager.ACTION_RCS_SINGLE_REGISTRATION_CAPABILITY_UPDATE);
@@ -439,7 +446,8 @@
broadcastCarrierConfigChange(FAKE_SUB_ID_BASE);
processAllMessages();
- verify(mPhone, times(3)).sendBroadcast(captorIntent.capture(), any());
+ verify(mPhone, times(3)).sendBroadcastAsUser(captorIntent.capture(),
+ eq(UserHandle.ALL), any());
capturedIntent = captorIntent.getValue();
assertEquals(capturedIntent.getAction(),
ProvisioningManager.ACTION_RCS_SINGLE_REGISTRATION_CAPABILITY_UPDATE);
@@ -592,7 +600,7 @@
processAllMessages();
// should not broadcast message as no carrier config change happens
- verify(mPhone, never()).sendBroadcast(any(), any());
+ verify(mPhone, never()).sendBroadcastAsUser(any(), eq(UserHandle.ALL), any());
when(mCarrierConfigManager.getConfigForSubId(anyInt())).thenReturn(mBundle);
when(mPackageManager.hasSystemFeature(
@@ -604,7 +612,8 @@
broadcastCarrierConfigChange(FAKE_SUB_ID_BASE);
processAllMessages();
- verify(mPhone, times(1)).sendBroadcast(captorIntent.capture(), any());
+ verify(mPhone, times(1)).sendBroadcastAsUser(captorIntent.capture(),
+ eq(UserHandle.ALL), any());
Intent capturedIntent = captorIntent.getValue();
assertEquals(capturedIntent.getAction(),
ProvisioningManager.ACTION_RCS_SINGLE_REGISTRATION_CAPABILITY_UPDATE);
@@ -614,7 +623,8 @@
// should broadcast message when default messaging application changed if carrier config
// has been loaded
- verify(mPhone, times(2)).sendBroadcast(captorIntent.capture(), any());
+ verify(mPhone, times(2)).sendBroadcastAsUser(captorIntent.capture(),
+ eq(UserHandle.ALL), any());
capturedIntent = captorIntent.getValue();
assertEquals(capturedIntent.getAction(),
ProvisioningManager.ACTION_RCS_SINGLE_REGISTRATION_CAPABILITY_UPDATE);
@@ -848,7 +858,7 @@
.thenReturn(mFeatureConnector);
when(mFeatureManager.getConfig()).thenReturn(mIImsConfig);
mRcsProvisioningMonitor = new RcsProvisioningMonitor(mPhone, mHandlerThread.getLooper(),
- mRoleManager, mFeatureFactory, mRcsStats);
+ mRoleManager, mFeatureFactory, mRcsStats, mFeatureFlags);
mHandler = mRcsProvisioningMonitor.getHandler();
try {
mLooper = new TestableLooper(mHandler.getLooper());
diff --git a/tests/src/com/android/phone/euicc/EuiccUiDispatcherActivityTest.java b/tests/src/com/android/phone/euicc/EuiccUiDispatcherActivityTest.java
index 817220c..1bd118a 100644
--- a/tests/src/com/android/phone/euicc/EuiccUiDispatcherActivityTest.java
+++ b/tests/src/com/android/phone/euicc/EuiccUiDispatcherActivityTest.java
@@ -24,6 +24,7 @@
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.service.euicc.EuiccService;
+import android.telephony.TelephonyManager;
import android.telephony.euicc.EuiccManager;
import androidx.test.InstrumentationRegistry;
@@ -50,6 +51,7 @@
@Mock private Context mMockContext;
@Mock private EuiccManager mMockEuiccManager;
+ @Mock private TelephonyManager mTelephonyManager;
private ActivityInfo mActivityInfo = ACTIVITY_INFO;
private Intent mIntent = MANAGE_INTENT;
private EuiccUiDispatcherActivity mActivity;
@@ -59,6 +61,8 @@
MockitoAnnotations.initMocks(this);
when(mMockEuiccManager.isEnabled()).thenReturn(true);
when(mMockContext.getSystemService(Context.EUICC_SERVICE)).thenReturn(mMockEuiccManager);
+ when(mMockContext.getSystemService(Context.TELEPHONY_SERVICE))
+ .thenReturn(mTelephonyManager);
InstrumentationRegistry.getInstrumentation().runOnMainSync(
new Runnable() {
@Override
diff --git a/tests/src/com/android/phone/satellite/accesscontrol/SatelliteAccessControllerTest.java b/tests/src/com/android/phone/satellite/accesscontrol/SatelliteAccessControllerTest.java
index aabc0fb..3d2c953 100644
--- a/tests/src/com/android/phone/satellite/accesscontrol/SatelliteAccessControllerTest.java
+++ b/tests/src/com/android/phone/satellite/accesscontrol/SatelliteAccessControllerTest.java
@@ -16,13 +16,27 @@
package com.android.phone.satellite.accesscontrol;
+import static android.location.LocationManager.MODE_CHANGED_ACTION;
import static android.telephony.satellite.SatelliteManager.KEY_SATELLITE_COMMUNICATION_ALLOWED;
+import static android.telephony.satellite.SatelliteManager.KEY_SATELLITE_PROVISIONED;
+import static android.telephony.satellite.SatelliteManager.KEY_SATELLITE_SUPPORTED;
+import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_ERROR;
+import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_LOCATION_DISABLED;
+import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_LOCATION_NOT_AVAILABLE;
import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_MODEM_ERROR;
+import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_NOT_SUPPORTED;
import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_REQUEST_NOT_SUPPORTED;
import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_SUCCESS;
+import static com.android.phone.satellite.accesscontrol.SatelliteAccessController.ALLOWED_STATE_CACHE_VALID_DURATION_NANOS;
+import static com.android.phone.satellite.accesscontrol.SatelliteAccessController.EVENT_COUNTRY_CODE_CHANGED;
+import static com.android.phone.satellite.accesscontrol.SatelliteAccessController.CMD_IS_SATELLITE_COMMUNICATION_ALLOWED;
+import static com.android.phone.satellite.accesscontrol.SatelliteAccessController.DEFAULT_DELAY_MINUTES_BEFORE_VALIDATING_POSSIBLE_CHANGE_IN_ALLOWED_REGION;
+import static com.android.phone.satellite.accesscontrol.SatelliteAccessController.DEFAULT_THROTTLE_INTERVAL_FOR_LOCATION_QUERY_MINUTES;
import static com.android.phone.satellite.accesscontrol.SatelliteAccessController.EVENT_CONFIG_DATA_UPDATED;
+import static com.android.phone.satellite.accesscontrol.SatelliteAccessController.EVENT_WAIT_FOR_CURRENT_LOCATION_TIMEOUT;
import static com.android.phone.satellite.accesscontrol.SatelliteAccessController.GOOGLE_US_SAN_SAT_S2_FILE_NAME;
+import static com.android.phone.satellite.accesscontrol.SatelliteAccessController.DEFAULT_MAX_RETRY_COUNT_FOR_VALIDATING_POSSIBLE_CHANGE_IN_ALLOWED_REGION;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -33,10 +47,12 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.clearInvocations;
import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@@ -46,7 +62,10 @@
import static org.mockito.Mockito.when;
import android.annotation.Nullable;
+import android.content.BroadcastReceiver;
import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
import android.content.SharedPreferences;
import android.content.res.Resources;
import android.location.Location;
@@ -55,12 +74,14 @@
import android.os.AsyncResult;
import android.os.Bundle;
import android.os.CancellationSignal;
+import android.os.DropBoxManager;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Looper;
import android.os.Message;
import android.os.ResultReceiver;
import android.telecom.TelecomManager;
+import android.telephony.SubscriptionManager;
import android.telephony.satellite.SatelliteManager;
import android.testing.TestableLooper;
import android.util.Log;
@@ -91,6 +112,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -104,15 +126,23 @@
public class SatelliteAccessControllerTest {
private static final String TAG = "SatelliteAccessControllerTest";
private static final String[] TEST_SATELLITE_COUNTRY_CODES = {"US", "CA", "UK"};
+ private static final String[] TEST_SATELLITE_COUNTRY_CODES_EMPTY = {""};
+ private static final String TEST_SATELLITE_COUNTRY_CODE_US = "US";
+ private static final String TEST_SATELLITE_COUNTRY_CODE_KR = "KR";
+ private static final String TEST_SATELLITE_COUNTRY_CODE_JP = "JP";
+
private static final String TEST_SATELLITE_S2_FILE = "sat_s2_file.dat";
private static final boolean TEST_SATELLITE_ALLOW = true;
+ private static final boolean TEST_SATELLITE_NOT_ALLOW = false;
private static final int TEST_LOCATION_FRESH_DURATION_SECONDS = 10;
private static final long TEST_LOCATION_FRESH_DURATION_NANOS =
TimeUnit.SECONDS.toNanos(TEST_LOCATION_FRESH_DURATION_SECONDS);
+ private static final long TEST_LOCATION_QUERY_THROTTLE_INTERVAL_NANOS =
+ TimeUnit.MINUTES.toNanos(10); // DEFAULT_THROTTLE_INTERVAL_FOR_LOCATION_QUERY_MINUTES
private static final long TIMEOUT = 500;
private static final List<String> EMPTY_STRING_LIST = new ArrayList<>();
private static final List<String> LOCATION_PROVIDERS =
- listOf(LocationManager.NETWORK_PROVIDER, LocationManager.GPS_PROVIDER);
+ listOf(LocationManager.NETWORK_PROVIDER, LocationManager.FUSED_PROVIDER);
private static final int SUB_ID = 0;
@Mock
@@ -126,6 +156,8 @@
@Mock
private SatelliteModemInterface mMockSatelliteModemInterface;
@Mock
+ private DropBoxManager mMockDropBoxManager;
+ @Mock
private Context mMockContext;
@Mock
private Phone mMockPhone;
@@ -147,6 +179,15 @@
SharedPreferences mMockSharedPreferences;
@Mock
private SharedPreferences.Editor mMockSharedPreferencesEditor;
+ @Mock
+ private Map<SatelliteOnDeviceAccessController.LocationToken, Boolean>
+ mMockCachedAccessRestrictionMap;
+ @Mock
+ private Intent mMockLocationIntent;
+ @Mock
+ private Set<ResultReceiver> mMockSatelliteAllowResultReceivers;
+ @Mock
+ private ResultReceiver mMockSatelliteSupportedResultReceiver;
private Looper mLooper;
private TestableLooper mTestableLooper;
@@ -163,6 +204,25 @@
private ArgumentCaptor<Integer> mConfigUpdateIntCaptor;
@Captor
private ArgumentCaptor<Object> mConfigUpdateObjectCaptor;
+ @Captor
+ private ArgumentCaptor<Handler> mCountryDetectorHandlerCaptor;
+ @Captor
+ private ArgumentCaptor<Integer> mCountryDetectorIntCaptor;
+ @Captor
+ private ArgumentCaptor<Object> mCountryDetectorObjCaptor;
+ @Captor
+ private ArgumentCaptor<BroadcastReceiver> mLocationBroadcastReceiverCaptor;
+ @Captor
+ private ArgumentCaptor<IntentFilter> mIntentFilterCaptor;
+ @Captor
+ private ArgumentCaptor<LocationRequest> mLocationRequestCaptor;
+ @Captor
+ private ArgumentCaptor<String> mLocationProviderStringCaptor;
+ @Captor
+ private ArgumentCaptor<Integer> mResultCodeIntCaptor;
+ @Captor
+ private ArgumentCaptor<Bundle> mResultDataBundleCaptor;
+
private boolean mQueriedSatelliteAllowed = false;
private int mQueriedSatelliteAllowedResultCode = SATELLITE_RESULT_SUCCESS;
private Semaphore mSatelliteAllowedSemaphore = new Semaphore(0);
@@ -207,10 +267,14 @@
Context.LOCATION_SERVICE);
when(mMockContext.getSystemServiceName(TelecomManager.class)).thenReturn(
Context.TELECOM_SERVICE);
+ when(mMockContext.getSystemServiceName(DropBoxManager.class)).thenReturn(
+ Context.DROPBOX_SERVICE);
when(mMockContext.getSystemService(LocationManager.class)).thenReturn(
mMockLocationManager);
when(mMockContext.getSystemService(TelecomManager.class)).thenReturn(
mMockTelecomManager);
+ when(mMockContext.getSystemService(DropBoxManager.class)).thenReturn(
+ mMockDropBoxManager);
mPhones = new Phone[]{mMockPhone, mMockPhone2};
replaceInstance(PhoneFactory.class, "sPhones", null, mPhones);
replaceInstance(SatelliteController.class, "sInstance", null,
@@ -219,6 +283,8 @@
mMockSatelliteModemInterface);
replaceInstance(TelephonyCountryDetector.class, "sInstance", null,
mMockCountryDetector);
+ when(mMockSatelliteController.getSatellitePhone()).thenReturn(mMockPhone);
+ when(mMockPhone.getSubId()).thenReturn(SubscriptionManager.getDefaultSubscriptionId());
when(mMockContext.getResources()).thenReturn(mMockResources);
when(mMockResources.getStringArray(
com.android.internal.R.array.config_oem_enabled_satellite_country_codes))
@@ -232,11 +298,22 @@
when(mMockResources.getInteger(com.android.internal.R.integer
.config_oem_enabled_satellite_location_fresh_duration))
.thenReturn(TEST_LOCATION_FRESH_DURATION_SECONDS);
+ when(mMockResources.getInteger(com.android.internal.R.integer
+ .config_satellite_delay_minutes_before_retry_validating_possible_change_in_allowed_region))
+ .thenReturn(
+ DEFAULT_DELAY_MINUTES_BEFORE_VALIDATING_POSSIBLE_CHANGE_IN_ALLOWED_REGION);
+ when(mMockResources.getInteger(com.android.internal.R.integer
+ .config_satellite_max_retry_count_for_validating_possible_change_in_allowed_region))
+ .thenReturn(
+ DEFAULT_MAX_RETRY_COUNT_FOR_VALIDATING_POSSIBLE_CHANGE_IN_ALLOWED_REGION);
+ when(mMockResources.getInteger(com.android.internal.R.integer
+ .config_satellite_location_query_throttle_interval_minutes))
+ .thenReturn(DEFAULT_THROTTLE_INTERVAL_FOR_LOCATION_QUERY_MINUTES);
when(mMockLocationManager.getProviders(true)).thenReturn(LOCATION_PROVIDERS);
when(mMockLocationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER))
.thenReturn(mMockLocation0);
- when(mMockLocationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER))
+ when(mMockLocationManager.getLastKnownLocation(LocationManager.FUSED_PROVIDER))
.thenReturn(mMockLocation1);
when(mMockLocation0.getLatitude()).thenReturn(0.0);
when(mMockLocation0.getLongitude()).thenReturn(0.0);
@@ -255,6 +332,13 @@
.putBoolean(anyString(), anyBoolean());
doReturn(mMockSharedPreferencesEditor).when(mMockSharedPreferencesEditor)
.putStringSet(anyString(), any());
+ doReturn(mMockSharedPreferencesEditor).when(mMockSharedPreferencesEditor)
+ .putLong(anyString(), anyLong());
+ doNothing().when(mMockSharedPreferencesEditor).apply();
+
+ when(mMockFeatureFlags.satellitePersistentLogging()).thenReturn(true);
+ when(mMockFeatureFlags.geofenceEnhancementForBetterUx()).thenReturn(true);
+ when(mMockFeatureFlags.oemEnabledSatelliteFlag()).thenReturn(true);
mSatelliteAccessControllerUT = new TestSatelliteAccessController(mMockContext,
mMockFeatureFlags, mLooper, mMockLocationManager, mMockTelecomManager,
@@ -286,11 +370,317 @@
}
@Test
+ public void testOnCurrentLocationNotAvailable() throws Exception {
+ // Verify the cache is used when the location is null and the cache is valid and true.
+ mSatelliteAccessControllerUT.elapsedRealtimeNanos =
+ ALLOWED_STATE_CACHE_VALID_DURATION_NANOS - 1;
+ mSatelliteAccessControllerUT
+ .setIsSatelliteCommunicationAllowedForCurrentLocationCache("cache_allowed");
+ mSatelliteAccessControllerUT.setLocationRequestCancellationSignalAsNull(false);
+
+ sendCurrentLocationTimeoutEvent();
+ assertTrue(mSatelliteAccessControllerUT.isCurrentSatelliteAllowedState());
+
+ // Verify the cache is used when the location is null and the cache is valid and false.
+ mSatelliteAccessControllerUT
+ .setIsSatelliteCommunicationAllowedForCurrentLocationCache("cache_not_allowed");
+ mSatelliteAccessControllerUT.setLocationRequestCancellationSignalAsNull(false);
+
+ sendCurrentLocationTimeoutEvent();
+ assertFalse(mSatelliteAccessControllerUT.isCurrentSatelliteAllowedState());
+
+ // Verify the result code is SATELLITE_RESULT_LOCATION_NOT_AVAILABLE
+ // and allowedState is false when the location is null and the cache is expired
+ mSatelliteAccessControllerUT.elapsedRealtimeNanos =
+ ALLOWED_STATE_CACHE_VALID_DURATION_NANOS + 1;
+ Iterator<ResultReceiver> mockIterator = mock(Iterator.class);
+ doReturn(mockIterator).when(mMockSatelliteAllowResultReceivers).iterator();
+ doReturn(true, false).when(mockIterator).hasNext();
+ doNothing().when(mMockSatelliteAllowResultReceivers).clear();
+ doReturn(mMockSatelliteSupportedResultReceiver).when(mockIterator).next();
+ replaceInstance(SatelliteAccessController.class, "mSatelliteAllowResultReceivers",
+ mSatelliteAccessControllerUT, mMockSatelliteAllowResultReceivers);
+ mSatelliteAccessControllerUT.setIsSatelliteCommunicationAllowedForCurrentLocationCache(
+ "cache_clear_and_not_allowed");
+ mSatelliteAccessControllerUT.setLocationRequestCancellationSignalAsNull(false);
+
+ sendCurrentLocationTimeoutEvent();
+ verify(mMockSatelliteSupportedResultReceiver)
+ .send(mResultCodeIntCaptor.capture(), any());
+ assertEquals(Integer.valueOf(SATELLITE_RESULT_LOCATION_NOT_AVAILABLE),
+ mResultCodeIntCaptor.getValue());
+ assertFalse(mSatelliteAccessControllerUT.isCurrentSatelliteAllowedState());
+ }
+
+ @Test
+ public void testIsSatelliteAccessAllowedForLocation() {
+ when(mMockFeatureFlags.oemEnabledSatelliteFlag()).thenReturn(true);
+
+ // Test disallowList case
+ when(mMockResources.getBoolean(
+ com.android.internal.R.bool.config_oem_enabled_satellite_access_allow))
+ .thenReturn(TEST_SATELLITE_NOT_ALLOW);
+
+ // configuration is EMPTY then we return true with any network country code.
+ when(mMockResources.getStringArray(
+ com.android.internal.R.array.config_oem_enabled_satellite_country_codes))
+ .thenReturn(TEST_SATELLITE_COUNTRY_CODES_EMPTY);
+ mSatelliteAccessControllerUT.loadOverlayConfigs(mMockContext);
+ assertTrue(mSatelliteAccessControllerUT
+ .isSatelliteAccessAllowedForLocation(List.of(TEST_SATELLITE_COUNTRY_CODE_US)));
+ assertTrue(mSatelliteAccessControllerUT
+ .isSatelliteAccessAllowedForLocation(List.of(TEST_SATELLITE_COUNTRY_CODE_JP)));
+
+ // configuration is ["US", "CA", "UK"]
+ // - if network country code is ["US"] or ["US","KR"] or [EMPTY] return false;
+ // - if network country code is ["KR"] return true;
+ when(mMockResources.getStringArray(
+ com.android.internal.R.array.config_oem_enabled_satellite_country_codes))
+ .thenReturn(TEST_SATELLITE_COUNTRY_CODES);
+ mSatelliteAccessControllerUT.loadOverlayConfigs(mMockContext);
+ assertFalse(mSatelliteAccessControllerUT.isSatelliteAccessAllowedForLocation(List.of()));
+ assertFalse(mSatelliteAccessControllerUT
+ .isSatelliteAccessAllowedForLocation(List.of(TEST_SATELLITE_COUNTRY_CODE_US)));
+ assertFalse(mSatelliteAccessControllerUT.isSatelliteAccessAllowedForLocation(
+ List.of(TEST_SATELLITE_COUNTRY_CODE_US, TEST_SATELLITE_COUNTRY_CODE_KR)));
+ assertTrue(mSatelliteAccessControllerUT
+ .isSatelliteAccessAllowedForLocation(List.of(TEST_SATELLITE_COUNTRY_CODE_KR)));
+
+ // Test allowList case
+ when(mMockResources.getBoolean(
+ com.android.internal.R.bool.config_oem_enabled_satellite_access_allow))
+ .thenReturn(TEST_SATELLITE_ALLOW);
+
+ // configuration is [EMPTY] then return false in case of any network country code
+ when(mMockResources.getStringArray(
+ com.android.internal.R.array.config_oem_enabled_satellite_country_codes))
+ .thenReturn(TEST_SATELLITE_COUNTRY_CODES_EMPTY);
+ mSatelliteAccessControllerUT.loadOverlayConfigs(mMockContext);
+ assertFalse(mSatelliteAccessControllerUT
+ .isSatelliteAccessAllowedForLocation(List.of(TEST_SATELLITE_COUNTRY_CODE_US)));
+ assertFalse(mSatelliteAccessControllerUT
+ .isSatelliteAccessAllowedForLocation(List.of(TEST_SATELLITE_COUNTRY_CODE_JP)));
+
+ // configuration is ["US", "CA", "UK"]
+ // - if network country code is [EMPTY] or ["US","KR"] or [KR] return false;
+ // - if network country code is ["US"] return true;
+ when(mMockResources.getStringArray(
+ com.android.internal.R.array.config_oem_enabled_satellite_country_codes))
+ .thenReturn(TEST_SATELLITE_COUNTRY_CODES);
+ mSatelliteAccessControllerUT.loadOverlayConfigs(mMockContext);
+ assertFalse(mSatelliteAccessControllerUT.isSatelliteAccessAllowedForLocation(List.of()));
+ assertFalse(mSatelliteAccessControllerUT
+ .isSatelliteAccessAllowedForLocation(List.of(TEST_SATELLITE_COUNTRY_CODE_KR)));
+ assertFalse(mSatelliteAccessControllerUT.isSatelliteAccessAllowedForLocation(
+ List.of(TEST_SATELLITE_COUNTRY_CODE_US, TEST_SATELLITE_COUNTRY_CODE_KR)));
+ assertTrue(mSatelliteAccessControllerUT
+ .isSatelliteAccessAllowedForLocation(List.of(TEST_SATELLITE_COUNTRY_CODE_US)));
+ }
+
+ @Test
+ public void testIsRegionDisallowed() throws Exception {
+ // setup to make the return value of mQueriedSatelliteAllowed 'true'
+ when(mMockFeatureFlags.oemEnabledSatelliteFlag()).thenReturn(true);
+ when(mMockContext.getResources()).thenReturn(mMockResources);
+ when(mMockResources.getBoolean(
+ com.android.internal.R.bool.config_oem_enabled_satellite_access_allow))
+ .thenReturn(TEST_SATELLITE_ALLOW);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
+ doReturn(true).when(mMockLocationManager).isLocationEnabled();
+ when(mMockSatelliteOnDeviceAccessController.isSatCommunicationAllowedAtLocation(
+ any(SatelliteOnDeviceAccessController.LocationToken.class))).thenReturn(true);
+ replaceInstance(SatelliteAccessController.class, "mCachedAccessRestrictionMap",
+ mSatelliteAccessControllerUT, mMockCachedAccessRestrictionMap);
+ doReturn(true).when(mMockCachedAccessRestrictionMap).containsKey(any());
+ doReturn(true).when(mMockCachedAccessRestrictionMap).get(any());
+
+ // get allowed country codes EMPTY from resources
+ when(mMockResources.getStringArray(
+ com.android.internal.R.array.config_oem_enabled_satellite_country_codes))
+ .thenReturn(TEST_SATELLITE_COUNTRY_CODES_EMPTY);
+
+ // allow case that network country codes [US] with [EMPTY] configuration
+ // location will not be compared and mQueriedSatelliteAllowed will be set false
+ clearInvocations(mMockCachedAccessRestrictionMap);
+ when(mMockCountryDetector.getCurrentNetworkCountryIso())
+ .thenReturn(List.of(TEST_SATELLITE_COUNTRY_CODE_US));
+ mSatelliteAccessControllerUT.loadOverlayConfigs(mMockContext);
+ mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
+ mSatelliteAllowedReceiver, false);
+ mTestableLooper.processAllMessages();
+ verify(mMockCachedAccessRestrictionMap, times(0)).containsKey(any());
+ assertFalse(mQueriedSatelliteAllowed);
+
+ // allow case that network country codes [EMPTY] with [EMPTY] configuration
+ // location will be compared and mQueriedSatelliteAllowed will be set true
+ clearInvocations(mMockCachedAccessRestrictionMap);
+ when(mMockCountryDetector.getCurrentNetworkCountryIso()).thenReturn(List.of());
+ mSatelliteAccessControllerUT.loadOverlayConfigs(mMockContext);
+ mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
+ mSatelliteAllowedReceiver, false);
+ mTestableLooper.processAllMessages();
+ verify(mMockCachedAccessRestrictionMap, times(1)).containsKey(any());
+ assertTrue(mQueriedSatelliteAllowed);
+
+ // get allowed country codes [US, CA, UK] from resources
+ when(mMockResources.getStringArray(
+ com.android.internal.R.array.config_oem_enabled_satellite_country_codes))
+ .thenReturn(TEST_SATELLITE_COUNTRY_CODES);
+
+ // allow case that network country codes [US, CA, UK] with [US, CA, UK] configuration
+ // location will be compared and mQueriedSatelliteAllowed will be set true
+ clearInvocations(mMockCachedAccessRestrictionMap);
+ when(mMockCountryDetector.getCurrentNetworkCountryIso())
+ .thenReturn(List.of(TEST_SATELLITE_COUNTRY_CODES));
+ mSatelliteAccessControllerUT.loadOverlayConfigs(mMockContext);
+ mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
+ mSatelliteAllowedReceiver, false);
+ mTestableLooper.processAllMessages();
+ verify(mMockCachedAccessRestrictionMap, times(1)).containsKey(any());
+ assertTrue(mQueriedSatelliteAllowed);
+
+ // allow case that network country codes [US] with [US, CA, UK] configuration
+ // location will be compared and mQueriedSatelliteAllowed will be set true
+ clearInvocations(mMockCachedAccessRestrictionMap);
+ when(mMockCountryDetector.getCurrentNetworkCountryIso())
+ .thenReturn(List.of(TEST_SATELLITE_COUNTRY_CODE_US));
+ mSatelliteAccessControllerUT.loadOverlayConfigs(mMockContext);
+ mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
+ mSatelliteAllowedReceiver, false);
+ mTestableLooper.processAllMessages();
+ verify(mMockCachedAccessRestrictionMap, times(1)).containsKey(any());
+ assertTrue(mQueriedSatelliteAllowed);
+
+ // allow case that network country codes [US, KR] with [US, CA, UK] configuration
+ // location will be compared and mQueriedSatelliteAllowed will be set true
+ clearInvocations(mMockCachedAccessRestrictionMap);
+ when(mMockCountryDetector.getCurrentNetworkCountryIso()).thenReturn(
+ List.of(TEST_SATELLITE_COUNTRY_CODE_US, TEST_SATELLITE_COUNTRY_CODE_KR));
+ mSatelliteAccessControllerUT.loadOverlayConfigs(mMockContext);
+ mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
+ mSatelliteAllowedReceiver, false);
+ mTestableLooper.processAllMessages();
+ verify(mMockCachedAccessRestrictionMap, times(1)).containsKey(any());
+ assertTrue(mQueriedSatelliteAllowed);
+
+ // allow case that network country codes [US] with [EMPTY] configuration
+ // location will be compared and mQueriedSatelliteAllowed will be set true
+ clearInvocations(mMockCachedAccessRestrictionMap);
+ when(mMockCountryDetector.getCurrentNetworkCountryIso()).thenReturn(List.of());
+ mSatelliteAccessControllerUT.loadOverlayConfigs(mMockContext);
+ mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
+ mSatelliteAllowedReceiver, false);
+ mTestableLooper.processAllMessages();
+ verify(mMockCachedAccessRestrictionMap, times(1)).containsKey(any());
+ assertTrue(mQueriedSatelliteAllowed);
+
+ // allow case that network country codes [KR, JP] with [US, CA, UK] configuration
+ // location will not be compared and mQueriedSatelliteAllowed will be set false
+ clearInvocations(mMockCachedAccessRestrictionMap);
+ when(mMockCountryDetector.getCurrentNetworkCountryIso()).thenReturn(
+ List.of(TEST_SATELLITE_COUNTRY_CODE_KR, TEST_SATELLITE_COUNTRY_CODE_JP));
+ mSatelliteAccessControllerUT.loadOverlayConfigs(mMockContext);
+ mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
+ mSatelliteAllowedReceiver, false);
+ mTestableLooper.processAllMessages();
+ verify(mMockCachedAccessRestrictionMap, times(0)).containsKey(any());
+ assertFalse(mQueriedSatelliteAllowed);
+
+ // allow case that network country codes [KR] with [US, CA, UK] configuration
+ // location will not be compared and mQueriedSatelliteAllowed will be set false
+ clearInvocations(mMockCachedAccessRestrictionMap);
+ when(mMockCountryDetector.getCurrentNetworkCountryIso())
+ .thenReturn(List.of(TEST_SATELLITE_COUNTRY_CODE_KR));
+ mSatelliteAccessControllerUT.loadOverlayConfigs(mMockContext);
+ mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
+ mSatelliteAllowedReceiver, false);
+ mTestableLooper.processAllMessages();
+ verify(mMockCachedAccessRestrictionMap, times(0)).containsKey(any());
+ assertFalse(mQueriedSatelliteAllowed);
+
+
+ // set disallowed list case
+ when(mMockResources.getBoolean(
+ com.android.internal.R.bool.config_oem_enabled_satellite_access_allow))
+ .thenReturn(TEST_SATELLITE_NOT_ALLOW);
+ // get disallowed country codes list [EMPTY] from resources
+ when(mMockResources.getStringArray(
+ com.android.internal.R.array.config_oem_enabled_satellite_country_codes))
+ .thenReturn(TEST_SATELLITE_COUNTRY_CODES_EMPTY);
+
+ // disallow case that network country codes [US] with [EMPTY] configuration
+ // location will be compared and mQueriedSatelliteAllowed will be set true
+ clearInvocations(mMockCachedAccessRestrictionMap);
+ when(mMockCountryDetector.getCurrentNetworkCountryIso())
+ .thenReturn(List.of(TEST_SATELLITE_COUNTRY_CODE_US));
+ mSatelliteAccessControllerUT.loadOverlayConfigs(mMockContext);
+ mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
+ mSatelliteAllowedReceiver, false);
+ mTestableLooper.processAllMessages();
+ verify(mMockCachedAccessRestrictionMap, times(1)).containsKey(any());
+ assertTrue(mQueriedSatelliteAllowed);
+
+ // get disallowed country codes list ["US", "CA", "UK"] from resources
+ when(mMockResources.getStringArray(
+ com.android.internal.R.array.config_oem_enabled_satellite_country_codes))
+ .thenReturn(TEST_SATELLITE_COUNTRY_CODES);
+
+ // disallow case that network country codes [EMPTY] with [US, CA, UK] configuration
+ // location will be compared and mQueriedSatelliteAllowed will be set true
+ clearInvocations(mMockCachedAccessRestrictionMap);
+ when(mMockCountryDetector.getCurrentNetworkCountryIso())
+ .thenReturn(List.of(TEST_SATELLITE_COUNTRY_CODES_EMPTY));
+ mSatelliteAccessControllerUT.loadOverlayConfigs(mMockContext);
+ mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
+ mSatelliteAllowedReceiver, false);
+ mTestableLooper.processAllMessages();
+ verify(mMockCachedAccessRestrictionMap, times(1)).containsKey(any());
+ assertTrue(mQueriedSatelliteAllowed);
+
+ // disallow case that network country codes [US, JP] with [US, CA, UK] configuration
+ // location will be compared and mQueriedSatelliteAllowed will be set true
+ clearInvocations(mMockCachedAccessRestrictionMap);
+ when(mMockCountryDetector.getCurrentNetworkCountryIso()).thenReturn(
+ List.of(TEST_SATELLITE_COUNTRY_CODE_US, TEST_SATELLITE_COUNTRY_CODE_JP));
+ mSatelliteAccessControllerUT.loadOverlayConfigs(mMockContext);
+ mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
+ mSatelliteAllowedReceiver, false);
+ mTestableLooper.processAllMessages();
+ verify(mMockCachedAccessRestrictionMap, times(1)).containsKey(any());
+ assertTrue(mQueriedSatelliteAllowed);
+
+ // disallow case that network country codes [JP] with [US, CA, UK] configuration
+ // location will be compared and mQueriedSatelliteAllowed will be set true
+ clearInvocations(mMockCachedAccessRestrictionMap);
+ when(mMockCountryDetector.getCurrentNetworkCountryIso())
+ .thenReturn(List.of(TEST_SATELLITE_COUNTRY_CODE_JP));
+ mSatelliteAccessControllerUT.loadOverlayConfigs(mMockContext);
+ mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
+ mSatelliteAllowedReceiver, false);
+ mTestableLooper.processAllMessages();
+ verify(mMockCachedAccessRestrictionMap, times(1)).containsKey(any());
+ assertTrue(mQueriedSatelliteAllowed);
+
+ // disallow case that network country codes [US] with [US, CA, UK] configuration
+ // location will not be compared and mQueriedSatelliteAllowed will be set false
+ clearInvocations(mMockCachedAccessRestrictionMap);
+ when(mMockCountryDetector.getCurrentNetworkCountryIso())
+ .thenReturn(List.of(TEST_SATELLITE_COUNTRY_CODE_US));
+ mSatelliteAccessControllerUT.loadOverlayConfigs(mMockContext);
+ mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
+ mSatelliteAllowedReceiver, false);
+ mTestableLooper.processAllMessages();
+ verify(mMockCachedAccessRestrictionMap, times(0)).containsKey(any());
+ assertFalse(mQueriedSatelliteAllowed);
+ }
+
+ @Test
public void testRequestIsSatelliteCommunicationAllowedForCurrentLocation() throws Exception {
// OEM-enabled satellite is not supported
when(mMockFeatureFlags.oemEnabledSatelliteFlag()).thenReturn(false);
mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
- SUB_ID, mSatelliteAllowedReceiver);
+ mSatelliteAllowedReceiver, false);
mTestableLooper.processAllMessages();
assertTrue(waitForRequestIsSatelliteAllowedForCurrentLocationResult(
mSatelliteAllowedSemaphore, 1));
@@ -303,45 +693,35 @@
setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_RESULT_SUCCESS);
clearAllInvocations();
mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
- SUB_ID, mSatelliteAllowedReceiver);
+ mSatelliteAllowedReceiver, false);
mTestableLooper.processAllMessages();
assertTrue(waitForRequestIsSatelliteAllowedForCurrentLocationResult(
mSatelliteAllowedSemaphore, 1));
- assertEquals(SATELLITE_RESULT_SUCCESS, mQueriedSatelliteAllowedResultCode);
+ assertEquals(SATELLITE_RESULT_NOT_SUPPORTED, mQueriedSatelliteAllowedResultCode);
assertFalse(mQueriedSatelliteAllowed);
// Failed to query whether satellite is supported or not
setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_RESULT_MODEM_ERROR);
clearAllInvocations();
mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
- SUB_ID, mSatelliteAllowedReceiver);
+ mSatelliteAllowedReceiver, false);
mTestableLooper.processAllMessages();
assertTrue(waitForRequestIsSatelliteAllowedForCurrentLocationResult(
mSatelliteAllowedSemaphore, 1));
assertEquals(SATELLITE_RESULT_MODEM_ERROR, mQueriedSatelliteAllowedResultCode);
- // Network country codes are available.
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
- clearAllInvocations();
- when(mMockCountryDetector.getCurrentNetworkCountryIso()).thenReturn(listOf("US", "CA"));
- mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
- SUB_ID, mSatelliteAllowedReceiver);
- mTestableLooper.processAllMessages();
- assertTrue(waitForRequestIsSatelliteAllowedForCurrentLocationResult(
- mSatelliteAllowedSemaphore, 1));
- assertEquals(SATELLITE_RESULT_SUCCESS, mQueriedSatelliteAllowedResultCode);
- assertTrue(mQueriedSatelliteAllowed);
-
// Network country codes are not available. TelecomManager.isInEmergencyCall() returns true.
// On-device access controller will be used. Last known location is available and fresh.
clearAllInvocations();
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
when(mMockCountryDetector.getCurrentNetworkCountryIso()).thenReturn(EMPTY_STRING_LIST);
when(mMockTelecomManager.isInEmergencyCall()).thenReturn(true);
mSatelliteAccessControllerUT.elapsedRealtimeNanos = TEST_LOCATION_FRESH_DURATION_NANOS + 1;
when(mMockLocation0.getElapsedRealtimeNanos()).thenReturn(2L);
when(mMockLocation1.getElapsedRealtimeNanos()).thenReturn(0L);
mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
- SUB_ID, mSatelliteAllowedReceiver);
+ mSatelliteAllowedReceiver, false);
mTestableLooper.processAllMessages();
assertTrue(
mSatelliteAccessControllerUT.isKeepOnDeviceAccessControllerResourcesTimerStarted());
@@ -373,15 +753,17 @@
when(mMockCountryDetector.getCurrentNetworkCountryIso()).thenReturn(EMPTY_STRING_LIST);
when(mMockTelecomManager.isInEmergencyCall()).thenReturn(false);
when(mMockPhone.isInEcm()).thenReturn(true);
+ when(mMockPhone.getContext()).thenReturn(mMockContext);
+ when(mMockPhone2.getContext()).thenReturn(mMockContext);
mSatelliteAccessControllerUT.elapsedRealtimeNanos = TEST_LOCATION_FRESH_DURATION_NANOS + 1;
when(mMockLocation0.getElapsedRealtimeNanos()).thenReturn(0L);
when(mMockLocation1.getElapsedRealtimeNanos()).thenReturn(0L);
mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
- SUB_ID, mSatelliteAllowedReceiver);
+ mSatelliteAllowedReceiver, false);
mTestableLooper.processAllMessages();
assertFalse(
mSatelliteAccessControllerUT.isKeepOnDeviceAccessControllerResourcesTimerStarted());
- verify(mMockLocationManager).getCurrentLocation(eq(LocationManager.GPS_PROVIDER),
+ verify(mMockLocationManager).getCurrentLocation(eq(LocationManager.FUSED_PROVIDER),
any(LocationRequest.class), mLocationRequestCancellationSignalCaptor.capture(),
any(Executor.class), mLocationRequestConsumerCaptor.capture());
assertTrue(mSatelliteAccessControllerUT.isWaitForCurrentLocationTimerStarted());
@@ -395,8 +777,10 @@
assertEquals(SATELLITE_RESULT_SUCCESS, mQueriedSatelliteAllowedResultCode);
assertTrue(mQueriedSatelliteAllowed);
- // Timed out to wait for current location. No cached country codes.
+ // Timed out to wait for current location. No cached allowed state.
clearAllInvocations();
+ mSatelliteAccessControllerUT.setIsSatelliteCommunicationAllowedForCurrentLocationCache(
+ "cache_clear_and_not_allowed");
when(mMockCountryDetector.getCurrentNetworkCountryIso()).thenReturn(EMPTY_STRING_LIST);
when(mMockTelecomManager.isInEmergencyCall()).thenReturn(false);
when(mMockPhone.isInEcm()).thenReturn(true);
@@ -406,7 +790,7 @@
when(mMockCountryDetector.getCachedLocationCountryIsoInfo()).thenReturn(new Pair<>("", 0L));
when(mMockCountryDetector.getCachedNetworkCountryIsoInfo()).thenReturn(new HashMap<>());
mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
- SUB_ID, mSatelliteAllowedReceiver);
+ mSatelliteAllowedReceiver, false);
mTestableLooper.processAllMessages();
assertFalse(
mSatelliteAccessControllerUT.isKeepOnDeviceAccessControllerResourcesTimerStarted());
@@ -420,12 +804,9 @@
assertFalse(mSatelliteAccessControllerUT.isWaitForCurrentLocationTimerStarted());
verify(mMockSatelliteOnDeviceAccessController, never()).isSatCommunicationAllowedAtLocation(
any(SatelliteOnDeviceAccessController.LocationToken.class));
- verifyCountryDetectorApisCalled();
assertTrue(waitForRequestIsSatelliteAllowedForCurrentLocationResult(
mSatelliteAllowedSemaphore, 1));
- assertEquals(SATELLITE_RESULT_SUCCESS,
- mQueriedSatelliteAllowedResultCode);
- assertFalse(mQueriedSatelliteAllowed);
+ assertEquals(SATELLITE_RESULT_LOCATION_NOT_AVAILABLE, mQueriedSatelliteAllowedResultCode);
// Network country codes are not available. TelecomManager.isInEmergencyCall() returns
// false. No phone is in ECM. Last known location is not fresh. Cached country codes should
@@ -440,51 +821,150 @@
mSatelliteAccessControllerUT.elapsedRealtimeNanos = TEST_LOCATION_FRESH_DURATION_NANOS + 1;
when(mMockLocation0.getElapsedRealtimeNanos()).thenReturn(0L);
when(mMockLocation1.getElapsedRealtimeNanos()).thenReturn(0L);
+ doReturn(false).when(mMockLocationManager).isLocationEnabled();
mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
- SUB_ID, mSatelliteAllowedReceiver);
+ mSatelliteAllowedReceiver, false);
mTestableLooper.processAllMessages();
verify(mMockLocationManager, never()).getCurrentLocation(anyString(),
any(LocationRequest.class), any(CancellationSignal.class), any(Executor.class),
any(Consumer.class));
verify(mMockSatelliteOnDeviceAccessController, never()).isSatCommunicationAllowedAtLocation(
any(SatelliteOnDeviceAccessController.LocationToken.class));
- verifyCountryDetectorApisCalled();
assertTrue(waitForRequestIsSatelliteAllowedForCurrentLocationResult(
mSatelliteAllowedSemaphore, 1));
- assertEquals(SATELLITE_RESULT_SUCCESS, mQueriedSatelliteAllowedResultCode);
+ assertEquals(SATELLITE_RESULT_LOCATION_DISABLED, mQueriedSatelliteAllowedResultCode);
assertFalse(mQueriedSatelliteAllowed);
+ }
- // Network country codes are not available. TelecomManager.isInEmergencyCall() returns
- // false. No phone is in ECM. Last known location is not fresh. Cached country codes should
- // be used for verifying satellite allow. Cached country codes are available.
- clearAllInvocations();
- when(mMockCountryDetector.getCurrentNetworkCountryIso()).thenReturn(EMPTY_STRING_LIST);
- when(mMockCountryDetector.getCachedLocationCountryIsoInfo())
- .thenReturn(new Pair<>("US", 5L));
- Map<String, Long> cachedNetworkCountryCodes = new HashMap<>();
- cachedNetworkCountryCodes.put("UK", 1L);
- cachedNetworkCountryCodes.put("US", 3L);
- when(mMockCountryDetector.getCachedNetworkCountryIsoInfo())
- .thenReturn(cachedNetworkCountryCodes);
- when(mMockTelecomManager.isInEmergencyCall()).thenReturn(false);
- when(mMockPhone.isInEcm()).thenReturn(false);
- when(mMockPhone2.isInEcm()).thenReturn(false);
+ @Test
+ public void testAllowLocationQueryForSatelliteAllowedCheck() {
+ mSatelliteAccessControllerUT.mLatestSatelliteCommunicationAllowedSetTime = 1;
+
+ mSatelliteAccessControllerUT.setIsSatelliteAllowedRegionPossiblyChanged(false);
+ // cash is invalid
+ mSatelliteAccessControllerUT.elapsedRealtimeNanos =
+ ALLOWED_STATE_CACHE_VALID_DURATION_NANOS + 10;
+ assertTrue(mSatelliteAccessControllerUT.allowLocationQueryForSatelliteAllowedCheck());
+
+ // cash is valid
+ mSatelliteAccessControllerUT.elapsedRealtimeNanos =
+ ALLOWED_STATE_CACHE_VALID_DURATION_NANOS - 10;
+ assertFalse(mSatelliteAccessControllerUT.allowLocationQueryForSatelliteAllowedCheck());
+
+ mSatelliteAccessControllerUT.setIsSatelliteAllowedRegionPossiblyChanged(true);
+ // cash is invalid
+ mSatelliteAccessControllerUT.elapsedRealtimeNanos =
+ ALLOWED_STATE_CACHE_VALID_DURATION_NANOS + 10;
+ assertTrue(mSatelliteAccessControllerUT.allowLocationQueryForSatelliteAllowedCheck());
+
+ // cash is valid and throttled
+ mSatelliteAccessControllerUT.elapsedRealtimeNanos =
+ ALLOWED_STATE_CACHE_VALID_DURATION_NANOS - 10;
+
+ // cash is valid and never queried before
+ mSatelliteAccessControllerUT.mLastLocationQueryForPossibleChangeInAllowedRegionTimeNanos =
+ 0;
+ assertTrue(mSatelliteAccessControllerUT.allowLocationQueryForSatelliteAllowedCheck());
+
+ // cash is valid and throttled
+ mSatelliteAccessControllerUT.mLastLocationQueryForPossibleChangeInAllowedRegionTimeNanos =
+ mSatelliteAccessControllerUT.elapsedRealtimeNanos
+ - TEST_LOCATION_QUERY_THROTTLE_INTERVAL_NANOS + 100;
+ assertFalse(mSatelliteAccessControllerUT.allowLocationQueryForSatelliteAllowedCheck());
+
+ // cash is valid and not throttled
+ mSatelliteAccessControllerUT.mLastLocationQueryForPossibleChangeInAllowedRegionTimeNanos =
+ mSatelliteAccessControllerUT.elapsedRealtimeNanos
+ - TEST_LOCATION_QUERY_THROTTLE_INTERVAL_NANOS - 100;
+ assertTrue(mSatelliteAccessControllerUT.allowLocationQueryForSatelliteAllowedCheck());
+ }
+
+ @Test
+ public void testValidatePossibleChangeInSatelliteAllowedRegion() throws Exception {
+ // OEM-enabled satellite is supported
+ when(mMockFeatureFlags.oemEnabledSatelliteFlag()).thenReturn(true);
+
+ verify(mMockCountryDetector).registerForCountryCodeChanged(
+ mCountryDetectorHandlerCaptor.capture(), mCountryDetectorIntCaptor.capture(),
+ mCountryDetectorObjCaptor.capture());
+
+ assertSame(mCountryDetectorHandlerCaptor.getValue(), mSatelliteAccessControllerUT);
+ assertSame(mCountryDetectorIntCaptor.getValue(), EVENT_COUNTRY_CODE_CHANGED);
+ assertNull(mCountryDetectorObjCaptor.getValue());
+
+ // Normal case that invokes
+ // mMockSatelliteOnDeviceAccessController.isSatCommunicationAllowedAtLocation
+ clearInvocations(mMockSatelliteOnDeviceAccessController);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
+ doReturn(true).when(mMockLocationManager).isLocationEnabled();
+ mSatelliteAccessControllerUT.elapsedRealtimeNanos = TEST_LOCATION_FRESH_DURATION_NANOS;
+ sendCommandValidateCountryCodeChangeEvent(mMockContext);
+ verify(mMockSatelliteOnDeviceAccessController,
+ times(1)).isSatCommunicationAllowedAtLocation(
+ any(SatelliteOnDeviceAccessController.LocationToken.class));
+
+ // Case that isCommunicationAllowedCacheValid is true
+ clearInvocations(mMockSatelliteOnDeviceAccessController);
mSatelliteAccessControllerUT.elapsedRealtimeNanos = TEST_LOCATION_FRESH_DURATION_NANOS + 1;
- when(mMockLocation0.getElapsedRealtimeNanos()).thenReturn(0L);
- when(mMockLocation1.getElapsedRealtimeNanos()).thenReturn(0L);
- mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
- SUB_ID, mSatelliteAllowedReceiver);
- mTestableLooper.processAllMessages();
- verify(mMockLocationManager, never()).getCurrentLocation(anyString(),
- any(LocationRequest.class), any(CancellationSignal.class), any(Executor.class),
- any(Consumer.class));
+ sendCommandValidateCountryCodeChangeEvent(mMockContext);
verify(mMockSatelliteOnDeviceAccessController, never()).isSatCommunicationAllowedAtLocation(
any(SatelliteOnDeviceAccessController.LocationToken.class));
- verifyCountryDetectorApisCalled();
- assertTrue(waitForRequestIsSatelliteAllowedForCurrentLocationResult(
- mSatelliteAllowedSemaphore, 1));
- assertEquals(SATELLITE_RESULT_SUCCESS, mQueriedSatelliteAllowedResultCode);
- assertTrue(mQueriedSatelliteAllowed);
+
+ // Case that mLatestCacheEnforcedValidateTimeNanos is over
+ // ALLOWED_STATE_CACHE_VALIDATE_INTERVAL_NANOS (1hours)
+ clearInvocations(mMockSatelliteOnDeviceAccessController);
+ mSatelliteAccessControllerUT.elapsedRealtimeNanos =
+ mSatelliteAccessControllerUT.elapsedRealtimeNanos
+ + TEST_LOCATION_QUERY_THROTTLE_INTERVAL_NANOS + 1;
+ when(mMockLocation0.getElapsedRealtimeNanos())
+ .thenReturn(mSatelliteAccessControllerUT.elapsedRealtimeNanos + 1L);
+ when(mMockLocation1.getElapsedRealtimeNanos())
+ .thenReturn(mSatelliteAccessControllerUT.elapsedRealtimeNanos + 1L);
+ when(mMockLocation0.getLatitude()).thenReturn(2.0);
+ when(mMockLocation0.getLongitude()).thenReturn(2.0);
+ when(mMockLocation1.getLatitude()).thenReturn(3.0);
+ when(mMockLocation1.getLongitude()).thenReturn(3.0);
+ when(mMockSatelliteOnDeviceAccessController.isSatCommunicationAllowedAtLocation(
+ any(SatelliteOnDeviceAccessController.LocationToken.class))).thenReturn(false);
+ sendCommandValidateCountryCodeChangeEvent(mMockContext);
+ verify(mMockSatelliteOnDeviceAccessController,
+ times(1)).isSatCommunicationAllowedAtLocation(
+ any(SatelliteOnDeviceAccessController.LocationToken.class));
+ }
+
+ @Test
+ public void testRetryValidatePossibleChangeInSatelliteAllowedRegion() throws Exception {
+ when(mMockFeatureFlags.oemEnabledSatelliteFlag()).thenReturn(true);
+
+ verify(mMockCountryDetector).registerForCountryCodeChanged(
+ mCountryDetectorHandlerCaptor.capture(), mCountryDetectorIntCaptor.capture(),
+ mCountryDetectorObjCaptor.capture());
+
+ assertSame(mCountryDetectorHandlerCaptor.getValue(), mSatelliteAccessControllerUT);
+ assertSame(mCountryDetectorIntCaptor.getValue(), EVENT_COUNTRY_CODE_CHANGED);
+ assertNull(mCountryDetectorObjCaptor.getValue());
+
+ assertTrue(mSatelliteAccessControllerUT
+ .getRetryCountPossibleChangeInSatelliteAllowedRegion() == 0);
+
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_LOCATION_NOT_AVAILABLE);
+ sendCommandValidateCountryCodeChangeEvent(mMockContext);
+
+ assertTrue(mSatelliteAccessControllerUT
+ .getRetryCountPossibleChangeInSatelliteAllowedRegion() == 1);
+
+ mSatelliteAccessControllerUT.setRetryCountPossibleChangeInSatelliteAllowedRegion(
+ DEFAULT_MAX_RETRY_COUNT_FOR_VALIDATING_POSSIBLE_CHANGE_IN_ALLOWED_REGION);
+ sendSatelliteCommunicationAllowedEvent();
+ assertTrue(mSatelliteAccessControllerUT
+ .getRetryCountPossibleChangeInSatelliteAllowedRegion() == 0);
+
+ mSatelliteAccessControllerUT.setRetryCountPossibleChangeInSatelliteAllowedRegion(2);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ sendSatelliteCommunicationAllowedEvent();
+ assertTrue(mSatelliteAccessControllerUT
+ .getRetryCountPossibleChangeInSatelliteAllowedRegion() == 0);
}
@Test
@@ -497,6 +977,9 @@
assertSame(mConfigUpdateIntCaptor.getValue(), EVENT_CONFIG_DATA_UPDATED);
assertSame(mConfigUpdateObjectCaptor.getValue(), mMockContext);
+ replaceInstance(SatelliteAccessController.class, "mCachedAccessRestrictionMap",
+ mSatelliteAccessControllerUT, mMockCachedAccessRestrictionMap);
+
// These APIs are executed during loadRemoteConfigs
verify(mMockSharedPreferences, times(1)).getStringSet(anyString(), any());
verify(mMockSharedPreferences, times(1)).getBoolean(anyString(), anyBoolean());
@@ -509,6 +992,7 @@
sendConfigUpdateChangedEvent(mMockContext);
verify(mMockSharedPreferences, never()).edit();
+ verify(mMockCachedAccessRestrictionMap, never()).clear();
// satelliteConfig has invalid country codes
SatelliteConfig mockConfig = mock(SatelliteConfig.class);
@@ -518,6 +1002,7 @@
sendConfigUpdateChangedEvent(mMockContext);
verify(mMockSharedPreferences, never()).edit();
+ verify(mMockCachedAccessRestrictionMap, never()).clear();
// satelliteConfig does not have is_allow_access_control data
doReturn(List.of(TEST_SATELLITE_COUNTRY_CODES))
@@ -526,6 +1011,7 @@
sendConfigUpdateChangedEvent(mMockContext);
verify(mMockSharedPreferences, never()).edit();
+ verify(mMockCachedAccessRestrictionMap, never()).clear();
// satelliteConfig doesn't have S2CellFile
File mockFile = mock(File.class);
@@ -537,6 +1023,7 @@
sendConfigUpdateChangedEvent(mMockContext);
verify(mMockSharedPreferences, never()).edit();
+ verify(mMockCachedAccessRestrictionMap, never()).clear();
// satelliteConfig has valid data
doReturn(mockConfig).when(mMockSatelliteController).getSatelliteConfig();
@@ -549,8 +1036,224 @@
sendConfigUpdateChangedEvent(mMockContext);
verify(mMockSharedPreferences, times(2)).edit();
+ verify(mMockCachedAccessRestrictionMap, times(1)).clear();
}
+ @Test
+ public void testLocationModeChanged() throws Exception {
+ // setup for querying GPS not to reset mIsSatelliteAllowedRegionPossiblyChanged false.
+ when(mMockFeatureFlags.oemEnabledSatelliteFlag()).thenReturn(true);
+ when(mMockContext.getResources()).thenReturn(mMockResources);
+ when(mMockResources.getBoolean(
+ com.android.internal.R.bool.config_oem_enabled_satellite_access_allow))
+ .thenReturn(TEST_SATELLITE_ALLOW);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
+ when(mMockSatelliteOnDeviceAccessController.isSatCommunicationAllowedAtLocation(
+ any(SatelliteOnDeviceAccessController.LocationToken.class))).thenReturn(true);
+ replaceInstance(SatelliteAccessController.class, "mCachedAccessRestrictionMap",
+ mSatelliteAccessControllerUT, mMockCachedAccessRestrictionMap);
+ doReturn(false).when(mMockCachedAccessRestrictionMap).containsKey(any());
+ mSatelliteAccessControllerUT.elapsedRealtimeNanos = TEST_LOCATION_FRESH_DURATION_NANOS + 1;
+
+ // Captor and Verify if the mockReceiver and mocContext is registered well
+ verify(mMockContext).registerReceiver(mLocationBroadcastReceiverCaptor.capture(),
+ mIntentFilterCaptor.capture());
+ assertSame(mSatelliteAccessControllerUT.getLocationBroadcastReceiver(),
+ mLocationBroadcastReceiverCaptor.getValue());
+ assertSame(MODE_CHANGED_ACTION, mIntentFilterCaptor.getValue().getAction(0));
+
+ // When the intent action is not MODE_CHANGED_ACTION,
+ // verify if the location manager never invoke isLocationEnabled()
+ doReturn("").when(mMockLocationIntent).getAction();
+ mSatelliteAccessControllerUT.setIsSatelliteAllowedRegionPossiblyChanged(false);
+ mSatelliteAccessControllerUT.getLocationBroadcastReceiver()
+ .onReceive(mMockContext, mMockLocationIntent);
+ verify(mMockLocationManager, never()).isLocationEnabled();
+
+ // When the intent action is MODE_CHANGED_ACTION and isLocationEnabled() is true,
+ // verify if mIsSatelliteAllowedRegionPossiblyChanged is true
+ doReturn(MODE_CHANGED_ACTION).when(mMockLocationIntent).getAction();
+ doReturn(true).when(mMockLocationManager).isLocationEnabled();
+ clearInvocations(mMockLocationManager);
+ mSatelliteAccessControllerUT.setIsSatelliteAllowedRegionPossiblyChanged(false);
+ mSatelliteAccessControllerUT.getLocationBroadcastReceiver()
+ .onReceive(mMockContext, mMockLocationIntent);
+ verify(mMockLocationManager, times(1)).isLocationEnabled();
+ mTestableLooper.processAllMessages();
+ assertEquals(true, mSatelliteAccessControllerUT.isSatelliteAllowedRegionPossiblyChanged());
+
+ // When the intent action is MODE_CHANGED_ACTION and isLocationEnabled() is false,
+ // verify if mIsSatelliteAllowedRegionPossiblyChanged is false
+ doReturn(false).when(mMockLocationManager).isLocationEnabled();
+ clearInvocations(mMockLocationManager);
+ mSatelliteAccessControllerUT.setIsSatelliteAllowedRegionPossiblyChanged(false);
+ mSatelliteAccessControllerUT.getLocationBroadcastReceiver()
+ .onReceive(mMockContext, mMockLocationIntent);
+ verify(mMockLocationManager, times(1)).isLocationEnabled();
+ mTestableLooper.processAllMessages();
+ assertEquals(false, mSatelliteAccessControllerUT.isSatelliteAllowedRegionPossiblyChanged());
+ }
+
+ @Test
+ public void testCheckSatelliteAccessRestrictionUsingGPS() {
+ // In emergency case,
+ // verify if the location manager get FUSED provider and ignore location settings
+ doReturn(true).when(mMockTelecomManager).isInEmergencyCall();
+ mSatelliteAccessControllerUT.setLocationRequestCancellationSignalAsNull(true);
+ mSatelliteAccessControllerUT.elapsedRealtimeNanos = TEST_LOCATION_FRESH_DURATION_NANOS + 1;
+ mSatelliteAccessControllerUT.checkSatelliteAccessRestrictionUsingGPS();
+
+ verify(mMockLocationManager, times(1))
+ .getCurrentLocation(mLocationProviderStringCaptor.capture(),
+ mLocationRequestCaptor.capture(), any(), any(), any());
+ assertEquals(LocationManager.FUSED_PROVIDER, mLocationProviderStringCaptor.getValue());
+ assertTrue(mLocationRequestCaptor.getValue().isLocationSettingsIgnored());
+
+ // In non-emergency case,
+ // verify if the location manager get FUSED provider and not ignore location settings
+ clearInvocations(mMockLocationManager);
+ doReturn(false).when(mMockTelecomManager).isInEmergencyCall();
+ doReturn(false).when(mMockPhone).isInEcm();
+ doReturn(false).when(mMockPhone2).isInEcm();
+ doReturn(false).when(mMockSatelliteController).isInEmergencyMode();
+ doReturn(true).when(mMockLocationManager).isLocationEnabled();
+ mSatelliteAccessControllerUT.setLocationRequestCancellationSignalAsNull(true);
+ mSatelliteAccessControllerUT.checkSatelliteAccessRestrictionUsingGPS();
+
+ verify(mMockLocationManager, times(1))
+ .getCurrentLocation(mLocationProviderStringCaptor.capture(),
+ mLocationRequestCaptor.capture(), any(), any(), any());
+ assertEquals(LocationManager.FUSED_PROVIDER, mLocationProviderStringCaptor.getValue());
+ assertFalse(mLocationRequestCaptor.getValue().isLocationSettingsIgnored());
+ }
+
+ @Test
+ public void testHandleIsSatelliteSupportedResult() throws Exception {
+ // Setup for this test case
+ Iterator<ResultReceiver> mockIterator = mock(Iterator.class);
+ doReturn(mockIterator).when(mMockSatelliteAllowResultReceivers).iterator();
+ doReturn(true, false).when(mockIterator).hasNext();
+ doReturn(mMockSatelliteSupportedResultReceiver).when(mockIterator).next();
+
+ replaceInstance(SatelliteAccessController.class, "mSatelliteAllowResultReceivers",
+ mSatelliteAccessControllerUT, mMockSatelliteAllowResultReceivers);
+ doNothing().when(mMockSatelliteAllowResultReceivers).clear();
+
+ // case that resultCode is not SATELLITE_RESULT_SUCCESS
+ int resultCode = SATELLITE_RESULT_ERROR;
+ Bundle bundle = new Bundle();
+ doReturn(true, false).when(mockIterator).hasNext();
+ clearInvocations(mMockSatelliteSupportedResultReceiver);
+ mSatelliteAccessControllerUT.handleIsSatelliteSupportedResult(resultCode, bundle);
+ verify(mMockSatelliteSupportedResultReceiver)
+ .send(mResultCodeIntCaptor.capture(), any());
+ assertEquals(Integer.valueOf(SATELLITE_RESULT_ERROR), mResultCodeIntCaptor.getValue());
+
+ // case no KEY_SATELLITE_SUPPORTED in the bundle data.
+ // verify that the resultCode is delivered as it were
+ resultCode = SATELLITE_RESULT_SUCCESS;
+ bundle.putBoolean(KEY_SATELLITE_PROVISIONED, false);
+ doReturn(true, false).when(mockIterator).hasNext();
+ clearInvocations(mMockSatelliteSupportedResultReceiver);
+ mSatelliteAccessControllerUT.handleIsSatelliteSupportedResult(resultCode, bundle);
+ verify(mMockSatelliteSupportedResultReceiver)
+ .send(mResultCodeIntCaptor.capture(), any());
+ assertEquals(Integer.valueOf(SATELLITE_RESULT_SUCCESS), mResultCodeIntCaptor.getValue());
+
+ // case KEY_SATELLITE_SUPPORTED is false
+ // verify SATELLITE_RESULT_NOT_SUPPORTED is captured
+ bundle.putBoolean(KEY_SATELLITE_SUPPORTED, false);
+ doReturn(true, false).when(mockIterator).hasNext();
+ clearInvocations(mMockSatelliteSupportedResultReceiver);
+ mSatelliteAccessControllerUT.handleIsSatelliteSupportedResult(resultCode, bundle);
+ verify(mMockSatelliteSupportedResultReceiver)
+ .send(mResultCodeIntCaptor.capture(), mResultDataBundleCaptor.capture());
+ assertEquals(Integer.valueOf(SATELLITE_RESULT_NOT_SUPPORTED),
+ mResultCodeIntCaptor.getValue());
+ assertEquals(false,
+ mResultDataBundleCaptor.getValue().getBoolean(KEY_SATELLITE_COMMUNICATION_ALLOWED));
+
+ // case KEY_SATELLITE_SUPPORTED is success and region is not allowed
+ // verify SATELLITE_RESULT_SUCCESS is captured
+ bundle.putBoolean(KEY_SATELLITE_SUPPORTED, true);
+ when(mMockCountryDetector.getCurrentNetworkCountryIso())
+ .thenReturn(List.of(TEST_SATELLITE_COUNTRY_CODE_KR));
+ doReturn(true, false).when(mockIterator).hasNext();
+ clearInvocations(mMockSatelliteSupportedResultReceiver);
+ mSatelliteAccessControllerUT.handleIsSatelliteSupportedResult(resultCode, bundle);
+ verify(mMockSatelliteSupportedResultReceiver)
+ .send(mResultCodeIntCaptor.capture(), mResultDataBundleCaptor.capture());
+ assertEquals(Integer.valueOf(SATELLITE_RESULT_SUCCESS),
+ mResultCodeIntCaptor.getValue());
+ assertEquals(false,
+ mResultDataBundleCaptor.getValue().getBoolean(KEY_SATELLITE_COMMUNICATION_ALLOWED));
+
+ // case KEY_SATELLITE_SUPPORTED is success and locationManager is disabled
+ // verify SATELLITE_RESULT_LOCATION_DISABLED is captured
+ when(mMockCountryDetector.getCurrentNetworkCountryIso())
+ .thenReturn(List.of(TEST_SATELLITE_COUNTRY_CODE_US));
+ doReturn(false).when(mMockLocationManager).isLocationEnabled();
+ doReturn(true, false).when(mockIterator).hasNext();
+ clearInvocations(mMockSatelliteSupportedResultReceiver);
+ mSatelliteAccessControllerUT.handleIsSatelliteSupportedResult(resultCode, bundle);
+ verify(mMockSatelliteSupportedResultReceiver)
+ .send(mResultCodeIntCaptor.capture(), mResultDataBundleCaptor.capture());
+ assertEquals(Integer.valueOf(SATELLITE_RESULT_LOCATION_DISABLED),
+ mResultCodeIntCaptor.getValue());
+ assertEquals(false,
+ mResultDataBundleCaptor.getValue().getBoolean(KEY_SATELLITE_COMMUNICATION_ALLOWED));
+ }
+
+ @Test
+ public void testRequestIsCommunicationAllowedForCurrentLocationWithEnablingSatellite() {
+ // Set non-emergency case
+ when(mMockFeatureFlags.oemEnabledSatelliteFlag()).thenReturn(true);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
+ when(mMockCountryDetector.getCurrentNetworkCountryIso()).thenReturn(EMPTY_STRING_LIST);
+ doReturn(false).when(mMockTelecomManager).isInEmergencyCall();
+ doReturn(false).when(mMockPhone).isInEcm();
+ doReturn(false).when(mMockPhone2).isInEcm();
+ doReturn(false).when(mMockSatelliteController).isInEmergencyMode();
+ doReturn(true).when(mMockLocationManager).isLocationEnabled();
+ mSatelliteAccessControllerUT.setLocationRequestCancellationSignalAsNull(true);
+ mSatelliteAccessControllerUT.elapsedRealtimeNanos = TEST_LOCATION_FRESH_DURATION_NANOS + 1;
+
+ // Invoking requestIsCommunicationAllowedForCurrentLocation(resultReceiver, "false");
+ // verify that mLocationManager.isLocationEnabled() is invoked
+ mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
+ mSatelliteAllowedReceiver, false);
+ mTestableLooper.processAllMessages();
+ verify(mMockLocationManager, times(1)).isLocationEnabled();
+ verify(mMockLocationManager, times(1)).getCurrentLocation(anyString(),
+ any(LocationRequest.class), any(CancellationSignal.class), any(Executor.class),
+ any(Consumer.class));
+
+ // Invoking requestIsCommunicationAllowedForCurrentLocation(resultReceiver, "true");
+ // verify that mLocationManager.isLocationEnabled() is not invoked
+ clearInvocations(mMockLocationManager);
+ mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
+ mSatelliteAllowedReceiver, true);
+ mTestableLooper.processAllMessages();
+ verify(mMockLocationManager, times(1)).isLocationEnabled();
+ verify(mMockLocationManager, never()).getCurrentLocation(anyString(),
+ any(LocationRequest.class), any(CancellationSignal.class), any(Executor.class),
+ any(Consumer.class));
+ }
+
+ private void sendSatelliteCommunicationAllowedEvent() {
+ Pair<Integer, ResultReceiver> requestPair =
+ new Pair<>(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID,
+ mSatelliteAccessControllerUT.getResultReceiverCurrentLocation());
+ Message msg = mSatelliteAccessControllerUT.obtainMessage(
+ CMD_IS_SATELLITE_COMMUNICATION_ALLOWED);
+ msg.obj = requestPair;
+ msg.sendToTarget();
+ mTestableLooper.processAllMessages();
+ }
+
+
private void sendConfigUpdateChangedEvent(Context context) {
Message msg = mSatelliteAccessControllerUT.obtainMessage(EVENT_CONFIG_DATA_UPDATED);
msg.obj = new AsyncResult(context, SATELLITE_RESULT_SUCCESS, null);
@@ -558,6 +1261,20 @@
mTestableLooper.processAllMessages();
}
+ private void sendCurrentLocationTimeoutEvent() {
+ Message msg = mSatelliteAccessControllerUT
+ .obtainMessage(EVENT_WAIT_FOR_CURRENT_LOCATION_TIMEOUT);
+ msg.sendToTarget();
+ mTestableLooper.processAllMessages();
+ }
+
+ private void sendCommandValidateCountryCodeChangeEvent(Context context) {
+ Message msg = mSatelliteAccessControllerUT.obtainMessage(EVENT_COUNTRY_CODE_CHANGED);
+ msg.obj = new AsyncResult(context, SATELLITE_RESULT_SUCCESS, null);
+ msg.sendToTarget();
+ mTestableLooper.processAllMessages();
+ }
+
private void clearAllInvocations() {
clearInvocations(mMockSatelliteController);
clearInvocations(mMockSatelliteOnDeviceAccessController);
@@ -597,7 +1314,7 @@
private void setUpResponseForRequestIsSatelliteSupported(
boolean isSatelliteSupported, @SatelliteManager.SatelliteResult int error) {
doAnswer(invocation -> {
- ResultReceiver resultReceiver = invocation.getArgument(1);
+ ResultReceiver resultReceiver = invocation.getArgument(0);
if (error == SATELLITE_RESULT_SUCCESS) {
Bundle bundle = new Bundle();
bundle.putBoolean(SatelliteManager.KEY_SATELLITE_SUPPORTED, isSatelliteSupported);
@@ -606,8 +1323,23 @@
resultReceiver.send(error, Bundle.EMPTY);
}
return null;
- }).when(mMockSatelliteController).requestIsSatelliteSupported(anyInt(),
- any(ResultReceiver.class));
+ }).when(mMockSatelliteController).requestIsSatelliteSupported(any(ResultReceiver.class));
+ }
+
+ private void setUpResponseForRequestIsSatelliteProvisioned(
+ boolean isSatelliteProvisioned, @SatelliteManager.SatelliteResult int error) {
+ doAnswer(invocation -> {
+ ResultReceiver resultReceiver = invocation.getArgument(0);
+ if (error == SATELLITE_RESULT_SUCCESS) {
+ Bundle bundle = new Bundle();
+ bundle.putBoolean(KEY_SATELLITE_PROVISIONED,
+ isSatelliteProvisioned);
+ resultReceiver.send(error, bundle);
+ } else {
+ resultReceiver.send(error, Bundle.EMPTY);
+ }
+ return null;
+ }).when(mMockSatelliteController).requestIsSatelliteProvisioned(any(ResultReceiver.class));
}
@SafeVarargs
@@ -684,5 +1416,33 @@
public boolean isWaitForCurrentLocationTimerStarted() {
return hasMessages(EVENT_WAIT_FOR_CURRENT_LOCATION_TIMEOUT);
}
+
+ public int getRetryCountPossibleChangeInSatelliteAllowedRegion() {
+ return mRetryCountForValidatingPossibleChangeInAllowedRegion;
+ }
+
+ public void setRetryCountPossibleChangeInSatelliteAllowedRegion(int retryCount) {
+ mRetryCountForValidatingPossibleChangeInAllowedRegion = retryCount;
+ }
+
+ public ResultReceiver getResultReceiverCurrentLocation() {
+ return mHandlerForSatelliteAllowedResult;
+ }
+
+ public BroadcastReceiver getLocationBroadcastReceiver() {
+ return mLocationModeChangedBroadcastReceiver;
+ }
+
+ public void setLocationRequestCancellationSignalAsNull(boolean isNull) {
+ synchronized (mLock) {
+ mLocationRequestCancellationSignal = isNull ? null : new CancellationSignal();
+ }
+ }
+
+ public boolean isCurrentSatelliteAllowedState() {
+ synchronized (mSatelliteCommunicationAllowStateLock) {
+ return mCurrentSatelliteAllowedState;
+ }
+ }
}
}
diff --git a/tests/src/com/android/phone/satellite/entitlement/SatelliteEntitlementControllerTest.java b/tests/src/com/android/phone/satellite/entitlement/SatelliteEntitlementControllerTest.java
index dd9ea65..e663519 100644
--- a/tests/src/com/android/phone/satellite/entitlement/SatelliteEntitlementControllerTest.java
+++ b/tests/src/com/android/phone/satellite/entitlement/SatelliteEntitlementControllerTest.java
@@ -16,8 +16,13 @@
package com.android.phone.satellite.entitlement;
+import static com.android.libraries.entitlement.ServiceEntitlementException.ERROR_HTTP_STATUS_NOT_SUCCESS;
+import static com.android.phone.satellite.entitlement.SatelliteEntitlementResult.SATELLITE_ENTITLEMENT_STATUS_DISABLED;
import static com.android.phone.satellite.entitlement.SatelliteEntitlementResult.SATELLITE_ENTITLEMENT_STATUS_ENABLED;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
@@ -29,8 +34,11 @@
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import android.content.Context;
import android.net.ConnectivityManager;
@@ -55,6 +63,7 @@
import com.android.internal.telephony.ExponentialBackoff;
import com.android.internal.telephony.satellite.SatelliteController;
import com.android.internal.telephony.subscription.SubscriptionManagerService;
+import com.android.libraries.entitlement.ServiceEntitlementException;
import org.junit.After;
import org.junit.Before;
@@ -62,6 +71,8 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
import java.lang.reflect.Field;
import java.util.ArrayList;
@@ -70,6 +81,7 @@
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
@RunWith(AndroidJUnit4.class)
public class SatelliteEntitlementControllerTest extends TelephonyTestBase {
@@ -77,9 +89,14 @@
private static final int SUB_ID = 0;
private static final int SUB_ID_2 = 1;
private static final int[] ACTIVE_SUB_ID = {SUB_ID};
- private static final int DEFAULT_QUERY_REFRESH_DAY = 30;
+ private static final int DEFAULT_QUERY_REFRESH_DAY = 7;
private static final List<String> PLMN_ALLOWED_LIST = Arrays.asList("31026", "302820");
private static final List<String> PLMN_BARRED_LIST = Arrays.asList("12345", "98765");
+ private static final List<String> EMPTY_PLMN_LIST = new ArrayList<>();
+ private static final int CMD_START_QUERY_ENTITLEMENT = 1;
+ private static final int CMD_RETRY_QUERY_ENTITLEMENT = 2;
+ private static final int CMD_SIM_REFRESH = 3;
+ private static final int MAX_RETRY_COUNT = 5;
@Mock
CarrierConfigManager mCarrierConfigManager;
@Mock
@@ -90,7 +107,6 @@
@Mock SatelliteEntitlementApi mSatelliteEntitlementApi;
@Mock SatelliteEntitlementResult mSatelliteEntitlementResult;
@Mock SatelliteController mSatelliteController;
- @Mock ExponentialBackoff mExponentialBackoff;
private PersistableBundle mCarrierConfigBundle;
private TestSatelliteEntitlementController mSatelliteEntitlementController;
private Handler mHandler;
@@ -157,7 +173,8 @@
}
@Test
- public void testIsQueryAvailable() throws Exception {
+ public void testShouldStartQueryEntitlement() throws Exception {
+ logd("testShouldStartQueryEntitlement");
doReturn(ACTIVE_SUB_ID).when(mMockSubscriptionManagerService).getActiveSubIdList(true);
// Verify don't start the query when KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL is false.
@@ -171,19 +188,8 @@
mCarrierConfigBundle.putBoolean(
CarrierConfigManager.KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL, true);
- // Verify don't start the query when ExponentialBackoff is in progressed.
- replaceInstance(SatelliteEntitlementController.class, "mExponentialBackoffPerSub",
- mSatelliteEntitlementController, Map.of(SUB_ID, mExponentialBackoff));
- mSatelliteEntitlementController.handleCmdStartQueryEntitlement();
-
- verify(mSatelliteEntitlementApi, never()).checkEntitlementStatus();
- verify(mSatelliteController, never()).onSatelliteEntitlementStatusUpdated(anyInt(),
- anyBoolean(), anyList(), anyList(), any());
-
- replaceInstance(SatelliteEntitlementController.class, "mExponentialBackoffPerSub",
- mSatelliteEntitlementController, new HashMap<>());
// Verify don't start the query when Internet is disconnected.
- doReturn(ACTIVE_SUB_ID).when(mMockSubscriptionManagerService).getActiveSubIdList(true);
+ clearInvocationsForMock();
setInternetConnected(false);
mSatelliteEntitlementController.handleCmdStartQueryEntitlement();
@@ -200,8 +206,36 @@
verify(mSatelliteController, never()).onSatelliteEntitlementStatusUpdated(anyInt(),
anyBoolean(), anyList(), anyList(), any());
- // Verify start the query when isQueryAvailable return true
setLastQueryTime(0L);
+ // Verify don't start the query when retry count is reached max
+ setLastQueryTime(0L);
+ Map<Integer, Integer> mRetryCountPerSub = new HashMap<>();
+ mRetryCountPerSub.put(SUB_ID, MAX_RETRY_COUNT);
+ replaceInstance(SatelliteEntitlementController.class, "mRetryCountPerSub",
+ mSatelliteEntitlementController, mRetryCountPerSub);
+ mSatelliteEntitlementController.handleCmdStartQueryEntitlement();
+
+ verify(mSatelliteEntitlementApi, never()).checkEntitlementStatus();
+ verify(mSatelliteController, never()).onSatelliteEntitlementStatusUpdated(anyInt(),
+ anyBoolean(), anyList(), anyList(), any());
+
+ replaceInstance(SatelliteEntitlementController.class, "mRetryCountPerSub",
+ mSatelliteEntitlementController, new HashMap<>());
+
+ // Verify don't start the query when query is in progressed.
+ Map<Integer, Boolean> mIsEntitlementInProgressPerSub = new HashMap<>();
+ mIsEntitlementInProgressPerSub.put(SUB_ID, true);
+ replaceInstance(SatelliteEntitlementController.class, "mIsEntitlementInProgressPerSub",
+ mSatelliteEntitlementController, mIsEntitlementInProgressPerSub);
+ mSatelliteEntitlementController.handleCmdStartQueryEntitlement();
+
+ verify(mSatelliteEntitlementApi, never()).checkEntitlementStatus();
+ verify(mSatelliteController, never()).onSatelliteEntitlementStatusUpdated(anyInt(),
+ anyBoolean(), anyList(), anyList(), any());
+
+ replaceInstance(SatelliteEntitlementController.class, "mIsEntitlementInProgressPerSub",
+ mSatelliteEntitlementController, new HashMap<>());
+ // Verify the query starts when ShouldStartQueryEntitlement returns true.
doReturn(mSatelliteEntitlementResult).when(
mSatelliteEntitlementApi).checkEntitlementStatus();
setSatelliteEntitlementResult(SATELLITE_ENTITLEMENT_STATUS_ENABLED, PLMN_ALLOWED_LIST,
@@ -215,6 +249,7 @@
@Test
public void testCheckSatelliteEntitlementStatus() throws Exception {
+ logd("testCheckSatelliteEntitlementStatus");
setIsQueryAvailableTrue();
// Verify don't call the checkSatelliteEntitlementStatus when getActiveSubIdList is empty.
doReturn(new int[]{}).when(mMockSubscriptionManagerService).getActiveSubIdList(true);
@@ -238,7 +273,7 @@
// Verify call the updateSatelliteEntitlementStatus with satellite service is disabled
// , empty PLMNAllowed and empty PLMNBarred.
verify(mSatelliteController).onSatelliteEntitlementStatusUpdated(eq(SUB_ID),
- eq(false), eq(new ArrayList<>()), eq(new ArrayList<>()), any());
+ eq(false), eq(EMPTY_PLMN_LIST), eq(EMPTY_PLMN_LIST), any());
// Verify call the checkSatelliteEntitlementStatus with the subscribed result.
clearInvocationsForMock();
@@ -276,7 +311,7 @@
verify(mSatelliteEntitlementApi).checkEntitlementStatus();
verify(mSatelliteController).onSatelliteEntitlementStatusUpdated(eq(SUB_ID), eq(true),
- eq(PLMN_ALLOWED_LIST), eq(new ArrayList<>()), any());
+ eq(PLMN_ALLOWED_LIST), eq(EMPTY_PLMN_LIST), any());
// Verify call the updateSatelliteEntitlementStatus with satellite service is enable,
// empty PLMNAllowedList and PLMNBarredList.
@@ -288,7 +323,7 @@
verify(mSatelliteEntitlementApi).checkEntitlementStatus();
verify(mSatelliteController).onSatelliteEntitlementStatusUpdated(eq(SUB_ID), eq(true),
- eq(new ArrayList<>()), eq(new ArrayList<>()), any());
+ eq(EMPTY_PLMN_LIST), eq(EMPTY_PLMN_LIST), any());
// Verify call the updateSatelliteEntitlementStatus with satellite service is enable,
// empty PLMNAllowedList and availablePLMNBarredList.
@@ -300,17 +335,14 @@
verify(mSatelliteEntitlementApi).checkEntitlementStatus();
verify(mSatelliteController).onSatelliteEntitlementStatusUpdated(eq(SUB_ID), eq(true),
- eq(new ArrayList<>()), eq(PLMN_BARRED_LIST), any());
+ eq(EMPTY_PLMN_LIST), eq(PLMN_BARRED_LIST), any());
}
@Test
public void testCheckSatelliteEntitlementStatusWhenInternetConnected() throws Exception {
- Field fieldNetworkCallback = SatelliteEntitlementController.class.getDeclaredField(
- "mNetworkCallback");
- fieldNetworkCallback.setAccessible(true);
+ logd("testCheckSatelliteEntitlementStatusWhenInternetConnected");
ConnectivityManager.NetworkCallback networkCallback =
- (ConnectivityManager.NetworkCallback) fieldNetworkCallback.get(
- mSatelliteEntitlementController);
+ (ConnectivityManager.NetworkCallback) getValue("mNetworkCallback");
Network mockNetwork = mock(Network.class);
// Verify the called the checkSatelliteEntitlementStatus when Internet is connected.
@@ -330,6 +362,7 @@
@Test
public void testCheckSatelliteEntitlementStatusWhenCarrierConfigChanged() throws Exception {
+ logd("testCheckSatelliteEntitlementStatusWhenCarrierConfigChanged");
// Verify the called the checkSatelliteEntitlementStatus when CarrierConfigChanged
// occurred and Internet is connected.
setInternetConnected(true);
@@ -344,6 +377,467 @@
eq(PLMN_ALLOWED_LIST), eq(PLMN_BARRED_LIST), any());
}
+ @Test
+ public void testCheckWhenStartCmdIsReceivedDuringRetry() throws Exception {
+ logd("testCheckWhenStartCmdIsReceivedDuringRetry");
+ // Verify that start cmd is ignored and retry is performed up to 5 times when start cmd
+ // occurs during retries.
+ setIsQueryAvailableTrue();
+ set503RetryAfterResponse();
+ Map<Integer, Integer> retryCountPerSub =
+ (Map<Integer, Integer>) getValue("mRetryCountPerSub");
+
+ // Verify that the first query.
+ sendMessage(CMD_START_QUERY_ENTITLEMENT, SUB_ID);
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi, times(1)).checkEntitlementStatus();
+ // Verify that the retry count is 0 after receiving a 503 with retry-after header in
+ // response.
+ assertTrue(retryCountPerSub.getOrDefault(SUB_ID, 0) == 0);
+
+ // Verify that the retry count is 1 for the second query when receiving a 503 with
+ // retry-after header in response.
+ mTestableLooper.moveTimeForward(TimeUnit.SECONDS.toMillis(1));
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi, times(2)).checkEntitlementStatus();
+ assertTrue(retryCountPerSub.get(SUB_ID) == 1);
+
+ // Verify that the retry count is 2 for the third query when receiving a 503 with
+ // retry-after header in response.
+ mTestableLooper.moveTimeForward(TimeUnit.SECONDS.toMillis(1));
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi, times(3)).checkEntitlementStatus();
+ assertTrue(retryCountPerSub.get(SUB_ID) == 2);
+
+ // Verify that start CMD is ignored during retries.
+ sendMessage(CMD_START_QUERY_ENTITLEMENT, SUB_ID);
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi, times(3)).checkEntitlementStatus();
+ assertTrue(retryCountPerSub.get(SUB_ID) == 2);
+
+ // Verify that the retry count is 3 for the forth query when receiving a 503 with
+ // retry-after header in response.
+ mTestableLooper.moveTimeForward(TimeUnit.SECONDS.toMillis(1));
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi, times(4)).checkEntitlementStatus();
+ assertTrue(retryCountPerSub.get(SUB_ID) == 3);
+
+ // Verify that the retry count is 4 for the fifth query when receiving a 503 with
+ // retry-after header in response.
+ mTestableLooper.moveTimeForward(TimeUnit.SECONDS.toMillis(1));
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi, times(5)).checkEntitlementStatus();
+ assertTrue(retryCountPerSub.get(SUB_ID) == 4);
+
+ // Verify that start CMD is ignored during retries.
+ sendMessage(CMD_START_QUERY_ENTITLEMENT, SUB_ID);
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi, times(5)).checkEntitlementStatus();
+ assertTrue(retryCountPerSub.get(SUB_ID) == 4);
+
+ // Verify that the retry count is 5 for the sixth query when receiving a 503 with
+ // retry-after header in response.
+ mTestableLooper.moveTimeForward(TimeUnit.SECONDS.toMillis(1));
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi, times(6)).checkEntitlementStatus();
+ assertNull(retryCountPerSub.get(SUB_ID));
+
+ // Verify only called onSatelliteEntitlementStatusUpdated once.
+ verify(mSatelliteController, times(1)).onSatelliteEntitlementStatusUpdated(eq(SUB_ID),
+ eq(false), eq(EMPTY_PLMN_LIST), eq(EMPTY_PLMN_LIST), any());
+
+ // Verify that the query is not restarted after reaching the maximum retry count even if
+ // a start cmd is received.
+ sendMessage(CMD_START_QUERY_ENTITLEMENT, SUB_ID);
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi, times(6)).checkEntitlementStatus();
+ assertNull(retryCountPerSub.get(SUB_ID));
+
+ // Verify that the query is not restarted after reaching the maximum retry count even if
+ // a start cmd is received.
+ sendMessage(CMD_RETRY_QUERY_ENTITLEMENT, SUB_ID);
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi, times(6)).checkEntitlementStatus();
+ assertNull(retryCountPerSub.get(SUB_ID));
+ }
+
+ @Test
+ public void testCheckAfterInternetConnectionChangedDuringRetry() throws Exception {
+ logd("testCheckAfterInternetConnectionChangedDuringRetry");
+ // Verify that the retry count is maintained even when internet connection is lost and
+ // connected during retries, and that up to 5 retries are performed.
+ setIsQueryAvailableTrue();
+ set503RetryAfterResponse();
+ Map<Integer, Integer> retryCountPerSub =
+ (Map<Integer, Integer>) getValue("mRetryCountPerSub");
+
+ // Verify that the first query.
+ sendMessage(CMD_START_QUERY_ENTITLEMENT, SUB_ID);
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi, times(1)).checkEntitlementStatus();
+ // Verify that the retry count is 0 after receiving a 503 with retry-after header in
+ // response.
+ assertTrue(retryCountPerSub.getOrDefault(SUB_ID, 0) == 0);
+
+ // Verify that the retry count is 1 for the second query when receiving a 503 with
+ // retry-after header in response.
+ mTestableLooper.moveTimeForward(TimeUnit.SECONDS.toMillis(1));
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi, times(2)).checkEntitlementStatus();
+ assertTrue(retryCountPerSub.get(SUB_ID) == 1);
+
+ // Verify that no query is executed and the retry count does not increase when internet
+ // connection is lost during the second retry.
+ setInternetConnected(false);
+ mTestableLooper.moveTimeForward(TimeUnit.SECONDS.toMillis(1));
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi, times(2)).checkEntitlementStatus();
+ assertTrue(retryCountPerSub.get(SUB_ID) == 1);
+
+ // Verify that the query is started when internet connection is restored and that the
+ // retry count does not increase.
+ setInternetConnected(true);
+ logd("internet connected again");
+ sendMessage(CMD_START_QUERY_ENTITLEMENT, SUB_ID);
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi, times(3)).checkEntitlementStatus();
+ assertTrue(retryCountPerSub.get(SUB_ID) == 1);
+
+ // Verify that the retry count is increases after received a 503 with retry-after header
+ // in response.
+ mTestableLooper.moveTimeForward(TimeUnit.SECONDS.toMillis(1));
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi, times(4)).checkEntitlementStatus();
+ assertTrue(retryCountPerSub.get(SUB_ID) == 2);
+
+ mTestableLooper.moveTimeForward(TimeUnit.SECONDS.toMillis(1));
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi, times(5)).checkEntitlementStatus();
+ assertTrue(retryCountPerSub.get(SUB_ID) == 3);
+
+ mTestableLooper.moveTimeForward(TimeUnit.SECONDS.toMillis(1));
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi, times(6)).checkEntitlementStatus();
+ assertTrue(retryCountPerSub.get(SUB_ID) == 4);
+
+ mTestableLooper.moveTimeForward(TimeUnit.SECONDS.toMillis(1));
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi, times(7)).checkEntitlementStatus();
+ assertNull(retryCountPerSub.get(SUB_ID));
+
+ // Verify that the query is not restarted after reaching the maximum retry count even if
+ // a start cmd is received.
+ sendMessage(CMD_START_QUERY_ENTITLEMENT, SUB_ID);
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi, times(7)).checkEntitlementStatus();
+ assertNull(retryCountPerSub.get(SUB_ID));
+
+ // Verify that the query is not restarted after reaching the maximum retry count even if
+ // a retry cmd is received.
+ sendMessage(CMD_START_QUERY_ENTITLEMENT, SUB_ID);
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi, times(7)).checkEntitlementStatus();
+ assertNull(retryCountPerSub.get(SUB_ID));
+
+ // Verify only called onSatelliteEntitlementStatusUpdated once.
+ verify(mSatelliteController, times(1)).onSatelliteEntitlementStatusUpdated(eq(SUB_ID),
+ eq(false), eq(EMPTY_PLMN_LIST), eq(EMPTY_PLMN_LIST), any());
+ }
+
+ @Test
+ public void testStartQueryEntitlementStatus_error500() throws Exception {
+ logd("testStartQueryEntitlementStatus_error500");
+ setIsQueryAvailableTrue();
+ Map<Integer, Integer> retryCountPerSub =
+ (Map<Integer, Integer>) getValue("mRetryCountPerSub");
+ setErrorResponse(500);
+
+ sendMessage(CMD_START_QUERY_ENTITLEMENT, SUB_ID);
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi, times(1)).checkEntitlementStatus();
+ assertNull(retryCountPerSub.get(SUB_ID));
+ verify(mSatelliteController, times(1)).onSatelliteEntitlementStatusUpdated(eq(SUB_ID),
+ eq(false), eq(EMPTY_PLMN_LIST), eq(EMPTY_PLMN_LIST), any());
+ }
+
+ @Test
+ public void testStartQueryEntitlementStatus_error503_retrySuccess() throws Exception {
+ logd("testStartQueryEntitlementStatus_error503_retrySuccess");
+ setIsQueryAvailableTrue();
+ set503RetryAfterResponse();
+ Map<Integer, Integer> retryCountPerSub =
+ (Map<Integer, Integer>) getValue("mRetryCountPerSub");
+
+ // Verify that the first query.
+ sendMessage(CMD_START_QUERY_ENTITLEMENT, SUB_ID);
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi, times(1)).checkEntitlementStatus();
+ assertNull(retryCountPerSub.get(SUB_ID));
+
+ // Verify whether the query has been retried and verify called
+ // onSatelliteEntitlementStatusUpdated after receive a success case.
+ doReturn(mSatelliteEntitlementResult).when(
+ mSatelliteEntitlementApi).checkEntitlementStatus();
+ setSatelliteEntitlementResult(SATELLITE_ENTITLEMENT_STATUS_ENABLED, PLMN_ALLOWED_LIST,
+ PLMN_BARRED_LIST);
+ mTestableLooper.moveTimeForward(TimeUnit.SECONDS.toMillis(1));
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi, times(2)).checkEntitlementStatus();
+ assertNull(retryCountPerSub.get(SUB_ID));
+ verify(mSatelliteController).onSatelliteEntitlementStatusUpdated(eq(SUB_ID), eq(true),
+ eq(PLMN_ALLOWED_LIST), eq(PLMN_BARRED_LIST), any());
+ }
+
+ @Test
+ public void testStartQueryEntitlementStatus_otherError_retrySuccess() throws Exception {
+ logd("testStartQueryEntitlementStatus_otherError_retrySuccess");
+ setIsQueryAvailableTrue();
+ Map<Integer, Integer> retryCountPerSub =
+ (Map<Integer, Integer>) getValue("mRetryCountPerSub");
+ Map<Integer, Boolean> isEntitlementInProgressPerSub =
+ (Map<Integer, Boolean>) getValue("mIsEntitlementInProgressPerSub");
+ Map<Integer, ExponentialBackoff> exponentialBackoffPerSub =
+ (Map<Integer, ExponentialBackoff>) getValue("mExponentialBackoffPerSub");
+ setErrorResponse(400);
+
+ // Verify start the exponentialBackoff.
+ sendMessage(CMD_START_QUERY_ENTITLEMENT, SUB_ID);
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi, times(1)).checkEntitlementStatus();
+ assertNull(retryCountPerSub.get(SUB_ID));
+ assertTrue(isEntitlementInProgressPerSub.get(SUB_ID));
+ assertNotNull(exponentialBackoffPerSub.get(SUB_ID));
+ // Verify don't call the onSatelliteEntitlementStatusUpdated.
+ verify(mSatelliteController, never()).onSatelliteEntitlementStatusUpdated(anyInt(),
+ anyBoolean(), anyList(), anyList(), any());
+
+ // Verify the retry in progress.
+ sendMessage(CMD_RETRY_QUERY_ENTITLEMENT, SUB_ID);
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi, times(2)).checkEntitlementStatus();
+ assertTrue(retryCountPerSub.get(SUB_ID) == 1);
+ // Verify don't call the onSatelliteEntitlementStatusUpdated.
+ verify(mSatelliteController, never()).onSatelliteEntitlementStatusUpdated(anyInt(),
+ anyBoolean(), anyList(), anyList(), any());
+
+ // Received the 200 response, Verify call the onSatelliteEntitlementStatusUpdated.
+ setIsQueryAvailableTrue();
+ doReturn(mSatelliteEntitlementResult).when(
+ mSatelliteEntitlementApi).checkEntitlementStatus();
+ setSatelliteEntitlementResult(SATELLITE_ENTITLEMENT_STATUS_ENABLED, PLMN_ALLOWED_LIST,
+ PLMN_BARRED_LIST);
+
+ sendMessage(CMD_RETRY_QUERY_ENTITLEMENT, SUB_ID);
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi, times(3)).checkEntitlementStatus();
+ assertTrue(retryCountPerSub.get(SUB_ID) == 1);
+ verify(mSatelliteController).onSatelliteEntitlementStatusUpdated(eq(SUB_ID), eq(true),
+ eq(PLMN_ALLOWED_LIST), eq(PLMN_BARRED_LIST), any());
+ }
+
+ @Test
+ public void testSatelliteEntitlementSupportedChangedFromSupportToNotSupport() throws Exception {
+ logd("testSatelliteEntitlementSupportedChangedFromSupportToNotSupport");
+ setIsQueryAvailableTrue();
+
+ // KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL changed from Support(entitlement status
+ // disabled) to not support.
+ doReturn(mSatelliteEntitlementResult).when(
+ mSatelliteEntitlementApi).checkEntitlementStatus();
+ setSatelliteEntitlementResult(SATELLITE_ENTITLEMENT_STATUS_DISABLED, EMPTY_PLMN_LIST,
+ EMPTY_PLMN_LIST);
+ sendMessage(CMD_START_QUERY_ENTITLEMENT, SUB_ID);
+ mTestableLooper.processAllMessages();
+
+ // Verify call the onSatelliteEntitlementStatusUpdated - entitlement status false
+ verify(mSatelliteEntitlementApi).checkEntitlementStatus();
+ verify(mSatelliteController).onSatelliteEntitlementStatusUpdated(anyInt(),
+ eq(false), eq(EMPTY_PLMN_LIST), eq(EMPTY_PLMN_LIST), any());
+
+ // Verify call the onSatelliteEntitlementStatusUpdated - entitlement status true
+ mCarrierConfigBundle.putBoolean(
+ CarrierConfigManager.KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL, false);
+ sendMessage(CMD_START_QUERY_ENTITLEMENT, SUB_ID);
+ mTestableLooper.processAllMessages();
+
+ verify(mSatelliteController).onSatelliteEntitlementStatusUpdated(anyInt(),
+ eq(true), eq(EMPTY_PLMN_LIST), eq(EMPTY_PLMN_LIST), any());
+
+ // KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL changed from Support(entitlement status
+ // enabled) to not support.
+ mCarrierConfigBundle.putBoolean(
+ CarrierConfigManager.KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL, true);
+ doReturn(mSatelliteEntitlementResult).when(
+ mSatelliteEntitlementApi).checkEntitlementStatus();
+ setSatelliteEntitlementResult(SATELLITE_ENTITLEMENT_STATUS_ENABLED, PLMN_ALLOWED_LIST,
+ PLMN_BARRED_LIST);
+ sendMessage(CMD_START_QUERY_ENTITLEMENT, SUB_ID);
+ mTestableLooper.processAllMessages();
+
+ // Verify call the onSatelliteEntitlementStatusUpdated - entitlement status true.
+ verify(mSatelliteEntitlementApi, times(2)).checkEntitlementStatus();
+ verify(mSatelliteController).onSatelliteEntitlementStatusUpdated(anyInt(),
+ eq(true), eq(PLMN_ALLOWED_LIST), eq(PLMN_BARRED_LIST), any());
+
+ // Verify not call the onSatelliteEntitlementStatusUpdated.
+ clearInvocationsForMock();
+ mCarrierConfigBundle.putBoolean(
+ CarrierConfigManager.KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL, false);
+ sendMessage(CMD_START_QUERY_ENTITLEMENT, SUB_ID);
+ mTestableLooper.processAllMessages();
+
+ verify(mSatelliteController, never()).onSatelliteEntitlementStatusUpdated(anyInt(),
+ eq(true), eq(EMPTY_PLMN_LIST), eq(EMPTY_PLMN_LIST), any());
+ }
+
+ @Test
+ public void testStartQueryEntitlementStatus_refreshStatus() throws Exception {
+ logd("testStartQueryEntitlementStatus_refreshStatus");
+ setIsQueryAvailableTrue();
+ mCarrierConfigBundle.putInt(
+ CarrierConfigManager.KEY_SATELLITE_ENTITLEMENT_STATUS_REFRESH_DAYS_INT, 1);
+
+ // Verify start query and success.
+ doReturn(mSatelliteEntitlementResult).when(
+ mSatelliteEntitlementApi).checkEntitlementStatus();
+ setSatelliteEntitlementResult(SATELLITE_ENTITLEMENT_STATUS_ENABLED, PLMN_ALLOWED_LIST,
+ PLMN_BARRED_LIST);
+ sendMessage(CMD_START_QUERY_ENTITLEMENT, SUB_ID);
+ mTestableLooper.processAllMessages();
+
+ verify(mSatelliteEntitlementApi).checkEntitlementStatus();
+ verify(mSatelliteController).onSatelliteEntitlementStatusUpdated(anyInt(),
+ anyBoolean(), anyList(), anyList(), any());
+
+ // After move to the refresh time, verify the query started and success.
+ setLastQueryTime(System.currentTimeMillis() - TimeUnit.DAYS.toMillis(1) - 1000);
+ mTestableLooper.moveTimeForward(TimeUnit.DAYS.toMillis(1));
+ mTestableLooper.processAllMessages();
+
+ verify(mSatelliteEntitlementApi, times(2)).checkEntitlementStatus();
+ verify(mSatelliteController, times(2)).onSatelliteEntitlementStatusUpdated(anyInt(),
+ anyBoolean(), anyList(), anyList(), any());
+ }
+
+ @Test
+ public void testStartQueryEntitlementStatus_internetDisconnectedAndConnectedAgain()
+ throws Exception {
+ logd("testStartQueryEntitlementStatus_internetDisconnectedAndConnectedAgain");
+ setIsQueryAvailableTrue();
+
+ // Verify the query does not start if there is no internet connection.
+ setInternetConnected(false);
+ sendMessage(CMD_START_QUERY_ENTITLEMENT, SUB_ID);
+ mTestableLooper.processAllMessages();
+
+ verify(mSatelliteEntitlementApi, never()).checkEntitlementStatus();
+ verify(mSatelliteController, never()).onSatelliteEntitlementStatusUpdated(anyInt(),
+ anyBoolean(), anyList(), anyList(), any());
+
+ // Verify the query start and success after internet connected.
+ setInternetConnected(true);
+ doReturn(mSatelliteEntitlementResult).when(
+ mSatelliteEntitlementApi).checkEntitlementStatus();
+ setSatelliteEntitlementResult(SATELLITE_ENTITLEMENT_STATUS_ENABLED, PLMN_ALLOWED_LIST,
+ PLMN_BARRED_LIST);
+ sendMessage(CMD_START_QUERY_ENTITLEMENT, SUB_ID);
+ mTestableLooper.processAllMessages();
+
+ verify(mSatelliteEntitlementApi).checkEntitlementStatus();
+ verify(mSatelliteController).onSatelliteEntitlementStatusUpdated(eq(SUB_ID), eq(true),
+ eq(PLMN_ALLOWED_LIST), eq(PLMN_BARRED_LIST), any());
+ }
+
+ @Test
+ public void testStartQueryEntitlementStatus_error503_error500() throws Exception {
+ logd("testStartQueryEntitlementStatus_error503_error500");
+ setIsQueryAvailableTrue();
+ set503RetryAfterResponse();
+
+ // Verify that the first query was triggered and that onSatelliteEntitlementStatusUpdated
+ // was not called after received a 503 error.
+ sendMessage(CMD_START_QUERY_ENTITLEMENT, SUB_ID);
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi).checkEntitlementStatus();
+ verify(mSatelliteController, never()).onSatelliteEntitlementStatusUpdated(anyInt(),
+ anyBoolean(), anyList(), anyList(), any());
+
+ // Verify whether the second query has been triggered and whether
+ // onSatelliteEntitlementStatusUpdated has been called after received the 500 error.
+ reset(mSatelliteEntitlementApi);
+ setErrorResponse(500);
+ mTestableLooper.moveTimeForward(TimeUnit.SECONDS.toMillis(1));
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi).checkEntitlementStatus();
+ verify(mSatelliteController).onSatelliteEntitlementStatusUpdated(eq(SUB_ID),
+ eq(false), eq(EMPTY_PLMN_LIST), eq(EMPTY_PLMN_LIST), any());
+ }
+
+ @Test
+ public void testStartQueryEntitlementStatus_error503_otherError() throws Exception {
+ logd("testStartQueryEntitlementStatus_error503_otherError");
+ setIsQueryAvailableTrue();
+ set503RetryAfterResponse();
+
+ // Verify that the first query was triggered and that onSatelliteEntitlementStatusUpdated
+ // was not called after received a 503 error.
+ sendMessage(CMD_START_QUERY_ENTITLEMENT, SUB_ID);
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi).checkEntitlementStatus();
+ verify(mSatelliteController, never()).onSatelliteEntitlementStatusUpdated(anyInt(),
+ anyBoolean(), anyList(), anyList(), any());
+
+ // Verify whether the second query was triggered and onSatelliteEntitlementStatusUpdated
+ // was not called after received a 503 error without valid retry-after header.
+ reset(mSatelliteEntitlementApi);
+ setErrorResponse(503);
+ mTestableLooper.moveTimeForward(TimeUnit.SECONDS.toMillis(1));
+ mTestableLooper.processAllMessages();
+ verify(mSatelliteEntitlementApi).checkEntitlementStatus();
+ verify(mSatelliteController, never()).onSatelliteEntitlementStatusUpdated(anyInt(),
+ anyBoolean(), anyList(), anyList(), any());
+
+ // Verify whether the third query was triggered and onSatelliteEntitlementStatusUpdated
+ // was called after received a success case.
+ doReturn(mSatelliteEntitlementResult).when(
+ mSatelliteEntitlementApi).checkEntitlementStatus();
+ setSatelliteEntitlementResult(SATELLITE_ENTITLEMENT_STATUS_ENABLED, PLMN_ALLOWED_LIST,
+ PLMN_BARRED_LIST);
+ mTestableLooper.moveTimeForward(TimeUnit.MINUTES.toMillis(10));
+ mTestableLooper.processAllMessages();
+
+ verify(mSatelliteEntitlementApi, times(2)).checkEntitlementStatus();
+ verify(mSatelliteController).onSatelliteEntitlementStatusUpdated(eq(SUB_ID), eq(true),
+ eq(PLMN_ALLOWED_LIST), eq(PLMN_BARRED_LIST), any());
+ }
+
+ @Test
+ public void testStartQueryEntitlementStatus_AfterSimRefresh() throws Exception {
+ logd("testStartQueryEntitlementStatus_AfterSimRefresh");
+ setIsQueryAvailableTrue();
+
+ // Verify the first query complete.
+ doReturn(mSatelliteEntitlementResult).when(
+ mSatelliteEntitlementApi).checkEntitlementStatus();
+ setSatelliteEntitlementResult(SATELLITE_ENTITLEMENT_STATUS_ENABLED, PLMN_ALLOWED_LIST,
+ PLMN_BARRED_LIST);
+ mSatelliteEntitlementController.handleCmdStartQueryEntitlement();
+
+ verify(mSatelliteEntitlementApi).checkEntitlementStatus();
+ verify(mSatelliteController).onSatelliteEntitlementStatusUpdated(anyInt(),
+ anyBoolean(), anyList(), anyList(), any());
+
+ // SIM_REFRESH event occurred before expired the query refresh timer, verify the start
+ // the query.
+ sendMessage(CMD_SIM_REFRESH, SUB_ID);
+ mTestableLooper.moveTimeForward(TimeUnit.MINUTES.toMillis(10));
+ mTestableLooper.processAllMessages();
+
+ verify(mSatelliteEntitlementApi, times(2)).checkEntitlementStatus();
+ verify(mSatelliteController, times(2)).onSatelliteEntitlementStatusUpdated(anyInt(),
+ anyBoolean(), anyList(), anyList(), any());
+ }
+
private void triggerCarrierConfigChanged() {
for (Pair<Executor, CarrierConfigManager.CarrierConfigChangeListener> pair
: mCarrierConfigChangedListenerList) {
@@ -354,6 +848,16 @@
mTestableLooper.processAllMessages();
}
+ private void triggerCarrierConfigChanged(int subId) {
+ for (Pair<Executor, CarrierConfigManager.CarrierConfigChangeListener> pair
+ : mCarrierConfigChangedListenerList) {
+ pair.first.execute(() -> pair.second.onCarrierConfigChanged(
+ /*slotIndex*/ 0, /*subId*/ subId, /*carrierId*/ 0, /*specificCarrierId*/ 0)
+ );
+ }
+ mTestableLooper.processAllMessages();
+ }
+
private void clearInvocationsForMock() {
clearInvocations(mSatelliteEntitlementApi);
clearInvocations(mSatelliteController);
@@ -365,11 +869,15 @@
CarrierConfigManager.KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL, true);
replaceInstance(SatelliteEntitlementController.class, "mRetryCountPerSub",
mSatelliteEntitlementController, new HashMap<>());
+ replaceInstance(SatelliteEntitlementController.class, "mIsEntitlementInProgressPerSub",
+ mSatelliteEntitlementController, new HashMap<>());
setInternetConnected(true);
setLastQueryTime(0L);
replaceInstance(SatelliteEntitlementController.class,
"mSatelliteEntitlementResultPerSub", mSatelliteEntitlementController,
new HashMap<>());
+ replaceInstance(SatelliteEntitlementController.class,
+ "mSubIdPerSlot", mSatelliteEntitlementController, new HashMap<>());
}
private void setInternetConnected(boolean connected) {
@@ -398,6 +906,41 @@
lastQueryTimePerSub.put(SUB_ID, lastQueryTime);
}
+ private void set503RetryAfterResponse() throws Exception {
+ when(mSatelliteEntitlementApi.checkEntitlementStatus()).thenAnswer(
+ new Answer() {
+ @Override
+ public Object answer(InvocationOnMock invocation) throws Throwable {
+ throw new ServiceEntitlementException(
+ ERROR_HTTP_STATUS_NOT_SUCCESS, 503, "1", "503 occurred");
+ }
+ }
+ );
+ }
+
+ private void setErrorResponse(int errorCode) throws Exception {
+ when(mSatelliteEntitlementApi.checkEntitlementStatus()).thenAnswer(
+ new Answer() {
+ @Override
+ public Object answer(InvocationOnMock invocation) throws Throwable {
+ throw new ServiceEntitlementException(
+ ERROR_HTTP_STATUS_NOT_SUCCESS, errorCode, "",
+ errorCode + " occurred");
+ }
+ }
+ );
+ }
+
+ private void sendMessage(int what, int subId) {
+ mSatelliteEntitlementController.handleMessage(mHandler.obtainMessage(what, subId, 0));
+ }
+
+ private Object getValue(String originalObjectName) throws Exception {
+ Field field = SatelliteEntitlementController.class.getDeclaredField(originalObjectName);
+ field.setAccessible(true);
+ return field.get(mSatelliteEntitlementController);
+ }
+
public static class TestSatelliteEntitlementController extends SatelliteEntitlementController {
private SatelliteEntitlementApi mInjectSatelliteEntitlementApi;
diff --git a/tests/src/com/android/phone/tests/CallDialTest.java b/tests/src/com/android/phone/tests/CallDialTest.java
index 6e78be0..cafa7f2 100644
--- a/tests/src/com/android/phone/tests/CallDialTest.java
+++ b/tests/src/com/android/phone/tests/CallDialTest.java
@@ -22,6 +22,7 @@
import android.net.Uri;
import android.os.Bundle;
import android.os.RemoteException;
+import android.os.UserHandle;
import android.telecom.PhoneAccount;
import android.telephony.PhoneNumberUtils;
import android.telephony.TelephonyFrameworkInitializer;
@@ -136,13 +137,13 @@
log("==> intent: " + intent);
try {
- startActivity(intent);
+ startActivityAsUser(intent, UserHandle.CURRENT);
Toast.makeText(this, "Starting activity...", Toast.LENGTH_SHORT).show();
} catch (ActivityNotFoundException e) {
Log.w(LOG_TAG, "testCall: ActivityNotFoundException for intent: " + intent);
Toast.makeText(this, e.toString(), Toast.LENGTH_LONG).show();
} catch (Exception e) {
- Log.w(LOG_TAG, "testCall: Unexpected exception from startActivity(): " + e);
+ Log.w(LOG_TAG, "testCall: Unexpected exception from startActivityAsUser(): " + e);
Toast.makeText(this, e.toString(), Toast.LENGTH_LONG).show();
}
}
diff --git a/tests/src/com/android/services/telephony/TelecomAccountRegistryTest.java b/tests/src/com/android/services/telephony/TelecomAccountRegistryTest.java
new file mode 100644
index 0000000..fc544b0
--- /dev/null
+++ b/tests/src/com/android/services/telephony/TelecomAccountRegistryTest.java
@@ -0,0 +1,314 @@
+/*
+ * Copyright (C) 2024 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.services.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.BroadcastReceiver;
+import android.content.ContentProvider;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
+import android.os.PersistableBundle;
+import android.os.UserHandle;
+import android.platform.test.flag.junit.SetFlagsRule;
+import android.telecom.PhoneAccount;
+import android.telecom.TelecomManager;
+import android.telephony.CarrierConfigManager;
+import android.telephony.ServiceState;
+import android.telephony.SubscriptionManager;
+import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
+import android.telephony.TelephonyCallback;
+import android.telephony.TelephonyManager;
+import android.telephony.ims.ImsManager;
+import android.testing.AndroidTestingRunner;
+import android.testing.TestableLooper;
+
+import com.android.TelephonyTestBase;
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneConstants;
+import com.android.internal.telephony.PhoneFactory;
+import com.android.internal.telephony.flags.Flags;
+import com.android.phone.PhoneGlobals;
+import com.android.phone.PhoneInterfaceManager;
+import com.android.phone.R;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidTestingRunner.class)
+@TestableLooper.RunWithLooper(setAsMainLooper = true)
+public class TelecomAccountRegistryTest extends TelephonyTestBase {
+
+ private static final String TAG = "TelecomAccountRegistryTest";
+ private static final int TEST_SUB_ID = 1;
+
+ @Rule
+ public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
+ // We need more functions that what TelephonyTestBase.mContext supports.
+ // Use a local mocked Context to make life easier.
+ @Mock Context mMockedContext;
+ @Mock TelecomManager mTelecomManager;
+ @Mock TelephonyManager mTelephonyManager;
+ @Mock ImsManager mImsManager;
+ @Mock SubscriptionManager mSubscriptionManager;
+ @Mock ContentProvider mContentProvider;
+ @Mock PhoneGlobals mPhoneGlobals;
+ @Mock Phone mPhone;
+ @Mock Resources mResources;
+ @Mock Drawable mDrawable;
+ @Mock PhoneInterfaceManager mPhoneInterfaceManager;
+
+ private TelecomAccountRegistry mTelecomAccountRegistry;
+
+ private OnSubscriptionsChangedListener mOnSubscriptionsChangedListener;
+ private TelephonyCallback mTelephonyCallback;
+ private BroadcastReceiver mUserSwitchedAndConfigChangedReceiver;
+ private BroadcastReceiver mLocaleChangedBroadcastReceiver;
+ private ContentResolver mContentResolver;
+ private Phone[] mPhones;
+ private TestableLooper mTestableLooper;
+
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ mSetFlagsRule.disableFlags(Flags.FLAG_DELAY_PHONE_ACCOUNT_REGISTRATION);
+ MockitoAnnotations.initMocks(this);
+
+ mPhones = new Phone[]{mPhone};
+ replaceInstance(PhoneFactory.class, "sPhones", null, mPhones);
+ replaceInstance(PhoneGlobals.class, "sMe", null, mPhoneGlobals);
+ replaceInstance(PhoneInterfaceManager.class, "sInstance", null, mPhoneInterfaceManager);
+ when(mPhone.getPhoneType()).thenReturn(PhoneConstants.PHONE_TYPE_GSM);
+ when(mPhone.getContext()).thenReturn(mMockedContext);
+ when(mPhone.getSubId()).thenReturn(TEST_SUB_ID);
+ when(mPhoneInterfaceManager.isRttEnabled(anyInt())).thenReturn(false);
+
+ when(mMockedContext.getResources()).thenReturn(mResources);
+ // Enable PSTN PhoneAccount which can place emergency call by default
+ when(mResources.getBoolean(R.bool.config_pstn_phone_accounts_enabled)).thenReturn(true);
+ when(mResources.getBoolean(R.bool.config_pstnCanPlaceEmergencyCalls)).thenReturn(true);
+ when(mResources.getDrawable(anyInt(), any())).thenReturn(mDrawable);
+ when(mDrawable.getIntrinsicWidth()).thenReturn(5);
+ when(mDrawable.getIntrinsicHeight()).thenReturn(5);
+
+ PersistableBundle bundle = new PersistableBundle();
+ bundle.putBoolean(CarrierConfigManager.KEY_SUPPORT_IMS_CONFERENCE_CALL_BOOL, false);
+ bundle.putIntArray(CarrierConfigManager.KEY_CELLULAR_SERVICE_CAPABILITIES_INT_ARRAY,
+ new int[]{
+ SubscriptionManager.SERVICE_CAPABILITY_VOICE,
+ SubscriptionManager.SERVICE_CAPABILITY_SMS,
+ SubscriptionManager.SERVICE_CAPABILITY_DATA
+ });
+ when(mPhoneGlobals.getCarrierConfigForSubId(anyInt())).thenReturn(bundle);
+
+ // Mock system services used by TelecomAccountRegistry
+ when(mMockedContext.getSystemServiceName(TelecomManager.class))
+ .thenReturn(Context.TELECOM_SERVICE);
+ when(mMockedContext.getSystemService(TelecomManager.class))
+ .thenReturn(mTelecomManager);
+ when(mMockedContext.getSystemServiceName(TelephonyManager.class))
+ .thenReturn(Context.TELEPHONY_SERVICE);
+ when(mMockedContext.getSystemService(TelephonyManager.class))
+ .thenReturn(mTelephonyManager);
+ when(mMockedContext.getSystemServiceName(ImsManager.class))
+ .thenReturn(Context.TELEPHONY_IMS_SERVICE);
+ when(mMockedContext.getSystemService(ImsManager.class))
+ .thenReturn(mImsManager);
+ when(mMockedContext.getSystemServiceName(SubscriptionManager.class))
+ .thenReturn(Context.TELEPHONY_SUBSCRIPTION_SERVICE);
+ when(mMockedContext.getSystemService(SubscriptionManager.class))
+ .thenReturn(mSubscriptionManager);
+
+ // Use mocked ContentProvider since we can't really mock ContentResolver
+ mContentResolver = ContentResolver.wrap(mContentProvider);
+ when(mMockedContext.getContentResolver()).thenReturn(mContentResolver);
+
+ mTestableLooper = TestableLooper.get(this);
+ when(mMockedContext.getMainLooper()).thenReturn(mTestableLooper.getLooper());
+ mTelecomAccountRegistry = new TelecomAccountRegistry(mMockedContext);
+ mTelecomAccountRegistry.setupOnBoot();
+
+ // Capture OnSubscriptionsChangedListener
+ ArgumentCaptor<OnSubscriptionsChangedListener> subChangeListenerCaptor =
+ ArgumentCaptor.forClass(OnSubscriptionsChangedListener.class);
+ verify(mSubscriptionManager).addOnSubscriptionsChangedListener(
+ subChangeListenerCaptor.capture());
+ mOnSubscriptionsChangedListener = subChangeListenerCaptor.getValue();
+
+ // Capture TelephonyCallback
+ ArgumentCaptor<TelephonyCallback> telephonyCallbackArgumentCaptor =
+ ArgumentCaptor.forClass(TelephonyCallback.class);
+ verify(mTelephonyManager).registerTelephonyCallback(anyInt(), any(),
+ telephonyCallbackArgumentCaptor.capture());
+ mTelephonyCallback = telephonyCallbackArgumentCaptor.getValue();
+
+ // Capture BroadcastReceivers
+ ArgumentCaptor<BroadcastReceiver> broadcastReceiverArgumentCaptor =
+ ArgumentCaptor.forClass(BroadcastReceiver.class);
+ verify(mMockedContext, times(2)).registerReceiver(broadcastReceiverArgumentCaptor.capture(),
+ any());
+ mUserSwitchedAndConfigChangedReceiver =
+ broadcastReceiverArgumentCaptor.getAllValues().get(0);
+ mLocaleChangedBroadcastReceiver = broadcastReceiverArgumentCaptor.getAllValues().get(1);
+
+ mTestableLooper.processAllMessages();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ @Test
+ public void userSwitched_withPSTNAccount_shouldRegisterPSTNAccount() {
+ onUserSwitched(UserHandle.CURRENT);
+
+ PhoneAccount phoneAccount = verifyAndCaptureRegisteredPhoneAccount();
+
+ assertThat(phoneAccount.hasCapabilities(
+ PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)).isTrue();
+ assertThat(phoneAccount.hasCapabilities(
+ PhoneAccount.CAPABILITY_CALL_PROVIDER)).isTrue();
+ assertThat(phoneAccount.hasCapabilities(
+ PhoneAccount.CAPABILITY_PLACE_EMERGENCY_CALLS)).isTrue();
+ }
+
+ @Test
+ public void onLocaleChanged_withPSTNAccountDisabled_shouldRegisterEmergencyOnlyAccount() {
+ when(mResources.getBoolean(R.bool.config_pstn_phone_accounts_enabled)).thenReturn(false);
+ when(mResources.getBoolean(
+ R.bool.config_emergency_account_emergency_calls_only)).thenReturn(true);
+ onLocaleChanged();
+
+ PhoneAccount phoneAccount = verifyAndCaptureRegisteredPhoneAccount();
+
+ assertThat(phoneAccount.hasCapabilities(
+ PhoneAccount.CAPABILITY_EMERGENCY_CALLS_ONLY)).isTrue();
+ }
+
+ @Test
+ public void onLocaleChanged_withSubVoiceCapable_shouldNotRegisterEmergencyOnlyAccount() {
+ overrideSubscriptionServiceCapabilities(
+ new int[]{SubscriptionManager.SERVICE_CAPABILITY_VOICE});
+ onLocaleChanged();
+
+ PhoneAccount phoneAccount = verifyAndCaptureRegisteredPhoneAccount();
+
+ assertThat(phoneAccount.hasCapabilities(
+ PhoneAccount.CAPABILITY_EMERGENCY_CALLS_ONLY)).isFalse();
+ }
+
+ @Test
+ public void onLocaleChanged_withSubNotVoiceCapable_shouldRegisterEmergencyOnlyAccount() {
+ overrideSubscriptionServiceCapabilities(
+ new int[]{SubscriptionManager.SERVICE_CAPABILITY_DATA});
+ onLocaleChanged();
+
+ PhoneAccount phoneAccount = verifyAndCaptureRegisteredPhoneAccount();
+
+ assertThat(phoneAccount.hasCapabilities(
+ PhoneAccount.CAPABILITY_EMERGENCY_CALLS_ONLY)).isTrue();
+ }
+
+ private PhoneAccount verifyAndCaptureRegisteredPhoneAccount() {
+ ArgumentCaptor<PhoneAccount> phoneAccountArgumentCaptor =
+ ArgumentCaptor.forClass(PhoneAccount.class);
+ verify(mTelecomManager, atLeastOnce()).registerPhoneAccount(
+ phoneAccountArgumentCaptor.capture());
+ return phoneAccountArgumentCaptor.getValue();
+ }
+
+ private void onUserSwitched(UserHandle userHandle) {
+ Log.d(TAG, "Broadcast ACTION_USER_SWITCHED...");
+ Intent intent = new Intent(Intent.ACTION_USER_SWITCHED);
+ intent.putExtra(Intent.EXTRA_USER, userHandle);
+ mUserSwitchedAndConfigChangedReceiver.onReceive(mMockedContext, intent);
+ mTestableLooper.processAllMessages();
+ }
+
+ private void onCarrierConfigChanged(int subId) {
+ Log.d(TAG, "Broadcast ACTION_CARRIER_CONFIG_CHANGED...");
+ Intent intent = new Intent(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);
+ intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, subId);
+ mUserSwitchedAndConfigChangedReceiver.onReceive(mMockedContext, intent);
+ mTestableLooper.processAllMessages();
+ }
+
+ private void onSubscriptionsChanged() {
+ Log.d(TAG, "Change subscriptions...");
+ mOnSubscriptionsChangedListener.onSubscriptionsChanged();
+ }
+
+ private void onAddSubscriptionListenerFailed() {
+ Log.d(TAG, "Add subscription listener failed...");
+ mOnSubscriptionsChangedListener.onAddListenerFailed();
+ }
+
+ private void onServiceStateChanged(ServiceState serviceState) {
+ if (mTelephonyCallback instanceof TelephonyCallback.ServiceStateListener) {
+ TelephonyCallback.ServiceStateListener listener =
+ (TelephonyCallback.ServiceStateListener) mTelephonyCallback;
+ listener.onServiceStateChanged(serviceState);
+ }
+ }
+
+ private void onActiveDataSubscriptionIdChanged(int subId) {
+ if (mTelephonyCallback instanceof TelephonyCallback.ActiveDataSubscriptionIdListener) {
+ TelephonyCallback.ActiveDataSubscriptionIdListener listener =
+ (TelephonyCallback.ActiveDataSubscriptionIdListener) mTelephonyCallback;
+ listener.onActiveDataSubscriptionIdChanged(subId);
+ }
+ }
+
+ private void onLocaleChanged() {
+ Log.d(TAG, "Broadcast ACTION_LOCALE_CHANGED...");
+ Intent intent = new Intent(Intent.ACTION_LOCALE_CHANGED);
+ mLocaleChangedBroadcastReceiver.onReceive(mMockedContext, intent);
+ }
+
+ private void onNetworkCountryChanged() {
+ Log.d(TAG, "Broadcast ACTION_NETWORK_COUNTRY_CHANGED...");
+ Intent intent = new Intent(TelephonyManager.ACTION_NETWORK_COUNTRY_CHANGED);
+ mLocaleChangedBroadcastReceiver.onReceive(mMockedContext, intent);
+ }
+
+ private void overrideSubscriptionServiceCapabilities(int[] capabilities) {
+ PersistableBundle bundle = new PersistableBundle();
+ bundle.putIntArray(CarrierConfigManager.KEY_CELLULAR_SERVICE_CAPABILITIES_INT_ARRAY,
+ capabilities);
+
+ when(mPhoneGlobals.getCarrierConfigForSubId(anyInt())).thenReturn(bundle);
+ mTestableLooper.processAllMessages();
+ }
+}
diff --git a/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java b/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java
index 435601f..b6b1a36 100644
--- a/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java
+++ b/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java
@@ -56,6 +56,7 @@
import android.content.ComponentName;
import android.content.Context;
+import android.content.res.Resources;
import android.net.Uri;
import android.os.AsyncResult;
import android.os.Bundle;
@@ -105,11 +106,14 @@
import com.android.internal.telephony.emergency.EmergencyStateTracker;
import com.android.internal.telephony.emergency.RadioOnHelper;
import com.android.internal.telephony.emergency.RadioOnStateListener;
+import com.android.internal.telephony.flags.FeatureFlags;
import com.android.internal.telephony.flags.Flags;
import com.android.internal.telephony.gsm.SuppServiceNotification;
import com.android.internal.telephony.imsphone.ImsPhone;
import com.android.internal.telephony.satellite.SatelliteController;
import com.android.internal.telephony.satellite.SatelliteSOSMessageRecommender;
+import com.android.internal.telephony.subscription.SubscriptionInfoInternal;
+import com.android.internal.telephony.subscription.SubscriptionManagerService;
import org.junit.After;
import org.junit.Before;
@@ -252,6 +256,8 @@
@Mock ImsPhone mImsPhone;
@Mock private SatelliteSOSMessageRecommender mSatelliteSOSMessageRecommender;
@Mock private EmergencyStateTracker mEmergencyStateTracker;
+ @Mock private Resources mMockResources;
+ @Mock private FeatureFlags mFeatureFlags;
private Phone mPhone0;
private Phone mPhone1;
@@ -279,6 +285,7 @@
super.setUp();
doReturn(Looper.getMainLooper()).when(mContext).getMainLooper();
mTestConnectionService = new TestTelephonyConnectionService(mContext);
+ mTestConnectionService.setFeatureFlags(mFeatureFlags);
mTestConnectionService.setPhoneFactoryProxy(mPhoneFactoryProxy);
mTestConnectionService.setSubscriptionManagerProxy(mSubscriptionManagerProxy);
// Set configurations statically
@@ -307,7 +314,8 @@
mTestConnectionService, mEmergencyStateTracker);
replaceInstance(TelephonyConnectionService.class, "mSatelliteSOSMessageRecommender",
mTestConnectionService, mSatelliteSOSMessageRecommender);
- doNothing().when(mSatelliteSOSMessageRecommender).onEmergencyCallStarted(any());
+ doNothing().when(mSatelliteSOSMessageRecommender).onEmergencyCallStarted(any(),
+ anyBoolean());
doNothing().when(mSatelliteSOSMessageRecommender).onEmergencyCallConnectionStateChanged(
anyString(), anyInt());
doReturn(CompletableFuture.completedFuture(NOT_DISCONNECTED))
@@ -320,6 +328,8 @@
any(), anyInt(), anyBoolean());
replaceInstance(TelephonyConnectionService.class,
"mSatelliteController", mTestConnectionService, mSatelliteController);
+ doReturn(mMockResources).when(mContext).getResources();
+
mBinderStub = (IConnectionService.Stub) mTestConnectionService.onBind(null);
mSetFlagsRule.disableFlags(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG);
mSetFlagsRule.enableFlags(Flags.FLAG_DO_NOT_OVERRIDE_PRECISE_LABEL);
@@ -1299,7 +1309,7 @@
ArgumentCaptor<RadioOnStateListener.Callback> callback =
ArgumentCaptor.forClass(RadioOnStateListener.Callback.class);
verify(mRadioOnHelper).triggerRadioOnAndListen(callback.capture(), eq(true),
- eq(testPhone), eq(false), eq(0));
+ eq(testPhone), eq(false), eq(0), eq(false));
assertFalse(callback.getValue()
.isOkToCall(testPhone, ServiceState.STATE_OUT_OF_SERVICE, false));
@@ -1327,7 +1337,7 @@
ArgumentCaptor<RadioOnStateListener.Callback> callback =
ArgumentCaptor.forClass(RadioOnStateListener.Callback.class);
verify(mRadioOnHelper).triggerRadioOnAndListen(callback.capture(), eq(true),
- eq(testPhone), eq(false), eq(0));
+ eq(testPhone), eq(false), eq(0), eq(false));
assertFalse(callback.getValue()
.isOkToCall(testPhone, ServiceState.STATE_OUT_OF_SERVICE, false));
@@ -1338,13 +1348,13 @@
callback.getValue().onComplete(null, true);
try {
- doAnswer(invocation -> null).when(mContext).startActivity(any());
+ doAnswer(invocation -> null).when(mContext).startActivityAsUser(any(), any());
verify(testPhone).dial(anyString(), any(), any());
} catch (CallStateException e) {
// This shouldn't happen
fail();
}
- verify(mSatelliteSOSMessageRecommender).onEmergencyCallStarted(any());
+ verify(mSatelliteSOSMessageRecommender).onEmergencyCallStarted(any(), anyBoolean());
}
/**
@@ -1431,12 +1441,15 @@
@SmallTest
public void testCreateOutgoingEmergencyConnection_exitingSatellite_placeCall() {
when(mSatelliteController.isSatelliteEnabled()).thenReturn(true);
+ doReturn(true).when(mMockResources).getBoolean(anyInt());
+ doReturn(true).when(mTelephonyManagerProxy).isCurrentEmergencyNumber(
+ anyString());
Phone testPhone = setupConnectionServiceInApm();
ArgumentCaptor<RadioOnStateListener.Callback> callback =
ArgumentCaptor.forClass(RadioOnStateListener.Callback.class);
verify(mRadioOnHelper).triggerRadioOnAndListen(callback.capture(), eq(true),
- eq(testPhone), eq(false), eq(0));
+ eq(testPhone), eq(false), eq(0), eq(false));
assertFalse(callback.getValue()
.isOkToCall(testPhone, ServiceState.STATE_OUT_OF_SERVICE, false));
@@ -1450,13 +1463,115 @@
callback.getValue().onComplete(null, true);
try {
- doAnswer(invocation -> null).when(mContext).startActivity(any());
+ doAnswer(invocation -> null).when(mContext).startActivityAsUser(any(), any());
verify(testPhone).dial(anyString(), any(), any());
} catch (CallStateException e) {
// This shouldn't happen
fail();
}
- verify(mSatelliteSOSMessageRecommender).onEmergencyCallStarted(any());
+ verify(mSatelliteSOSMessageRecommender).onEmergencyCallStarted(any(), anyBoolean());
+ }
+
+ /**
+ * Test that the TelephonyConnectionService successfully placing the emergency call based on
+ * CarrierRoaming mode of Satellite.
+ */
+ @Test
+ @SmallTest
+ public void testCreateOutgoingEmergencyConnection_exitingSatellite_EmergencySatellite()
+ throws Exception {
+ doReturn(true).when(mFeatureFlags).carrierRoamingNbIotNtn();
+ doReturn(true).when(mSatelliteController).isSatelliteEnabled();
+
+ // Set config_turn_off_oem_enabled_satellite_during_emergency_call as false
+ doReturn(true).when(mTelephonyManagerProxy).isCurrentEmergencyNumber(anyString());
+ doReturn(false).when(mSatelliteController).isDemoModeEnabled();
+
+ // Satellite is not for emergency, allow EMC
+ doReturn(false).when(mSatelliteController).getRequestIsEmergency();
+ // Setup outgoing emergency call
+ setupConnectionServiceInApm();
+
+ // Verify emergency call go through
+ assertNull(mConnection.getDisconnectCause());
+ }
+
+ @Test
+ @SmallTest
+ public void testCreateOutgoingEmergencyConnection_exitingSatellite_OEM() throws Exception {
+ doReturn(true).when(mFeatureFlags).carrierRoamingNbIotNtn();
+ doReturn(true).when(mSatelliteController).isSatelliteEnabled();
+
+ // Set config_turn_off_oem_enabled_satellite_during_emergency_call as false
+ doReturn(false).when(mMockResources).getBoolean(anyInt());
+ doReturn(true).when(mTelephonyManagerProxy).isCurrentEmergencyNumber(anyString());
+ doReturn(false).when(mSatelliteController).isDemoModeEnabled();
+
+ // Satellite is for emergency
+ doReturn(true).when(mSatelliteController).getRequestIsEmergency();
+ Phone phone = mock(Phone.class);
+ doReturn(1).when(phone).getSubId();
+ doReturn(phone).when(mSatelliteController).getSatellitePhone();
+ SubscriptionManagerService isub = mock(SubscriptionManagerService.class);
+ replaceInstance(SubscriptionManagerService.class, "sInstance", null, isub);
+ SubscriptionInfoInternal info = mock(SubscriptionInfoInternal.class);
+ doReturn(info).when(isub).getSubscriptionInfoInternal(1);
+
+ // Setup outgoing emergency call
+ setupConnectionServiceInApm();
+
+ // Verify DisconnectCause which not allows emergency call
+ assertNotNull(mConnection.getDisconnectCause());
+ assertEquals(android.telephony.DisconnectCause.SATELLITE_ENABLED,
+ mConnection.getDisconnectCause().getTelephonyDisconnectCause());
+
+ // OEM: config_turn_off_oem_enabled_satellite_during_emergency_call = true
+ doReturn(1).when(info).getOnlyNonTerrestrialNetwork();
+ doReturn(true).when(mMockResources).getBoolean(anyInt());
+ // Setup outgoing emergency call
+ setupConnectionServiceInApm();
+
+ // Verify emergency call go through
+ assertNull(mConnection.getDisconnectCause());
+ }
+
+ @Test
+ @SmallTest
+ public void testCreateOutgoingEmergencyConnection_exitingSatellite_Carrier() throws Exception {
+ doReturn(true).when(mFeatureFlags).carrierRoamingNbIotNtn();
+ doReturn(true).when(mSatelliteController).isSatelliteEnabled();
+
+ // Set config_turn_off_oem_enabled_satellite_during_emergency_call as false
+ doReturn(false).when(mMockResources).getBoolean(anyInt());
+ doReturn(true).when(mTelephonyManagerProxy).isCurrentEmergencyNumber(anyString());
+ doReturn(false).when(mSatelliteController).isDemoModeEnabled();
+
+ // Satellite is for emergency
+ doReturn(true).when(mSatelliteController).getRequestIsEmergency();
+ Phone phone = mock(Phone.class);
+ doReturn(1).when(phone).getSubId();
+ doReturn(phone).when(mSatelliteController).getSatellitePhone();
+ SubscriptionManagerService isub = mock(SubscriptionManagerService.class);
+ replaceInstance(SubscriptionManagerService.class, "sInstance", null, isub);
+ SubscriptionInfoInternal info = mock(SubscriptionInfoInternal.class);
+ doReturn(info).when(isub).getSubscriptionInfoInternal(1);
+
+ // Carrier: shouldTurnOffCarrierSatelliteForEmergencyCall = false
+ doReturn(0).when(info).getOnlyNonTerrestrialNetwork();
+ doReturn(false).when(mSatelliteController).shouldTurnOffCarrierSatelliteForEmergencyCall();
+ setupConnectionServiceInApm();
+
+ // Verify DisconnectCause which not allows emergency call
+ assertNotNull(mConnection.getDisconnectCause());
+ assertEquals(android.telephony.DisconnectCause.SATELLITE_ENABLED,
+ mConnection.getDisconnectCause().getTelephonyDisconnectCause());
+
+ // Carrier: shouldTurnOffCarrierSatelliteForEmergencyCall = true
+ doReturn(true).when(mSatelliteController).shouldTurnOffCarrierSatelliteForEmergencyCall();
+ setupConnectionServiceInApm();
+
+ // Verify emergency call go through
+ assertNull(mConnection.getDisconnectCause());
}
/**
@@ -1489,7 +1604,7 @@
PHONE_ACCOUNT_HANDLE_1, connectionRequest);
verify(mRadioOnHelper).triggerRadioOnAndListen(any(), eq(false),
- eq(testPhone0), eq(false), eq(0));
+ eq(testPhone0), eq(false), eq(0), eq(false));
}
/**
@@ -1523,7 +1638,7 @@
PHONE_ACCOUNT_HANDLE_1, connectionRequest);
verify(mRadioOnHelper).triggerRadioOnAndListen(any(), eq(false),
- eq(testPhone0), eq(false), eq(0));
+ eq(testPhone0), eq(false), eq(0), eq(false));
}
/**
@@ -1556,7 +1671,7 @@
PHONE_ACCOUNT_HANDLE_1, connectionRequest);
verify(mRadioOnHelper, times(0)).triggerRadioOnAndListen(any(),
- eq(true), eq(testPhone0), eq(false), eq(0));
+ eq(true), eq(testPhone0), eq(false), eq(0), eq(false));
}
/**
@@ -2044,7 +2159,7 @@
throws Exception {
setupForCallTest();
when(mTelephonyManagerProxy.isConcurrentCallsPossible()).thenReturn(true);
- doNothing().when(mContext).startActivity(any());
+ doNothing().when(mContext).startActivityAsUser(any(), any());
mBinderStub.createConnection(PHONE_ACCOUNT_HANDLE_1, "TC@1",
new ConnectionRequest(PHONE_ACCOUNT_HANDLE_1, Uri.parse("tel:16505551212"),
@@ -2077,7 +2192,7 @@
throws Exception {
setupForCallTest();
when(mTelephonyManagerProxy.isConcurrentCallsPossible()).thenReturn(true);
- doNothing().when(mContext).startActivity(any());
+ doNothing().when(mContext).startActivityAsUser(any(), any());
doReturn(true).when(mTelephonyManagerProxy).isCurrentEmergencyNumber(anyString());
mBinderStub.createConnection(PHONE_ACCOUNT_HANDLE_1, "TC@1",
@@ -2113,7 +2228,7 @@
throws Exception {
setupForCallTest();
when(mTelephonyManagerProxy.isConcurrentCallsPossible()).thenReturn(true);
- doNothing().when(mContext).startActivity(any());
+ doNothing().when(mContext).startActivityAsUser(any(), any());
doReturn(true).when(mTelephonyManagerProxy).isCurrentEmergencyNumber(anyString());
getTestContext().getCarrierConfig(0 /*subId*/).putBoolean(
@@ -2177,7 +2292,8 @@
.getDomainSelectionConnection(eq(mPhone0), eq(SELECTOR_TYPE_CALLING), eq(true));
verify(mEmergencyStateTracker)
.startEmergencyCall(eq(mPhone0), connectionCaptor.capture(), eq(false));
- verify(mSatelliteSOSMessageRecommender).onEmergencyCallStarted(any());
+ verify(mSatelliteSOSMessageRecommender, times(2)).onEmergencyCallStarted(any(),
+ anyBoolean());
verify(mEmergencyCallDomainSelectionConnection).createEmergencyConnection(any(), any());
android.telecom.Connection tc = connectionCaptor.getValue();
@@ -2216,7 +2332,8 @@
.getDomainSelectionConnection(eq(mPhone0), eq(SELECTOR_TYPE_CALLING), eq(true));
verify(mEmergencyStateTracker)
.startEmergencyCall(eq(mPhone0), connectionCaptor.capture(), eq(false));
- verify(mSatelliteSOSMessageRecommender).onEmergencyCallStarted(any());
+ verify(mSatelliteSOSMessageRecommender, times(2)).onEmergencyCallStarted(any(),
+ anyBoolean());
verify(mEmergencyCallDomainSelectionConnection).createEmergencyConnection(any(), any());
android.telecom.Connection tc = connectionCaptor.getValue();
@@ -2245,7 +2362,9 @@
replaceInstance(TelephonyConnectionService.class,
"mImsManager", mTestConnectionService, imsManager);
- setupForDialForDomainSelection(mPhone0, DOMAIN_PS, true);
+ int selectedDomain = DOMAIN_PS;
+
+ setupForDialForDomainSelection(mPhone0, selectedDomain, true);
mTestConnectionService.onCreateOutgoingConnection(PHONE_ACCOUNT_HANDLE_1,
createConnectionRequest(PHONE_ACCOUNT_HANDLE_1,
@@ -2254,13 +2373,13 @@
ArgumentCaptor<android.telecom.Connection> connectionCaptor =
ArgumentCaptor.forClass(android.telecom.Connection.class);
- verify(mEmergencyStateTracker, times(1))
- .startEmergencyCall(eq(mPhone0), connectionCaptor.capture(), eq(false));
- verify(mSatelliteSOSMessageRecommender).onEmergencyCallStarted(any());
- verify(mDomainSelectionResolver, times(0))
+ verify(mDomainSelectionResolver)
.getDomainSelectionConnection(eq(mPhone0), eq(SELECTOR_TYPE_CALLING), eq(true));
- verify(mEmergencyCallDomainSelectionConnection, times(0))
- .createEmergencyConnection(any(), any());
+ verify(mEmergencyStateTracker)
+ .startEmergencyCall(eq(mPhone0), connectionCaptor.capture(), eq(false));
+ verify(mSatelliteSOSMessageRecommender, times(2)).onEmergencyCallStarted(any(),
+ anyBoolean());
+ verify(mEmergencyCallDomainSelectionConnection).createEmergencyConnection(any(), any());
android.telecom.Connection tc = connectionCaptor.getValue();
@@ -2275,7 +2394,8 @@
assertNotNull("DialArgs param is null", dialArgs);
assertNotNull("intentExtras is null", dialArgs.intentExtras);
assertTrue(dialArgs.intentExtras.containsKey(PhoneConstants.EXTRA_DIAL_DOMAIN));
- assertEquals(DOMAIN_CS, dialArgs.intentExtras.getInt(PhoneConstants.EXTRA_DIAL_DOMAIN, -1));
+ assertEquals(selectedDomain,
+ dialArgs.intentExtras.getInt(PhoneConstants.EXTRA_DIAL_DOMAIN, -1));
}
@Test
@@ -2371,7 +2491,7 @@
setupForDialForDomainSelection(mPhone0, selectedDomain, true);
doReturn(mInternalConnection2).when(mCall).getLatestConnection();
- doReturn(true).when(mCall).isRinging();
+ doReturn(Call.State.INCOMING).when(mCall).getState();
doReturn(mCall).when(mPhone0).getRingingCall();
mTestConnectionService.onCreateOutgoingConnection(PHONE_ACCOUNT_HANDLE_1,
@@ -2406,7 +2526,8 @@
listener.onDisconnect(0);
- verify(mSatelliteSOSMessageRecommender).onEmergencyCallStarted(any());
+ verify(mSatelliteSOSMessageRecommender, times(2)).onEmergencyCallStarted(any(),
+ anyBoolean());
ArgumentCaptor<DialArgs> argsCaptor = ArgumentCaptor.forClass(DialArgs.class);
@@ -2433,7 +2554,7 @@
mPhone0, selectedDomain, preciseDisconnectCause, disconnectCause, true);
doReturn(mInternalConnection2).when(mCall).getLatestConnection();
- doReturn(true).when(mCall).isRinging();
+ doReturn(Call.State.DISCONNECTING).when(mCall).getState();
doReturn(mCall).when(mPhone0).getRingingCall();
assertTrue(mTestConnectionService.maybeReselectDomain(c, null, true,
@@ -2485,10 +2606,34 @@
createConnectionRequest(PHONE_ACCOUNT_HANDLE_1,
TEST_EMERGENCY_NUMBER, TELECOM_CALL_ID1));
+ ArgumentCaptor<TelephonyConnection> connectionCaptor =
+ ArgumentCaptor.forClass(TelephonyConnection.class);
+ ArgumentCaptor<Consumer<Boolean>> consumerCaptor = ArgumentCaptor
+ .forClass(Consumer.class);
+
+ verify(mEmergencyStateTracker).startNormalRoutingEmergencyCall(eq(mPhone0),
+ connectionCaptor.capture(), consumerCaptor.capture());
+
+ TelephonyConnection tc = connectionCaptor.getValue();
+
+ assertNotNull(tc);
+ assertNotNull(mTestConnectionService.getNormalRoutingEmergencyConnection());
+ assertEquals(mTestConnectionService.getNormalRoutingEmergencyConnection(), tc);
+
+ verify(mDomainSelectionResolver, never())
+ .getDomainSelectionConnection(eq(mPhone0), eq(SELECTOR_TYPE_CALLING), eq(false));
+ verify(mNormalCallDomainSelectionConnection, never()).createNormalConnection(any(), any());
+
+ Consumer<Boolean> consumer = consumerCaptor.getValue();
+
+ assertNotNull(consumer);
+
+ consumer.accept(true);
+
verify(mDomainSelectionResolver)
.getDomainSelectionConnection(eq(mPhone0), eq(SELECTOR_TYPE_CALLING), eq(false));
verify(mNormalCallDomainSelectionConnection).createNormalConnection(any(), any());
- verify(mSatelliteSOSMessageRecommender).onEmergencyCallStarted(any());
+ verify(mSatelliteSOSMessageRecommender).onEmergencyCallStarted(any(), anyBoolean());
ArgumentCaptor<DialArgs> argsCaptor = ArgumentCaptor.forClass(DialArgs.class);
@@ -2502,6 +2647,59 @@
}
@Test
+ public void testDomainSelectionNormalRoutingEmergencyNumberAndDiscarded() throws Exception {
+ setupForCallTest();
+ int selectedDomain = DOMAIN_PS;
+
+ EmergencyNumber emergencyNumber = new EmergencyNumber(TEST_EMERGENCY_NUMBER, "", "",
+ EmergencyNumber.EMERGENCY_SERVICE_CATEGORY_UNSPECIFIED,
+ Collections.emptyList(),
+ EmergencyNumber.EMERGENCY_NUMBER_SOURCE_DATABASE,
+ EmergencyNumber.EMERGENCY_CALL_ROUTING_NORMAL);
+
+ setupForDialForDomainSelection(mPhone0, selectedDomain, false);
+ doReturn(true).when(mTelephonyManagerProxy).isCurrentEmergencyNumber(anyString());
+ doReturn(emergencyNumber).when(mEmergencyNumberTracker).getEmergencyNumber(anyString());
+ doReturn(Arrays.asList(emergencyNumber)).when(mEmergencyNumberTracker).getEmergencyNumbers(
+ anyString());
+
+ mTestConnectionService.onCreateOutgoingConnection(PHONE_ACCOUNT_HANDLE_1,
+ createConnectionRequest(PHONE_ACCOUNT_HANDLE_1,
+ TEST_EMERGENCY_NUMBER, TELECOM_CALL_ID1));
+
+ ArgumentCaptor<TelephonyConnection> connectionCaptor =
+ ArgumentCaptor.forClass(TelephonyConnection.class);
+ ArgumentCaptor<Consumer<Boolean>> consumerCaptor = ArgumentCaptor
+ .forClass(Consumer.class);
+
+ verify(mEmergencyStateTracker).startNormalRoutingEmergencyCall(eq(mPhone0),
+ connectionCaptor.capture(), consumerCaptor.capture());
+
+ TelephonyConnection tc = connectionCaptor.getValue();
+
+ assertNotNull(tc);
+ assertNotNull(mTestConnectionService.getNormalRoutingEmergencyConnection());
+ assertEquals(mTestConnectionService.getNormalRoutingEmergencyConnection(), tc);
+
+ verify(mDomainSelectionResolver, never())
+ .getDomainSelectionConnection(eq(mPhone0), eq(SELECTOR_TYPE_CALLING), eq(false));
+ verify(mNormalCallDomainSelectionConnection, never()).createNormalConnection(any(), any());
+
+ Consumer<Boolean> consumer = consumerCaptor.getValue();
+
+ assertNotNull(consumer);
+
+ // Discard dialing
+ tc.hangup(android.telephony.DisconnectCause.LOCAL);
+
+ consumer.accept(true);
+
+ verify(mDomainSelectionResolver, never())
+ .getDomainSelectionConnection(eq(mPhone0), eq(SELECTOR_TYPE_CALLING), eq(false));
+ verify(mNormalCallDomainSelectionConnection, never()).createNormalConnection(any(), any());
+ }
+
+ @Test
public void testDomainSelectionDialedSimEmergencyNumberOnlyFalse() throws Exception {
setupForCallTest();
@@ -2532,7 +2730,8 @@
.getDomainSelectionConnection(eq(mPhone0), eq(SELECTOR_TYPE_CALLING), eq(true));
verify(mEmergencyStateTracker)
.startEmergencyCall(eq(mPhone0), connectionCaptor.capture(), eq(false));
- verify(mSatelliteSOSMessageRecommender).onEmergencyCallStarted(any());
+ verify(mSatelliteSOSMessageRecommender, times(2)).onEmergencyCallStarted(any(),
+ anyBoolean());
verify(mEmergencyCallDomainSelectionConnection).createEmergencyConnection(any(), any());
android.telecom.Connection tc = connectionCaptor.getValue();
@@ -2576,10 +2775,34 @@
createConnectionRequest(PHONE_ACCOUNT_HANDLE_1,
TEST_EMERGENCY_NUMBER, TELECOM_CALL_ID1));
+ ArgumentCaptor<TelephonyConnection> connectionCaptor =
+ ArgumentCaptor.forClass(TelephonyConnection.class);
+ ArgumentCaptor<Consumer<Boolean>> consumerCaptor = ArgumentCaptor
+ .forClass(Consumer.class);
+
+ verify(mEmergencyStateTracker).startNormalRoutingEmergencyCall(eq(mPhone0),
+ connectionCaptor.capture(), consumerCaptor.capture());
+
+ TelephonyConnection tc = connectionCaptor.getValue();
+
+ assertNotNull(tc);
+ assertNotNull(mTestConnectionService.getNormalRoutingEmergencyConnection());
+ assertEquals(mTestConnectionService.getNormalRoutingEmergencyConnection(), tc);
+
+ verify(mDomainSelectionResolver, never())
+ .getDomainSelectionConnection(eq(mPhone0), eq(SELECTOR_TYPE_CALLING), eq(false));
+ verify(mNormalCallDomainSelectionConnection, never()).createNormalConnection(any(), any());
+
+ Consumer<Boolean> consumer = consumerCaptor.getValue();
+
+ assertNotNull(consumer);
+
+ consumer.accept(true);
+
verify(mDomainSelectionResolver)
.getDomainSelectionConnection(eq(mPhone0), eq(SELECTOR_TYPE_CALLING), eq(false));
verify(mNormalCallDomainSelectionConnection).createNormalConnection(any(), any());
- verify(mSatelliteSOSMessageRecommender).onEmergencyCallStarted(any());
+ verify(mSatelliteSOSMessageRecommender).onEmergencyCallStarted(any(), anyBoolean());
ArgumentCaptor<DialArgs> argsCaptor = ArgumentCaptor.forClass(DialArgs.class);
@@ -2601,7 +2824,7 @@
ArgumentCaptor<RadioOnStateListener.Callback> callback =
ArgumentCaptor.forClass(RadioOnStateListener.Callback.class);
verify(mRadioOnHelper).triggerRadioOnAndListen(callback.capture(), eq(true),
- eq(testPhone), eq(false), eq(TIMEOUT_TO_DYNAMIC_ROUTING_MS));
+ eq(testPhone), eq(false), eq(TIMEOUT_TO_DYNAMIC_ROUTING_MS), eq(true));
ServiceState ss = new ServiceState();
ss.setState(ServiceState.STATE_OUT_OF_SERVICE);
@@ -2640,7 +2863,7 @@
ArgumentCaptor<RadioOnStateListener.Callback> callback =
ArgumentCaptor.forClass(RadioOnStateListener.Callback.class);
verify(mRadioOnHelper).triggerRadioOnAndListen(callback.capture(), eq(true),
- eq(testPhone), eq(false), eq(TIMEOUT_TO_DYNAMIC_ROUTING_MS));
+ eq(testPhone), eq(false), eq(TIMEOUT_TO_DYNAMIC_ROUTING_MS), eq(true));
ServiceState ss = new ServiceState();
ss.setState(ServiceState.STATE_OUT_OF_SERVICE);
@@ -2665,7 +2888,7 @@
ArgumentCaptor<RadioOnStateListener.Callback> callback =
ArgumentCaptor.forClass(RadioOnStateListener.Callback.class);
verify(mRadioOnHelper).triggerRadioOnAndListen(callback.capture(), eq(true),
- eq(testPhone), eq(false), eq(TIMEOUT_TO_DYNAMIC_ROUTING_MS));
+ eq(testPhone), eq(false), eq(TIMEOUT_TO_DYNAMIC_ROUTING_MS), eq(true));
ServiceState ss = new ServiceState();
ss.setState(ServiceState.STATE_IN_SERVICE);
@@ -2701,7 +2924,7 @@
ArgumentCaptor<RadioOnStateListener.Callback> callback =
ArgumentCaptor.forClass(RadioOnStateListener.Callback.class);
verify(mRadioOnHelper).triggerRadioOnAndListen(callback.capture(), eq(true),
- eq(testPhone), eq(false), eq(TIMEOUT_TO_DYNAMIC_ROUTING_MS));
+ eq(testPhone), eq(false), eq(TIMEOUT_TO_DYNAMIC_ROUTING_MS), eq(true));
ServiceState ss = new ServiceState();
ss.setState(ServiceState.STATE_IN_SERVICE);
@@ -2738,7 +2961,7 @@
ArgumentCaptor<RadioOnStateListener.Callback> callback =
ArgumentCaptor.forClass(RadioOnStateListener.Callback.class);
verify(mRadioOnHelper).triggerRadioOnAndListen(callback.capture(), eq(true),
- eq(testPhone), eq(false), eq(TIMEOUT_TO_DYNAMIC_ROUTING_MS));
+ eq(testPhone), eq(false), eq(TIMEOUT_TO_DYNAMIC_ROUTING_MS), eq(true));
ServiceState ss = new ServiceState();
ss.setState(ServiceState.STATE_IN_SERVICE);
@@ -2775,7 +2998,7 @@
ArgumentCaptor<RadioOnStateListener.Callback> callback =
ArgumentCaptor.forClass(RadioOnStateListener.Callback.class);
verify(mRadioOnHelper).triggerRadioOnAndListen(callback.capture(), eq(true),
- eq(testPhone), eq(false), eq(TIMEOUT_TO_DYNAMIC_ROUTING_MS));
+ eq(testPhone), eq(false), eq(TIMEOUT_TO_DYNAMIC_ROUTING_MS), eq(true));
mConnection.setDisconnected(null);
@@ -2812,7 +3035,7 @@
.getDomainSelectionConnection(eq(mPhone0), eq(SELECTOR_TYPE_CALLING), eq(true));
verify(mEmergencyStateTracker)
.startEmergencyCall(eq(mPhone0), connectionCaptor.capture(), eq(false));
- verify(mSatelliteSOSMessageRecommender).onEmergencyCallStarted(any());
+ verify(mSatelliteSOSMessageRecommender).onEmergencyCallStarted(any(), anyBoolean());
verify(mEmergencyCallDomainSelectionConnection).createEmergencyConnection(any(), any());
android.telecom.Connection tc = connectionCaptor.getValue();
@@ -2832,6 +3055,8 @@
dialArgs.intentExtras.getInt(PhoneConstants.EXTRA_DIAL_DOMAIN, -1));
assertTrue(dialArgs.isEmergency);
assertEquals(eccCategory, dialArgs.eccCategory);
+ assertTrue(dialArgs.intentExtras.getBoolean(
+ PhoneConstants.EXTRA_USE_EMERGENCY_ROUTING, false));
}
@Test
@@ -2863,7 +3088,7 @@
.getDomainSelectionConnection(eq(mPhone0), eq(SELECTOR_TYPE_CALLING), eq(true));
verify(mEmergencyStateTracker)
.startEmergencyCall(eq(mPhone0), connectionCaptor.capture(), eq(false));
- verify(mSatelliteSOSMessageRecommender).onEmergencyCallStarted(any());
+ verify(mSatelliteSOSMessageRecommender).onEmergencyCallStarted(any(), anyBoolean());
verify(mEmergencyCallDomainSelectionConnection).createEmergencyConnection(any(), any());
android.telecom.Connection tc = connectionCaptor.getValue();
@@ -2883,6 +3108,43 @@
dialArgs.intentExtras.getInt(PhoneConstants.EXTRA_DIAL_DOMAIN, -1));
assertTrue(dialArgs.isEmergency);
assertEquals(eccCategory, dialArgs.eccCategory);
+ assertTrue(dialArgs.intentExtras.getBoolean(
+ PhoneConstants.EXTRA_USE_EMERGENCY_ROUTING, false));
+ }
+
+ @Test
+ public void testDomainSelectionSwitchPhones() throws Exception {
+ setupForCallTest();
+
+ doReturn(CompletableFuture.completedFuture(EMERGENCY_PERM_FAILURE))
+ .when(mEmergencyStateTracker)
+ .startEmergencyCall(eq(mPhone0), any(), eq(false));
+ doReturn(CompletableFuture.completedFuture(NOT_DISCONNECTED))
+ .when(mEmergencyStateTracker)
+ .startEmergencyCall(eq(mPhone1), any(), eq(false));
+
+ doReturn(mEmergencyCallDomainSelectionConnection).when(mDomainSelectionResolver)
+ .getDomainSelectionConnection(any(), anyInt(), eq(true));
+ doReturn(true).when(mTelephonyManagerProxy).isCurrentEmergencyNumber(anyString());
+
+ doReturn(true).when(mDomainSelectionResolver).isDomainSelectionSupported();
+
+ mTestConnectionService.onCreateOutgoingConnection(PHONE_ACCOUNT_HANDLE_1,
+ createConnectionRequest(PHONE_ACCOUNT_HANDLE_1,
+ TEST_EMERGENCY_NUMBER, TELECOM_CALL_ID1));
+
+ ArgumentCaptor<DomainSelectionService.SelectionAttributes> attrCaptor =
+ ArgumentCaptor.forClass(
+ DomainSelectionService.SelectionAttributes.class);
+
+ verify(mEmergencyStateTracker).startEmergencyCall(eq(mPhone0), any(), anyBoolean());
+ verify(mEmergencyStateTracker).startEmergencyCall(eq(mPhone1), any(), anyBoolean());
+ verify(mEmergencyCallDomainSelectionConnection).createEmergencyConnection(
+ attrCaptor.capture(), any());
+
+ DomainSelectionService.SelectionAttributes attr = attrCaptor.getValue();
+
+ assertEquals(mPhone1.getPhoneId(), attr.getSlotIndex());
}
@Test
@@ -3161,7 +3423,7 @@
verify(mEmergencyStateTracker)
.startEmergencyCall(eq(mPhone0), connectionCaptor.capture(), eq(false));
- verify(mSatelliteSOSMessageRecommender).onEmergencyCallStarted(any());
+ verify(mSatelliteSOSMessageRecommender).onEmergencyCallStarted(any(), anyBoolean());
android.telecom.Connection tc = connectionCaptor.getValue();
@@ -3237,7 +3499,8 @@
.getDomainSelectionConnection(eq(mPhone0), eq(SELECTOR_TYPE_CALLING), eq(true));
verify(mEmergencyStateTracker)
.startEmergencyCall(eq(mPhone0), connectionCaptor.capture(), eq(false));
- verify(mSatelliteSOSMessageRecommender).onEmergencyCallStarted(any());
+ verify(mSatelliteSOSMessageRecommender, times(2)).onEmergencyCallStarted(any(),
+ anyBoolean());
verify(mEmergencyCallDomainSelectionConnection).createEmergencyConnection(any(), any());
verify(mPhone0).dial(anyString(), any(), any());
@@ -3266,7 +3529,7 @@
verify(mEmergencyStateTracker, times(0)).onEmergencyCallStateChanged(
any(), eq(c));
- verify(mSatelliteSOSMessageRecommender, times(0))
+ verify(mSatelliteSOSMessageRecommender, times(2))
.onEmergencyCallConnectionStateChanged(eq(TELECOM_CALL_ID1), anyInt());
c.setActive();
@@ -3290,7 +3553,7 @@
// state change not notified any more after CONNECTED once
verify(mEmergencyStateTracker, times(1)).onEmergencyCallStateChanged(
any(), eq(c));
- verify(mSatelliteSOSMessageRecommender, times(1))
+ verify(mSatelliteSOSMessageRecommender, times(3))
.onEmergencyCallConnectionStateChanged(eq(TELECOM_CALL_ID1), anyInt());
// state change to ACTIVE again
@@ -3302,7 +3565,7 @@
// state change not notified any more after CONNECTED once
verify(mEmergencyStateTracker, times(1)).onEmergencyCallStateChanged(
any(), eq(c));
- verify(mSatelliteSOSMessageRecommender, times(1))
+ verify(mSatelliteSOSMessageRecommender, times(3))
.onEmergencyCallConnectionStateChanged(eq(TELECOM_CALL_ID1), anyInt());
// SRVCC happens
@@ -3324,7 +3587,7 @@
// state change not notified
verify(mEmergencyStateTracker, times(1)).onEmergencyCallStateChanged(
any(), eq(c));
- verify(mSatelliteSOSMessageRecommender, times(1))
+ verify(mSatelliteSOSMessageRecommender, times(3))
.onEmergencyCallConnectionStateChanged(eq(TELECOM_CALL_ID1), anyInt());
}
@@ -3426,7 +3689,7 @@
@Test
public void testDomainSelectionWithMmiCode() {
//UT domain selection should not be handled by new domain selector.
- doNothing().when(mContext).startActivity(any());
+ doNothing().when(mContext).startActivityAsUser(any(), any());
setupForCallTest();
setupForDialForDomainSelection(mPhone0, 0, false);
mTestConnectionService.onCreateOutgoingConnection(PHONE_ACCOUNT_HANDLE_1,
@@ -3447,7 +3710,8 @@
verify(mDomainSelectionResolver)
.getDomainSelectionConnection(eq(mPhone0), eq(SELECTOR_TYPE_CALLING), eq(false));
verify(mNormalCallDomainSelectionConnection).createNormalConnection(any(), any());
- verify(mSatelliteSOSMessageRecommender, never()).onEmergencyCallStarted(any());
+ verify(mSatelliteSOSMessageRecommender, never()).onEmergencyCallStarted(any(),
+ anyBoolean());
ArgumentCaptor<DialArgs> argsCaptor = ArgumentCaptor.forClass(DialArgs.class);
@@ -3472,7 +3736,8 @@
verify(mDomainSelectionResolver)
.getDomainSelectionConnection(eq(mPhone0), eq(SELECTOR_TYPE_CALLING), eq(false));
verify(mNormalCallDomainSelectionConnection).createNormalConnection(any(), any());
- verify(mSatelliteSOSMessageRecommender, never()).onEmergencyCallStarted(any());
+ verify(mSatelliteSOSMessageRecommender, never()).onEmergencyCallStarted(any(),
+ anyBoolean());
ArgumentCaptor<DialArgs> argsCaptor = ArgumentCaptor.forClass(DialArgs.class);
@@ -3499,6 +3764,24 @@
}
@Test
+ public void testEmergencyCallSatelliteEnabled_blockEmergencyCall() {
+ setupForCallTest();
+ doReturn(true).when(mSatelliteController).isSatelliteEnabled();
+ doReturn(false).when(mMockResources).getBoolean(anyInt());
+ doReturn(true).when(mTelephonyManagerProxy).isCurrentEmergencyNumber(
+ anyString());
+
+ // Simulates an outgoing emergency call.
+ mConnection = mTestConnectionService.onCreateOutgoingConnection(PHONE_ACCOUNT_HANDLE_1,
+ createConnectionRequest(PHONE_ACCOUNT_HANDLE_1,
+ TEST_EMERGENCY_NUMBER, TELECOM_CALL_ID1));
+ DisconnectCause disconnectCause = mConnection.getDisconnectCause();
+ assertEquals(android.telephony.DisconnectCause.SATELLITE_ENABLED,
+ disconnectCause.getTelephonyDisconnectCause());
+ assertEquals(DISCONNECT_REASON_SATELLITE_ENABLED, disconnectCause.getReason());
+ }
+
+ @Test
public void testNormalCallUsingNonTerrestrialNetwork_enableFlag() throws Exception {
mSetFlagsRule.enableFlags(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG);
@@ -3614,6 +3897,7 @@
ss.setEmergencyOnly(true);
ss.setState(ServiceState.STATE_EMERGENCY_ONLY);
when(mockPhone.getServiceState()).thenReturn(ss);
+ when(mPhoneFactoryProxy.getPhones()).thenReturn(new Phone[] {mockPhone});
assertFalse(mTestConnectionService.isAvailableForEmergencyCalls(mockPhone,
EmergencyNumber.EMERGENCY_CALL_ROUTING_EMERGENCY));
@@ -3637,6 +3921,79 @@
ss.setState(ServiceState.STATE_EMERGENCY_ONLY);
when(mockPhone.getServiceState()).thenReturn(ss);
+ when(mPhoneFactoryProxy.getPhones()).thenReturn(new Phone[] {mockPhone});
+
+ assertTrue(mTestConnectionService.isAvailableForEmergencyCalls(mockPhone,
+ EmergencyNumber.EMERGENCY_CALL_ROUTING_EMERGENCY));
+ assertFalse(mTestConnectionService.isAvailableForEmergencyCalls(mockPhone,
+ EmergencyNumber.EMERGENCY_CALL_ROUTING_NORMAL));
+ assertTrue(mTestConnectionService.isAvailableForEmergencyCalls(mockPhone,
+ EmergencyNumber.EMERGENCY_CALL_ROUTING_UNKNOWN));
+ }
+
+ @Test
+ public void testIsAvailableForEmergencyCallsUsingNTN_CellularAvailable() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG);
+
+ // Call is not supported while using satellite
+ when(mSatelliteController.isInSatelliteModeForCarrierRoaming(any())).thenReturn(true);
+ when(mSatelliteController.getCapabilitiesForCarrierRoamingSatelliteMode(any()))
+ .thenReturn(List.of(NetworkRegistrationInfo.SERVICE_TYPE_DATA));
+
+ Phone mockPhone = Mockito.mock(Phone.class);
+ ServiceState ss = new ServiceState();
+ ss.setEmergencyOnly(true);
+ ss.setState(ServiceState.STATE_EMERGENCY_ONLY);
+ when(mockPhone.getServiceState()).thenReturn(ss);
+
+ // Phone2 is in limited service
+ Phone mockPhone2 = Mockito.mock(Phone.class);
+ ServiceState ss2 = new ServiceState();
+ ss2.setEmergencyOnly(true);
+ ss2.setState(ServiceState.STATE_EMERGENCY_ONLY);
+ when(mockPhone2.getServiceState()).thenReturn(ss2);
+
+ Phone[] phones = {mockPhone, mockPhone2};
+ when(mPhoneFactoryProxy.getPhones()).thenReturn(phones);
+
+ assertFalse(mTestConnectionService.isAvailableForEmergencyCalls(mockPhone,
+ EmergencyNumber.EMERGENCY_CALL_ROUTING_EMERGENCY));
+ assertFalse(mTestConnectionService.isAvailableForEmergencyCalls(mockPhone,
+ EmergencyNumber.EMERGENCY_CALL_ROUTING_NORMAL));
+ assertFalse(mTestConnectionService.isAvailableForEmergencyCalls(mockPhone,
+ EmergencyNumber.EMERGENCY_CALL_ROUTING_UNKNOWN));
+ }
+
+ @Test
+ public void testIsAvailableForEmergencyCallsUsingNTN_CellularNotAvailable() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG);
+
+ // Call is not supported while using satellite
+ when(mSatelliteController.isInSatelliteModeForCarrierRoaming(any())).thenReturn(true);
+ when(mSatelliteController.getCapabilitiesForCarrierRoamingSatelliteMode(any()))
+ .thenReturn(List.of(NetworkRegistrationInfo.SERVICE_TYPE_DATA));
+
+ NetworkRegistrationInfo nri = new NetworkRegistrationInfo.Builder()
+ .setIsNonTerrestrialNetwork(true)
+ .setAvailableServices(List.of(NetworkRegistrationInfo.SERVICE_TYPE_DATA))
+ .build();
+ Phone mockPhone = Mockito.mock(Phone.class);
+ ServiceState ss = new ServiceState();
+ ss.addNetworkRegistrationInfo(nri);
+ ss.setEmergencyOnly(true);
+ ss.setState(ServiceState.STATE_EMERGENCY_ONLY);
+ when(mockPhone.getServiceState()).thenReturn(ss);
+
+ // Phone2 is out of service
+ Phone mockPhone2 = Mockito.mock(Phone.class);
+ ServiceState ss2 = new ServiceState();
+ ss2.setEmergencyOnly(false);
+ ss2.setState(ServiceState.STATE_OUT_OF_SERVICE);
+ when(mockPhone2.getServiceState()).thenReturn(ss2);
+
+ Phone[] phones = {mockPhone, mockPhone2};
+ when(mPhoneFactoryProxy.getPhones()).thenReturn(phones);
+
assertTrue(mTestConnectionService.isAvailableForEmergencyCalls(mockPhone,
EmergencyNumber.EMERGENCY_CALL_ROUTING_EMERGENCY));
assertFalse(mTestConnectionService.isAvailableForEmergencyCalls(mockPhone,
diff --git a/tests/src/com/android/services/telephony/domainselection/DynamicRoutingControllerTest.java b/tests/src/com/android/services/telephony/domainselection/DynamicRoutingControllerTest.java
new file mode 100644
index 0000000..f15ae4a
--- /dev/null
+++ b/tests/src/com/android/services/telephony/domainselection/DynamicRoutingControllerTest.java
@@ -0,0 +1,227 @@
+/*
+ * Copyright (C) 2024 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.services.telephony.domainselection;
+
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertNull;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.when;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Resources;
+import android.os.Looper;
+import android.telephony.TelephonyManager;
+import android.telephony.emergency.EmergencyNumber;
+import android.text.TextUtils;
+
+import com.android.TestContext;
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneConstants;
+import com.android.internal.telephony.emergency.EmergencyNumberTracker;
+import com.android.phone.R;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.ArrayList;
+
+/**
+ * Unit tests for DynamicRoutingController
+ */
+public class DynamicRoutingControllerTest {
+ private static final String TAG = "DynamicRoutingControllerTest";
+
+ private static final int SLOT_0 = 0;
+ private static final int SLOT_1 = 1;
+
+ @Mock private Resources mResources;
+ @Mock private DynamicRoutingController.PhoneFactoryProxy mPhoneFactoryProxy;
+ @Mock private Phone mPhone0;
+ @Mock private Phone mPhone1;
+ @Mock private EmergencyNumberTracker mEmergencyNumberTracker;
+
+ private BroadcastReceiver mReceiver;
+ private IntentFilter mIntentFilter;
+
+ private Context mContext;
+ private DynamicRoutingController mDrc;
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+ mContext = new TestContext() {
+ @Override
+ public String getOpPackageName() {
+ return "";
+ }
+
+ @Override
+ public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter) {
+ mReceiver = receiver;
+ mIntentFilter = filter;
+ return null;
+ }
+
+ @Override
+ public Resources getResources() {
+ return mResources;
+ }
+ };
+
+ if (Looper.myLooper() == null) {
+ Looper.prepare();
+ }
+
+ when(mResources.getStringArray(anyInt())).thenReturn(null);
+ when(mPhoneFactoryProxy.getPhone(eq(SLOT_0))).thenReturn(mPhone0);
+ when(mPhoneFactoryProxy.getPhone(eq(SLOT_1))).thenReturn(mPhone1);
+ when(mPhone0.getPhoneId()).thenReturn(SLOT_0);
+ when(mPhone1.getPhoneId()).thenReturn(SLOT_1);
+ when(mPhone0.getEmergencyNumberTracker()).thenReturn(mEmergencyNumberTracker);
+ when(mPhone1.getEmergencyNumberTracker()).thenReturn(mEmergencyNumberTracker);
+ when(mEmergencyNumberTracker.getEmergencyNumbers(anyString()))
+ .thenReturn(new ArrayList<EmergencyNumber>());
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ mDrc = null;
+ }
+
+ @Test
+ public void testNotEnabledInitialize() throws Exception {
+ createController(false, null);
+
+ assertFalse(mDrc.isDynamicRoutingEnabled());
+
+ assertNull(mReceiver);
+ assertNull(mIntentFilter);
+ }
+
+ @Test
+ public void testEnabledInitialize() throws Exception {
+ createController(true, null);
+
+ assertTrue(mDrc.isDynamicRoutingEnabled());
+ assertFalse(mDrc.isDynamicRoutingEnabled(mPhone0));
+ assertFalse(mDrc.isDynamicRoutingEnabled(mPhone1));
+ }
+
+ @Test
+ public void testEnabledCountryChanged() throws Exception {
+ createController(true, "us");
+
+ sendNetworkCountryChanged(SLOT_0, "zz");
+ assertTrue(mDrc.isDynamicRoutingEnabled());
+ assertFalse(mDrc.isDynamicRoutingEnabled(mPhone0));
+ assertFalse(mDrc.isDynamicRoutingEnabled(mPhone1));
+
+ sendNetworkCountryChanged(SLOT_0, "us");
+ assertTrue(mDrc.isDynamicRoutingEnabled(mPhone0));
+ assertTrue(mDrc.isDynamicRoutingEnabled(mPhone1));
+ }
+
+ @Test
+ public void testDynamicRouting() throws Exception {
+ doReturn(new String[] {"us,,110,117,118,119", "zz,,200"})
+ .when(mResources).getStringArray(
+ eq(R.array.config_dynamic_routing_emergency_numbers));
+
+ createController(true, "us");
+
+ sendNetworkCountryChanged(SLOT_0, "us");
+
+ ArrayList<EmergencyNumber> nums = new ArrayList<EmergencyNumber>();
+ nums.add(getEmergencyNumber("us", "110", "92"));
+ when(mEmergencyNumberTracker.getEmergencyNumbers(eq("110"))).thenReturn(nums);
+
+ // Not included in the resource configuration.
+ nums = new ArrayList<EmergencyNumber>();
+ nums.add(getEmergencyNumber("us", "111", "92"));
+ when(mEmergencyNumberTracker.getEmergencyNumbers(eq("111"))).thenReturn(nums);
+
+ // Different country.
+ nums = new ArrayList<EmergencyNumber>();
+ nums.add(getEmergencyNumber("zz", "117", "92"));
+ when(mEmergencyNumberTracker.getEmergencyNumbers(eq("117"))).thenReturn(nums);
+
+ // No info in the EmergencyNumberTracker
+ nums = new ArrayList<EmergencyNumber>();
+ when(mEmergencyNumberTracker.getEmergencyNumbers(eq("118"))).thenReturn(nums);
+
+ nums = new ArrayList<EmergencyNumber>();
+ nums.add(getEmergencyNumber("us", "119", "92"));
+ when(mEmergencyNumberTracker.getEmergencyNumbers(eq("119"))).thenReturn(nums);
+
+ // Different country.
+ nums = new ArrayList<EmergencyNumber>();
+ nums.add(getEmergencyNumber("us", "200", "92"));
+ when(mEmergencyNumberTracker.getEmergencyNumbers(eq("200"))).thenReturn(nums);
+
+ assertTrue(mDrc.isDynamicNumber(mPhone0, "110"));
+ assertFalse(mDrc.isDynamicNumber(mPhone0, "111"));
+ assertFalse(mDrc.isDynamicNumber(mPhone0, "117"));
+ assertFalse(mDrc.isDynamicNumber(mPhone0, "118"));
+ assertTrue(mDrc.isDynamicNumber(mPhone0, "119"));
+ assertFalse(mDrc.isDynamicNumber(mPhone0, "200"));
+ }
+
+ private EmergencyNumber getEmergencyNumber(String iso, String number, String mnc) {
+ return new EmergencyNumber(number, iso, mnc,
+ EmergencyNumber.EMERGENCY_SERVICE_CATEGORY_UNSPECIFIED,
+ new ArrayList<String>(),
+ EmergencyNumber.EMERGENCY_NUMBER_SOURCE_MODEM_CONFIG,
+ EmergencyNumber.EMERGENCY_CALL_ROUTING_UNKNOWN);
+ }
+
+ private void sendNetworkCountryChanged(int phoneId, String iso) {
+ Intent intent = new Intent(TelephonyManager.ACTION_NETWORK_COUNTRY_CHANGED);
+ intent.putExtra(PhoneConstants.PHONE_KEY, phoneId);
+ intent.putExtra(TelephonyManager.EXTRA_NETWORK_COUNTRY, iso);
+ mReceiver.onReceive(mContext, intent);
+ }
+
+ private void createController(boolean enabled, String iso) throws Exception {
+ doReturn(enabled).when(mResources).getBoolean(
+ eq(R.bool.dynamic_routing_emergency_enabled));
+ if (!TextUtils.isEmpty(iso)) {
+ doReturn(new String[] {iso}).when(mResources).getStringArray(
+ eq(R.array.config_countries_dynamic_routing_emergency_enabled));
+ }
+
+ mDrc = new DynamicRoutingController(mPhoneFactoryProxy);
+ mDrc.initialize(mContext);
+
+ if (enabled) {
+ assertNotNull(mReceiver);
+ assertNotNull(mIntentFilter);
+ assertTrue(mIntentFilter.hasAction(TelephonyManager.ACTION_NETWORK_COUNTRY_CHANGED));
+ }
+ }
+}
diff --git a/tests/src/com/android/services/telephony/domainselection/EmergencyCallDomainSelectorTest.java b/tests/src/com/android/services/telephony/domainselection/EmergencyCallDomainSelectorTest.java
index a1d4162..8a83ab0 100644
--- a/tests/src/com/android/services/telephony/domainselection/EmergencyCallDomainSelectorTest.java
+++ b/tests/src/com/android/services/telephony/domainselection/EmergencyCallDomainSelectorTest.java
@@ -25,6 +25,7 @@
import static android.telephony.AccessNetworkConstants.AccessNetworkType.UTRAN;
import static android.telephony.BarringInfo.BARRING_SERVICE_TYPE_EMERGENCY;
import static android.telephony.BarringInfo.BarringServiceInfo.BARRING_TYPE_UNCONDITIONAL;
+import static android.telephony.CarrierConfigManager.KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL;
import static android.telephony.CarrierConfigManager.ImsEmergency.KEY_EMERGENCY_CALL_SETUP_TIMER_ON_CURRENT_NETWORK_SEC_INT;
import static android.telephony.CarrierConfigManager.ImsEmergency.KEY_EMERGENCY_CDMA_PREFERRED_NUMBERS_STRING_ARRAY;
import static android.telephony.CarrierConfigManager.ImsEmergency.KEY_EMERGENCY_DOMAIN_PREFERENCE_INT_ARRAY;
@@ -66,6 +67,7 @@
import static com.android.services.telephony.domainselection.EmergencyCallDomainSelector.MSG_MAX_CELLULAR_TIMEOUT;
import static com.android.services.telephony.domainselection.EmergencyCallDomainSelector.MSG_NETWORK_SCAN_TIMEOUT;
import static com.android.services.telephony.domainselection.EmergencyCallDomainSelector.MSG_WAIT_DISCONNECTION_TIMEOUT;
+import static com.android.services.telephony.domainselection.EmergencyCallDomainSelector.MSG_WAIT_FOR_IMS_STATE_TIMEOUT;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertFalse;
@@ -90,6 +92,7 @@
import android.content.Context;
import android.content.res.Resources;
import android.net.ConnectivityManager;
+import android.net.Network;
import android.net.NetworkRequest;
import android.net.Uri;
import android.os.CancellationSignal;
@@ -100,7 +103,9 @@
import android.os.Looper;
import android.os.PersistableBundle;
import android.os.PowerManager;
+import android.platform.test.flag.junit.SetFlagsRule;
import android.telecom.PhoneAccount;
+import android.telecom.TelecomManager;
import android.telephony.AccessNetworkConstants;
import android.telephony.BarringInfo;
import android.telephony.CarrierConfigManager;
@@ -126,9 +131,12 @@
import androidx.test.filters.SmallTest;
import com.android.TestContext;
+import com.android.internal.telephony.flags.Flags;
+import com.android.phone.R;
import org.junit.After;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
@@ -142,10 +150,9 @@
/**
* Unit tests for EmergencyCallDomainSelector
- */
+*/
public class EmergencyCallDomainSelectorTest {
private static final String TAG = "EmergencyCallDomainSelectorTest";
-
private static final int SLOT_0 = 0;
private static final int SLOT_0_SUB_ID = 1;
private static final Uri TEST_URI = Uri.fromParts(PhoneAccount.SCHEME_TEL, "911", null);
@@ -162,6 +169,9 @@
@Mock private CrossSimRedialingController mCsrdCtrl;
@Mock private DataConnectionStateHelper mEpdnHelper;
@Mock private Resources mResources;
+ @Mock private ImsEmergencyRegistrationStateHelper mImsEmergencyRegistrationHelper;
+
+ private TelecomManager mTelecomManager;
private Context mContext;
@@ -174,6 +184,8 @@
private ConnectivityManager.NetworkCallback mNetworkCallback;
private Consumer<EmergencyRegistrationResult> mResultConsumer;
+ @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
@@ -182,6 +194,8 @@
public String getSystemServiceName(Class<?> serviceClass) {
if (serviceClass == ImsManager.class) {
return Context.TELEPHONY_IMS_SERVICE;
+ } else if (serviceClass == TelecomManager.class) {
+ return Context.TELECOM_SERVICE;
} else if (serviceClass == TelephonyManager.class) {
return Context.TELEPHONY_SERVICE;
} else if (serviceClass == CarrierConfigManager.class) {
@@ -238,6 +252,9 @@
when(mTelephonyManager.getSimState(anyInt())).thenReturn(TelephonyManager.SIM_STATE_READY);
when(mTelephonyManager.getActiveModemCount()).thenReturn(1);
+ mTelecomManager = mContext.getSystemService(TelecomManager.class);
+ when(mTelecomManager.getCurrentTtyMode()).thenReturn(TelecomManager.TTY_MODE_OFF);
+
mCarrierConfigManager = mContext.getSystemService(CarrierConfigManager.class);
when(mCarrierConfigManager.getConfigForSubId(anyInt(), anyVararg()))
.thenReturn(getDefaultPersistableBundle());
@@ -387,11 +404,14 @@
mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
processAllMessages();
+ assertTrue(mDomainSelector.hasMessages(MSG_WAIT_FOR_IMS_STATE_TIMEOUT));
+
bindImsService();
unsolBarringInfoChanged(false);
processAllMessages();
+ assertFalse(mDomainSelector.hasMessages(MSG_WAIT_FOR_IMS_STATE_TIMEOUT));
verify(mTransportSelectorCallback, times(1)).onWwanSelected(any());
verify(mWwanSelectorCallback, times(1)).onDomainSelected(anyInt(), anyBoolean());
}
@@ -456,7 +476,8 @@
doReturn(TelephonyManager.SIM_STATE_PIN_REQUIRED)
.when(mTelephonyManager).getSimState(anyInt());
doReturn(true).when(mCsrdCtrl).isThereOtherSlot();
- doReturn(new String[] {"jp"}).when(mResources).getStringArray(anyInt());
+ doReturn(new String[] {"jp"}).when(mResources).getStringArray(
+ eq(R.array.config_countries_require_sim_for_emergency));
EmergencyRegistrationResult regResult = getEmergencyRegResult(
UNKNOWN, REGISTRATION_STATE_UNKNOWN, 0, false, false, 0, 0, "", "", "jp");
@@ -571,7 +592,8 @@
@Test
public void testDefaultCombinedImsRegisteredSelectPsThenExtendedServiceRequestFailIsoMatch()
throws Exception {
- doReturn(new String[] {"us"}).when(mResources).getStringArray(anyInt());
+ doReturn(new String[] {"us"}).when(mResources).getStringArray(
+ eq(R.array.config_countries_prefer_cs_preferred_scan_after_csfb_failure));
createSelector(SLOT_0_SUB_ID);
unsolBarringInfoChanged(false);
@@ -610,7 +632,8 @@
@Test
public void testDefaultCombinedImsRegisteredSelectPsThenExtendedServiceRequestFailIsoNotMatch()
throws Exception {
- doReturn(new String[] {"us"}).when(mResources).getStringArray(anyInt());
+ doReturn(new String[] {"us"}).when(mResources).getStringArray(
+ eq(R.array.config_countries_prefer_cs_preferred_scan_after_csfb_failure));
createSelector(SLOT_0_SUB_ID);
unsolBarringInfoChanged(false);
@@ -1773,7 +1796,8 @@
doReturn(TelephonyManager.SIM_STATE_PIN_REQUIRED)
.when(mTelephonyManager).getSimState(anyInt());
doReturn(true).when(mCsrdCtrl).isThereOtherSlot();
- doReturn(new String[] {"jp"}).when(mResources).getStringArray(anyInt());
+ doReturn(new String[] {"jp"}).when(mResources).getStringArray(
+ eq(R.array.config_countries_require_sim_for_emergency));
EmergencyRegistrationResult regResult = getEmergencyRegResult(EUTRAN,
REGISTRATION_STATE_UNKNOWN,
@@ -1797,7 +1821,8 @@
doReturn(TelephonyManager.SIM_STATE_PIN_REQUIRED)
.when(mTelephonyManager).getSimState(anyInt());
doReturn(true).when(mCsrdCtrl).isThereOtherSlot();
- doReturn(new String[] {"jp"}).when(mResources).getStringArray(anyInt());
+ doReturn(new String[] {"jp"}).when(mResources).getStringArray(
+ eq(R.array.config_countries_require_sim_for_emergency));
EmergencyRegistrationResult regResult = getEmergencyRegResult(UNKNOWN,
REGISTRATION_STATE_UNKNOWN,
@@ -1828,7 +1853,8 @@
doReturn(TelephonyManager.SIM_STATE_PIN_REQUIRED)
.when(mTelephonyManager).getSimState(anyInt());
doReturn(false).when(mCsrdCtrl).isThereOtherSlot();
- doReturn(new String[] {"jp"}).when(mResources).getStringArray(anyInt());
+ doReturn(new String[] {"jp"}).when(mResources).getStringArray(
+ eq(R.array.config_countries_require_sim_for_emergency));
EmergencyRegistrationResult regResult = getEmergencyRegResult(EUTRAN,
REGISTRATION_STATE_UNKNOWN,
@@ -1840,9 +1866,8 @@
bindImsServiceUnregistered();
processAllMessages();
- verify(mTransportSelectorCallback, times(0))
- .onSelectionTerminated(eq(DisconnectCause.EMERGENCY_PERM_FAILURE));
- verifyScanPsPreferred();
+ verify(mTransportSelectorCallback, times(1))
+ .onSelectionTerminated(eq(DisconnectCause.ICC_ERROR));
}
@Test
@@ -1851,7 +1876,8 @@
unsolBarringInfoChanged(false);
doReturn(2).when(mTelephonyManager).getActiveModemCount();
doReturn(true).when(mCsrdCtrl).isThereOtherSlotInService();
- doReturn(new String[] {"in"}).when(mResources).getStringArray(anyInt());
+ doReturn(new String[] {"in"}).when(mResources).getStringArray(
+ eq(R.array.config_countries_prefer_normal_service_capable_subscription));
EmergencyRegistrationResult regResult = getEmergencyRegResult(EUTRAN,
REGISTRATION_STATE_UNKNOWN,
@@ -1868,6 +1894,40 @@
}
@Test
+ public void testDualSimNormalServiceOnTheOtherSubscriptionAfterScan() throws Exception {
+ mResultConsumer = null;
+ createSelector(SLOT_0_SUB_ID);
+ unsolBarringInfoChanged(false);
+
+ doReturn(2).when(mTelephonyManager).getActiveModemCount();
+ doReturn(true).when(mCsrdCtrl).isThereOtherSlotInService();
+ doReturn(new String[] {"in"}).when(mResources).getStringArray(
+ eq(R.array.config_countries_prefer_normal_service_capable_subscription));
+
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(UNKNOWN,
+ REGISTRATION_STATE_UNKNOWN,
+ 0, false, false, 0, 0, "", "");
+ SelectionAttributes attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, regResult);
+ mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
+ processAllMessages();
+
+ bindImsServiceUnregistered();
+ processAllMessages();
+
+ verify(mWwanSelectorCallback, times(1)).onRequestEmergencyNetworkScan(
+ any(), anyInt(), eq(false), any(), any());
+ assertNotNull(mResultConsumer);
+
+ regResult = getEmergencyRegResult(EUTRAN, REGISTRATION_STATE_UNKNOWN,
+ 0, false, false, 0, 0, "", "", "in");
+ mResultConsumer.accept(regResult);
+ processAllMessages();
+
+ verify(mTransportSelectorCallback, times(1))
+ .onSelectionTerminated(eq(DisconnectCause.EMERGENCY_TEMP_FAILURE));
+ }
+
+ @Test
public void testEutranWithCsDomainOnly() throws Exception {
setupForHandleScanResult();
@@ -1881,6 +1941,32 @@
}
@Test
+ public void testEutranVopsNotSupported() throws Exception {
+ setupForHandleScanResult();
+
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(EUTRAN,
+ REGISTRATION_STATE_HOME,
+ DOMAIN_CS | DOMAIN_PS, false, true, 0, 0, "", "");
+ mResultConsumer.accept(regResult);
+ processAllMessages();
+
+ verifyPsDialed();
+ }
+
+ @Test
+ public void testEutranEmcBearerNotSupported() throws Exception {
+ setupForHandleScanResult();
+
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(EUTRAN,
+ REGISTRATION_STATE_HOME,
+ DOMAIN_CS | DOMAIN_PS, true, false, 0, 0, "", "");
+ mResultConsumer.accept(regResult);
+ processAllMessages();
+
+ verifyCsDialed();
+ }
+
+ @Test
public void testEutranWithPsDomainOnly() throws Exception {
setupForHandleScanResult();
@@ -1933,8 +2019,10 @@
mResultConsumer.accept(regResult);
processAllMessages();
- verify(mWwanSelectorCallback, times(2)).onRequestEmergencyNetworkScan(
+ verify(mWwanSelectorCallback, times(1)).onRequestEmergencyNetworkScan(
any(), eq(DomainSelectionService.SCAN_TYPE_FULL_SERVICE), eq(false), any(), any());
+ verify(mWwanSelectorCallback, times(1)).onRequestEmergencyNetworkScan(
+ any(), eq(DomainSelectionService.SCAN_TYPE_FULL_SERVICE), eq(true), any(), any());
}
@Test
@@ -2269,6 +2357,152 @@
}
@Test
+ public void testNotPreferLteThanNrInUnknownCoverage() throws Exception {
+ PersistableBundle bundle = getDefaultPersistableBundle();
+ bundle.putIntArray(KEY_EMERGENCY_OVER_IMS_SUPPORTED_3GPP_NETWORK_TYPES_INT_ARRAY,
+ new int[] { NGRAN, EUTRAN });
+ when(mCarrierConfigManager.getConfigForSubId(anyInt(), anyVararg())).thenReturn(bundle);
+
+ createSelector(SLOT_0_SUB_ID);
+ unsolBarringInfoChanged(false);
+
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(
+ UNKNOWN, REGISTRATION_STATE_UNKNOWN, 0, false, false, 0, 0, "", "", "zz");
+ SelectionAttributes attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, regResult);
+ mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
+ processAllMessages();
+
+ bindImsServiceUnregistered();
+ processAllMessages();
+
+ verify(mWwanSelectorCallback, times(1)).onRequestEmergencyNetworkScan(
+ any(), anyInt(), anyBoolean(), any(), any());
+ assertEquals(4, mAccessNetwork.size());
+ assertEquals(NGRAN, (int) mAccessNetwork.get(0));
+ assertEquals(EUTRAN, (int) mAccessNetwork.get(1));
+ assertEquals(UTRAN, (int) mAccessNetwork.get(2));
+ assertEquals(GERAN, (int) mAccessNetwork.get(3));
+ }
+
+ @Test
+ public void testNotPreferLteThanNrInNrCoverage() throws Exception {
+ PersistableBundle bundle = getDefaultPersistableBundle();
+ bundle.putIntArray(KEY_EMERGENCY_OVER_IMS_SUPPORTED_3GPP_NETWORK_TYPES_INT_ARRAY,
+ new int[] { NGRAN, EUTRAN });
+ when(mCarrierConfigManager.getConfigForSubId(anyInt(), anyVararg())).thenReturn(bundle);
+
+ createSelector(SLOT_0_SUB_ID);
+ unsolBarringInfoChanged(false);
+
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(
+ NGRAN, REGISTRATION_STATE_UNKNOWN, 0, false, false, 0, 0, "", "", "zz");
+ SelectionAttributes attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, regResult);
+ mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
+ processAllMessages();
+
+ bindImsServiceUnregistered();
+ processAllMessages();
+
+ verify(mWwanSelectorCallback, times(1)).onRequestEmergencyNetworkScan(
+ any(), anyInt(), anyBoolean(), any(), any());
+ assertEquals(4, mAccessNetwork.size());
+ assertEquals(NGRAN, (int) mAccessNetwork.get(0));
+ assertEquals(EUTRAN, (int) mAccessNetwork.get(1));
+ assertEquals(UTRAN, (int) mAccessNetwork.get(2));
+ assertEquals(GERAN, (int) mAccessNetwork.get(3));
+ }
+
+ @Test
+ public void testNotPreferLteThanNrInUnknownCountry() throws Exception {
+ PersistableBundle bundle = getDefaultPersistableBundle();
+ bundle.putIntArray(KEY_EMERGENCY_OVER_IMS_SUPPORTED_3GPP_NETWORK_TYPES_INT_ARRAY,
+ new int[] { NGRAN, EUTRAN });
+ when(mCarrierConfigManager.getConfigForSubId(anyInt(), anyVararg())).thenReturn(bundle);
+
+ createSelector(SLOT_0_SUB_ID);
+ unsolBarringInfoChanged(false);
+
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(
+ EUTRAN, REGISTRATION_STATE_UNKNOWN, 0, false, false, 0, 0, "", "");
+ SelectionAttributes attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, regResult);
+ mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
+ processAllMessages();
+
+ bindImsServiceUnregistered();
+ processAllMessages();
+
+ verify(mWwanSelectorCallback, times(1)).onRequestEmergencyNetworkScan(
+ any(), anyInt(), anyBoolean(), any(), any());
+ assertEquals(4, mAccessNetwork.size());
+ assertEquals(NGRAN, (int) mAccessNetwork.get(0));
+ assertEquals(EUTRAN, (int) mAccessNetwork.get(1));
+ assertEquals(UTRAN, (int) mAccessNetwork.get(2));
+ assertEquals(GERAN, (int) mAccessNetwork.get(3));
+ }
+
+ @Test
+ public void testPreferLteThanNrInLteCoverage() throws Exception {
+ PersistableBundle bundle = getDefaultPersistableBundle();
+ bundle.putIntArray(KEY_EMERGENCY_OVER_IMS_SUPPORTED_3GPP_NETWORK_TYPES_INT_ARRAY,
+ new int[] { NGRAN, EUTRAN });
+ when(mCarrierConfigManager.getConfigForSubId(anyInt(), anyVararg())).thenReturn(bundle);
+
+ createSelector(SLOT_0_SUB_ID);
+ unsolBarringInfoChanged(false);
+
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(
+ EUTRAN, REGISTRATION_STATE_UNKNOWN, 0, false, false, 0, 0, "", "", "zz");
+ SelectionAttributes attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, regResult);
+ mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
+ processAllMessages();
+
+ bindImsServiceUnregistered();
+ processAllMessages();
+
+ verify(mWwanSelectorCallback, times(1)).onRequestEmergencyNetworkScan(
+ any(), anyInt(), anyBoolean(), any(), any());
+ assertEquals(4, mAccessNetwork.size());
+ assertEquals(EUTRAN, (int) mAccessNetwork.get(0));
+ assertEquals(NGRAN, (int) mAccessNetwork.get(1));
+ assertEquals(UTRAN, (int) mAccessNetwork.get(2));
+ assertEquals(GERAN, (int) mAccessNetwork.get(3));
+ }
+
+ @Test
+ public void testPreferLteThanNrInCsCoverage() throws Exception {
+ PersistableBundle bundle = getDefaultPersistableBundle();
+ bundle.putIntArray(KEY_EMERGENCY_OVER_IMS_SUPPORTED_3GPP_NETWORK_TYPES_INT_ARRAY,
+ new int[] { NGRAN, EUTRAN });
+ when(mCarrierConfigManager.getConfigForSubId(anyInt(), anyVararg())).thenReturn(bundle);
+
+ createSelector(SLOT_0_SUB_ID);
+ unsolBarringInfoChanged(false);
+
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(UTRAN,
+ REGISTRATION_STATE_HOME,
+ NetworkRegistrationInfo.DOMAIN_CS,
+ false, false, 0, 0, "", "", "zz");
+ SelectionAttributes attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, regResult);
+ mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
+ processAllMessages();
+
+ bindImsServiceUnregistered();
+
+ verifyCsDialed();
+
+ mDomainSelector.reselectDomain(attr);
+ processAllMessages();
+
+ verify(mWwanSelectorCallback, times(1)).onRequestEmergencyNetworkScan(
+ any(), anyInt(), anyBoolean(), any(), any());
+ assertEquals(4, mAccessNetwork.size());
+ assertEquals(EUTRAN, (int) mAccessNetwork.get(0));
+ assertEquals(NGRAN, (int) mAccessNetwork.get(1));
+ assertEquals(UTRAN, (int) mAccessNetwork.get(2));
+ assertEquals(GERAN, (int) mAccessNetwork.get(3));
+ }
+
+ @Test
public void testScanLimitedOnlyAfterVoLteFailure() throws Exception {
PersistableBundle bundle = getDefaultPersistableBundle();
bundle.putBoolean(KEY_SCAN_LIMITED_SERVICE_AFTER_VOLTE_FAILURE_BOOL,
@@ -2314,6 +2548,8 @@
bindImsServiceUnregistered();
processAllMessages();
+
+ verify(mImsEmergencyRegistrationHelper, never()).start();
verify(mCsrdCtrl).startTimer(any(), eq(mDomainSelector), any(),
any(), anyBoolean(), anyBoolean(), anyInt());
}
@@ -2522,6 +2758,114 @@
}
@Test
+ public void testScanTimeoutWifiNotAvailable() throws Exception {
+ PersistableBundle bundle = getDefaultPersistableBundle();
+ bundle.putBoolean(KEY_EMERGENCY_CALL_OVER_EMERGENCY_PDN_BOOL, true);
+ when(mCarrierConfigManager.getConfigForSubId(anyInt(), anyVararg())).thenReturn(bundle);
+
+ createSelector(SLOT_0_SUB_ID);
+ unsolBarringInfoChanged(false);
+
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(UNKNOWN,
+ REGISTRATION_STATE_UNKNOWN,
+ 0, false, false, 0, 0, "", "");
+ SelectionAttributes attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, regResult);
+ mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
+ processAllMessages();
+
+ bindImsServiceUnregistered();
+
+ verifyScanPsPreferred();
+
+ assertTrue(mDomainSelector.hasMessages(MSG_NETWORK_SCAN_TIMEOUT));
+
+ // Wi-Fi is not connected.
+ verify(mTransportSelectorCallback, times(0)).onWlanSelected(anyBoolean());
+
+ // Wi-Fi is connected.
+ mNetworkCallback.onAvailable(null);
+ processAllMessages();
+
+ verify(mTransportSelectorCallback, times(0)).onWlanSelected(anyBoolean());
+
+ // Wi-Fi is disconnected.
+ mNetworkCallback.onUnavailable();
+ mDomainSelector.removeMessages(MSG_NETWORK_SCAN_TIMEOUT);
+
+ // Timer is expired
+ mDomainSelector.handleMessage(mDomainSelector.obtainMessage(MSG_NETWORK_SCAN_TIMEOUT));
+
+ verify(mTransportSelectorCallback, times(0)).onWlanSelected(anyBoolean());
+
+ // Wi-Fi is connected.
+ mNetworkCallback.onAvailable(null);
+ processAllMessages();
+
+ verify(mTransportSelectorCallback, times(1)).onWlanSelected(eq(true));
+ }
+
+ @Test
+ public void testCrossStackTimerExpiredHangupOngoingDialing() throws Exception {
+ PersistableBundle bundle = getDefaultPersistableBundle();
+ bundle.putInt(KEY_EMERGENCY_CALL_SETUP_TIMER_ON_CURRENT_NETWORK_SEC_INT, 1);
+ when(mCarrierConfigManager.getConfigForSubId(anyInt(), anyVararg())).thenReturn(bundle);
+
+ mSetFlagsRule.enableFlags(Flags.FLAG_HANGUP_EMERGENCY_CALL_FOR_CROSS_SIM_REDIALING);
+
+ createSelector(SLOT_0_SUB_ID);
+ unsolBarringInfoChanged(false);
+
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(UTRAN,
+ REGISTRATION_STATE_HOME,
+ NetworkRegistrationInfo.DOMAIN_CS,
+ true, true, 0, 0, "", "");
+ SelectionAttributes attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, regResult);
+ mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
+ processAllMessages();
+
+ bindImsServiceUnregistered();
+
+ verify(mImsEmergencyRegistrationHelper).start();
+ verifyCsDialed();
+
+ mDomainSelector.notifyCrossStackTimerExpired();
+
+ verify(mTransportSelectorCallback)
+ .onSelectionTerminated(eq(DisconnectCause.EMERGENCY_PERM_FAILURE));
+ }
+
+ @Test
+ public void testCrossStackTimerExpiredNotHangupOngoingDialing() throws Exception {
+ PersistableBundle bundle = getDefaultPersistableBundle();
+ bundle.putInt(KEY_EMERGENCY_CALL_SETUP_TIMER_ON_CURRENT_NETWORK_SEC_INT, 1);
+ when(mCarrierConfigManager.getConfigForSubId(anyInt(), anyVararg())).thenReturn(bundle);
+ doReturn(true).when(mImsEmergencyRegistrationHelper).isImsEmergencyRegistered();
+
+ mSetFlagsRule.enableFlags(Flags.FLAG_HANGUP_EMERGENCY_CALL_FOR_CROSS_SIM_REDIALING);
+
+ createSelector(SLOT_0_SUB_ID);
+ unsolBarringInfoChanged(false);
+
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(UTRAN,
+ REGISTRATION_STATE_HOME,
+ NetworkRegistrationInfo.DOMAIN_CS,
+ true, true, 0, 0, "", "");
+ SelectionAttributes attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, regResult);
+ mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
+ processAllMessages();
+
+ bindImsServiceUnregistered();
+
+ verify(mImsEmergencyRegistrationHelper).start();
+ verifyCsDialed();
+
+ mDomainSelector.notifyCrossStackTimerExpired();
+
+ verify(mTransportSelectorCallback, never())
+ .onSelectionTerminated(eq(DisconnectCause.EMERGENCY_TEMP_FAILURE));
+ }
+
+ @Test
public void testMaxCellularTimeout() throws Exception {
PersistableBundle bundle = getDefaultPersistableBundle();
bundle.putBoolean(KEY_EMERGENCY_CALL_OVER_EMERGENCY_PDN_BOOL, true);
@@ -2566,6 +2910,13 @@
assertTrue(mDomainSelector.hasMessages(MSG_NETWORK_SCAN_TIMEOUT));
verify(mTransportSelectorCallback, never()).onWlanSelected(anyBoolean());
+
+ // Wi-Fi is connected.
+ mNetworkCallback.onAvailable(null);
+ processAllMessages();
+
+ assertFalse(mDomainSelector.hasMessages(MSG_NETWORK_SCAN_TIMEOUT));
+ verify(mTransportSelectorCallback, times(1)).onWlanSelected(anyBoolean());
}
@Test
@@ -2883,6 +3234,7 @@
@Test
public void testDefaultLimitedServiceEutranFail() throws Exception {
+ mResultConsumer = null;
createSelector(SLOT_0_SUB_ID);
unsolBarringInfoChanged(false);
@@ -2895,14 +3247,98 @@
bindImsServiceUnregistered();
- verifyPsDialed();
+ processAllMessages();
+ verify(mWwanSelectorCallback, times(1)).onDomainSelected(eq(DOMAIN_PS), eq(true));
attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, false, regResult,
new ImsReasonInfo(ImsReasonInfo.CODE_LOCAL_NOT_REGISTERED, 0, null));
mDomainSelector.reselectDomain(attr);
processAllMessages();
- verifyScanPsPreferred();
+ // Verify PS preferred scan
+ verify(mWwanSelectorCallback, times(1)).onRequestEmergencyNetworkScan(
+ any(), eq(DomainSelectionService.SCAN_TYPE_NO_PREFERENCE),
+ anyBoolean(), any(), any());
+ assertEquals(EUTRAN, (int) mAccessNetwork.get(0));
+ assertNotNull(mResultConsumer);
+
+ regResult = getEmergencyRegResult(EUTRAN, REGISTRATION_STATE_UNKNOWN,
+ 0, false, false, 0, 0, "", "");
+ mResultConsumer.accept(regResult);
+
+ processAllMessages();
+ verify(mWwanSelectorCallback, times(2)).onDomainSelected(eq(DOMAIN_PS), eq(true));
+
+ mDomainSelector.reselectDomain(attr);
+ processAllMessages();
+
+ // Verify RAT preference change
+ verify(mWwanSelectorCallback, times(2)).onRequestEmergencyNetworkScan(
+ any(), eq(DomainSelectionService.SCAN_TYPE_NO_PREFERENCE),
+ anyBoolean(), any(), any());
+ assertEquals(UTRAN, (int) mAccessNetwork.get(0));
+ }
+
+ @Test
+ public void testDefaultLimitedServiceEutranFailScanLimitedOnly() throws Exception {
+ PersistableBundle bundle = getDefaultPersistableBundle();
+ bundle.putBoolean(KEY_SCAN_LIMITED_SERVICE_AFTER_VOLTE_FAILURE_BOOL,
+ true);
+ when(mCarrierConfigManager.getConfigForSubId(anyInt(), anyVararg())).thenReturn(bundle);
+
+ createSelector(SLOT_0_SUB_ID);
+ unsolBarringInfoChanged(false);
+
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(EUTRAN,
+ REGISTRATION_STATE_UNKNOWN,
+ 0, false, true, 0, 0, "", "");
+ SelectionAttributes attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, regResult);
+ mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
+ processAllMessages();
+
+ bindImsServiceUnregistered();
+
+ processAllMessages();
+ verify(mWwanSelectorCallback, times(1)).onDomainSelected(eq(DOMAIN_PS), eq(true));
+
+ attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, false, regResult,
+ new ImsReasonInfo(ImsReasonInfo.CODE_LOCAL_NOT_REGISTERED, 0, null));
+ mDomainSelector.reselectDomain(attr);
+ processAllMessages();
+
+ // Verify CS preferred limited service only scan
+ verify(mWwanSelectorCallback).onRequestEmergencyNetworkScan(
+ any(), eq(DomainSelectionService.SCAN_TYPE_LIMITED_SERVICE),
+ anyBoolean(), any(), any());
+ assertEquals(UTRAN, (int) mAccessNetwork.get(0));
+ }
+
+ @Test
+ public void testDefaultLimitedServiceEutranFailPinLocked() throws Exception {
+ doReturn(TelephonyManager.SIM_STATE_PIN_REQUIRED)
+ .when(mTelephonyManager).getSimState(anyInt());
+
+ createSelector(SLOT_0_SUB_ID);
+ unsolBarringInfoChanged(false);
+
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(EUTRAN,
+ REGISTRATION_STATE_UNKNOWN,
+ 0, false, true, 0, 0, "", "");
+ SelectionAttributes attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, regResult);
+ mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
+ processAllMessages();
+
+ bindImsServiceUnregistered();
+
+ processAllMessages();
+ verify(mWwanSelectorCallback, times(1)).onDomainSelected(eq(DOMAIN_PS), eq(true));
+
+ attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, false, regResult,
+ new ImsReasonInfo(ImsReasonInfo.CODE_LOCAL_NOT_REGISTERED, 0, null));
+ mDomainSelector.reselectDomain(attr);
+ processAllMessages();
+
+ verifyScanCsPreferred();
}
@Test
@@ -3176,7 +3612,108 @@
EmergencyRegistrationResult regResult = getEmergencyRegResult(NGRAN,
REGISTRATION_STATE_UNKNOWN,
- 0, false, true, 0, 0, "", "");
+ 0, false, true, 1, 0, "", "", "us");
+ SelectionAttributes attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, regResult);
+ mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
+ processAllMessages();
+
+ bindImsServiceUnregistered();
+
+ verifyScanPsPreferred();
+ }
+
+ @Test
+ public void testNrSaOnlyLimitedServiceNgranEmc() throws Exception {
+ PersistableBundle bundle = getDefaultPersistableBundle();
+ bundle.putIntArray(KEY_EMERGENCY_OVER_IMS_SUPPORTED_3GPP_NETWORK_TYPES_INT_ARRAY,
+ new int[] { NGRAN, EUTRAN });
+ when(mCarrierConfigManager.getConfigForSubId(anyInt(), anyVararg())).thenReturn(bundle);
+
+ createSelector(SLOT_0_SUB_ID);
+ unsolBarringInfoChanged(false);
+
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(NGRAN,
+ REGISTRATION_STATE_UNKNOWN,
+ 0, false, false, 1, 0, "", "", "us");
+ SelectionAttributes attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, regResult);
+ mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
+ processAllMessages();
+
+ bindImsServiceUnregistered();
+
+ verifyPsDialed();
+ }
+
+ @Test
+ public void testNrSaOnlyLimitedServiceNgranNoEmc() throws Exception {
+ PersistableBundle bundle = getDefaultPersistableBundle();
+ bundle.putIntArray(KEY_EMERGENCY_OVER_IMS_SUPPORTED_3GPP_NETWORK_TYPES_INT_ARRAY,
+ new int[] { NGRAN, EUTRAN });
+ when(mCarrierConfigManager.getConfigForSubId(anyInt(), anyVararg())).thenReturn(bundle);
+
+ createSelector(SLOT_0_SUB_ID);
+ unsolBarringInfoChanged(false);
+
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(NGRAN,
+ REGISTRATION_STATE_UNKNOWN,
+ 0, false, false, 0, 0, "", "", "us");
+ SelectionAttributes attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, regResult);
+ mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
+ processAllMessages();
+
+ bindImsServiceUnregistered();
+
+ verifyScanPreferred(DomainSelectionService.SCAN_TYPE_NO_PREFERENCE, NGRAN);
+ }
+
+ @Test
+ public void testDefaultLimitedServiceNgranEmcWhenSimNotReady() throws Exception {
+ createSelector(SLOT_0_SUB_ID);
+ unsolBarringInfoChanged(false);
+ doReturn(TelephonyManager.SIM_STATE_PIN_REQUIRED)
+ .when(mTelephonyManager).getSimState(anyInt());
+
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(NGRAN,
+ REGISTRATION_STATE_UNKNOWN,
+ 0, false, false, 1, 0, "", "", "us");
+ SelectionAttributes attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, regResult);
+ mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
+ processAllMessages();
+
+ bindImsServiceUnregistered();
+
+ verifyPsDialed();
+ }
+
+ @Test
+ public void testDefaultLimitedServiceNgranNoEmcWhenSimNotReady() throws Exception {
+ createSelector(SLOT_0_SUB_ID);
+ unsolBarringInfoChanged(false);
+ doReturn(TelephonyManager.SIM_STATE_PIN_REQUIRED)
+ .when(mTelephonyManager).getSimState(anyInt());
+
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(NGRAN,
+ REGISTRATION_STATE_UNKNOWN,
+ 0, false, false, 0, 0, "", "", "us");
+ SelectionAttributes attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, regResult);
+ mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
+ processAllMessages();
+
+ bindImsServiceUnregistered();
+
+ verifyScanPsPreferred();
+ }
+
+ @Test
+ public void testNrSaOnlyLimitedServiceNgranEmcNoCountryIsoWhenSimNotReady() throws Exception {
+ createSelector(SLOT_0_SUB_ID);
+ unsolBarringInfoChanged(false);
+ doReturn(TelephonyManager.SIM_STATE_PIN_REQUIRED)
+ .when(mTelephonyManager).getSimState(anyInt());
+
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(NGRAN,
+ REGISTRATION_STATE_UNKNOWN,
+ 0, false, false, 1, 0, "", "", "");
SelectionAttributes attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, regResult);
mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
processAllMessages();
@@ -3637,6 +4174,448 @@
verifyCsDialed();
}
+ @Test
+ public void testSimLockedNoCellularScanTimeout() throws Exception {
+ doReturn(TelephonyManager.SIM_STATE_PIN_REQUIRED)
+ .when(mTelephonyManager).getSimState(anyInt());
+
+ setupForHandleScanResult();
+
+ assertFalse(mDomainSelector.hasMessages(MSG_NETWORK_SCAN_TIMEOUT));
+ assertFalse(mDomainSelector.hasMessages(MSG_MAX_CELLULAR_TIMEOUT));
+ }
+
+ @Test
+ public void testWaitForImsStateTimeout() throws Exception {
+ createSelector(SLOT_0_SUB_ID);
+
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(
+ UNKNOWN, REGISTRATION_STATE_UNKNOWN, 0, false, false, 0, 0, "", "");
+ SelectionAttributes attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, regResult);
+ mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
+ processAllMessages();
+
+ assertTrue(mDomainSelector.hasMessages(MSG_WAIT_FOR_IMS_STATE_TIMEOUT));
+
+ verify(mTransportSelectorCallback, times(0)).onWwanSelected(any());
+ verify(mWwanSelectorCallback, times(0)).onRequestEmergencyNetworkScan(
+ any(), anyInt(), anyBoolean(), any(), any());
+
+ unsolBarringInfoChanged(false);
+ processAllMessages();
+
+ verify(mTransportSelectorCallback, times(0)).onWwanSelected(any());
+ verify(mWwanSelectorCallback, times(0)).onRequestEmergencyNetworkScan(
+ any(), anyInt(), anyBoolean(), any(), any());
+ assertTrue(mDomainSelector.hasMessages(MSG_WAIT_FOR_IMS_STATE_TIMEOUT));
+
+ mDomainSelector.handleMessage(
+ mDomainSelector.obtainMessage(MSG_WAIT_FOR_IMS_STATE_TIMEOUT));
+
+ assertFalse(mDomainSelector.hasMessages(MSG_WAIT_FOR_IMS_STATE_TIMEOUT));
+ verify(mTransportSelectorCallback, times(1)).onWwanSelected(any());
+
+ processAllMessages();
+
+ verify(mWwanSelectorCallback, times(1)).onRequestEmergencyNetworkScan(
+ any(), anyInt(), anyBoolean(), any(), any());
+ }
+
+ @Test
+ public void testSupportVoLteTtyLimitedServiceEutranWithNonTtyCall() throws Exception {
+ PersistableBundle bundle = getDefaultPersistableBundle();
+ bundle.putBoolean(KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, true);
+ bundle.putInt(KEY_MAXIMUM_CELLULAR_SEARCH_TIMER_SEC_INT, 20);
+ when(mCarrierConfigManager.getConfigForSubId(anyInt(), anyVararg())).thenReturn(bundle);
+
+ createSelector(SLOT_0_SUB_ID);
+ unsolBarringInfoChanged(false);
+
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(EUTRAN,
+ REGISTRATION_STATE_UNKNOWN,
+ 0, false, true, 0, 0, "", "");
+ SelectionAttributes attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, regResult);
+ mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
+ processAllMessages();
+
+ bindImsServiceUnregistered();
+
+ verifyPsDialed();
+
+ mDomainSelector.reselectDomain(attr);
+ processAllMessages();
+
+ verifyScanCsPreferred();
+
+ // Verify timers for VoWi-Fi
+ assertTrue(mDomainSelector.hasMessages(MSG_NETWORK_SCAN_TIMEOUT));
+ assertTrue(mDomainSelector.hasMessages(MSG_MAX_CELLULAR_TIMEOUT));
+ }
+
+ @Test
+ public void testNotSupportVoLteTtyLimitedServiceEutranWithTtyCall() throws Exception {
+ PersistableBundle bundle = getDefaultPersistableBundle();
+ int[] domainPreference = new int[] {
+ CarrierConfigManager.ImsEmergency.DOMAIN_PS_3GPP,
+ CarrierConfigManager.ImsEmergency.DOMAIN_CS,
+ };
+ bundle.putIntArray(KEY_EMERGENCY_DOMAIN_PREFERENCE_INT_ARRAY, domainPreference);
+ bundle.putIntArray(KEY_EMERGENCY_OVER_IMS_SUPPORTED_3GPP_NETWORK_TYPES_INT_ARRAY,
+ new int[] { NGRAN, EUTRAN });
+ bundle.putBoolean(KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, false);
+ bundle.putInt(KEY_MAXIMUM_CELLULAR_SEARCH_TIMER_SEC_INT, 20);
+ when(mCarrierConfigManager.getConfigForSubId(anyInt(), anyVararg())).thenReturn(bundle);
+
+ when(mTelecomManager.getCurrentTtyMode()).thenReturn(TelecomManager.TTY_MODE_FULL);
+
+ createSelector(SLOT_0_SUB_ID);
+ unsolBarringInfoChanged(false);
+
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(EUTRAN,
+ REGISTRATION_STATE_UNKNOWN,
+ 0, false, true, 0, 0, "", "");
+ SelectionAttributes attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, regResult);
+ mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
+ processAllMessages();
+
+ bindImsServiceUnregistered();
+
+ processAllMessages();
+
+ // Verify CS only network scan
+ verify(mWwanSelectorCallback, times(1)).onRequestEmergencyNetworkScan(
+ any(), anyInt(), anyBoolean(), any(), any());
+ assertEquals(2, mAccessNetwork.size());
+ assertEquals(UTRAN, (int) mAccessNetwork.get(0));
+ assertEquals(GERAN, (int) mAccessNetwork.get(1));
+
+ // Verify no timer for VoWi-Fi
+ assertFalse(mDomainSelector.hasMessages(MSG_NETWORK_SCAN_TIMEOUT));
+ assertFalse(mDomainSelector.hasMessages(MSG_MAX_CELLULAR_TIMEOUT));
+ }
+
+ @Test
+ public void testInvalidSubscriptionAdjustCsRatPreference() throws Exception {
+ doReturn(new String[] {"us"}).when(mResources).getStringArray(
+ eq(R.array.config_countries_prefer_geran_when_sim_absent));
+
+ createSelector(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+ unsolBarringInfoChanged(false);
+
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(EUTRAN,
+ REGISTRATION_STATE_UNKNOWN, 0, false, true, 0, 0, "", "", "us");
+ // Invalid subscription id
+ SelectionAttributes attr = getSelectionAttributes(SLOT_0,
+ SubscriptionManager.INVALID_SUBSCRIPTION_ID, regResult);
+ mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
+ processAllMessages();
+
+ bindImsServiceUnregistered();
+
+ verifyPsDialed();
+
+ mDomainSelector.reselectDomain(attr);
+ processAllMessages();
+
+ // Verify adjusted RAT preference
+ verifyScanPreferred(DomainSelectionService.SCAN_TYPE_NO_PREFERENCE, GERAN);
+ }
+
+ @Test
+ public void testSimNotReadyAdjustCsRatPreference() throws Exception {
+ doReturn(new String[] {"us"}).when(mResources).getStringArray(
+ eq(R.array.config_countries_prefer_geran_when_sim_absent));
+
+ createSelector(SLOT_0_SUB_ID);
+ unsolBarringInfoChanged(false);
+ // SIM state is not ready.
+ doReturn(TelephonyManager.SIM_STATE_PIN_REQUIRED)
+ .when(mTelephonyManager).getSimState(anyInt());
+
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(EUTRAN,
+ REGISTRATION_STATE_UNKNOWN, 0, false, true, 0, 0, "", "", "us");
+ SelectionAttributes attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, regResult);
+ mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
+ processAllMessages();
+
+ bindImsServiceUnregistered();
+
+ verifyPsDialed();
+
+ mDomainSelector.reselectDomain(attr);
+ processAllMessages();
+
+ // Verify adjusted RAT preference
+ verifyScanPreferred(DomainSelectionService.SCAN_TYPE_NO_PREFERENCE, GERAN);
+ }
+
+ @Test
+ public void testNotAdjustCsRatPreferenceCountryNotIdentified() throws Exception {
+ doReturn(new String[] {"us"}).when(mResources).getStringArray(
+ eq(R.array.config_countries_prefer_geran_when_sim_absent));
+
+ createSelector(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+ unsolBarringInfoChanged(false);
+
+ // Country is not identified
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(EUTRAN,
+ REGISTRATION_STATE_UNKNOWN, 0, false, true, 0, 0, "", "");
+ // Invalid subscription id
+ SelectionAttributes attr = getSelectionAttributes(SLOT_0,
+ SubscriptionManager.INVALID_SUBSCRIPTION_ID, regResult);
+ mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
+ processAllMessages();
+
+ bindImsServiceUnregistered();
+
+ verifyPsDialed();
+
+ mDomainSelector.reselectDomain(attr);
+ processAllMessages();
+
+ // Verify not adjusted RAT preference
+ verifyScanPreferred(DomainSelectionService.SCAN_TYPE_NO_PREFERENCE, UTRAN);
+ }
+
+ @Test
+ public void testNotAdjustCsRatPreferenceValidSubscription() throws Exception {
+ doReturn(new String[] {"us"}).when(mResources).getStringArray(
+ eq(R.array.config_countries_prefer_geran_when_sim_absent));
+
+ createSelector(SLOT_0_SUB_ID);
+ unsolBarringInfoChanged(false);
+
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(EUTRAN,
+ REGISTRATION_STATE_UNKNOWN, 0, false, true, 0, 0, "", "", "us");
+ // Valid subscription id
+ SelectionAttributes attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, regResult);
+ mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
+ processAllMessages();
+
+ bindImsServiceUnregistered();
+
+ verifyPsDialed();
+
+ mDomainSelector.reselectDomain(attr);
+ processAllMessages();
+
+ // Verify not adjusted RAT preference
+ verifyScanPreferred(DomainSelectionService.SCAN_TYPE_NO_PREFERENCE, UTRAN);
+ }
+
+ @Test
+ public void testNotTerminateSelectionAfterCsFailure() throws Exception {
+ mResultConsumer = null;
+ createSelector(SLOT_0_SUB_ID);
+ unsolBarringInfoChanged(false);
+
+ // mcc is identified but it doesn't start with 00.
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(
+ UTRAN, REGISTRATION_STATE_UNKNOWN, 0, false, false, 0, 0, "999", "");
+ SelectionAttributes attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, regResult);
+ mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
+ processAllMessages();
+
+ bindImsServiceUnregistered();
+ processAllMessages();
+
+ verify(mWwanSelectorCallback, times(1)).onDomainSelected(eq(DOMAIN_CS), eq(false));
+
+ SelectionAttributes.Builder builder =
+ new SelectionAttributes.Builder(SLOT_0, SLOT_0_SUB_ID, SELECTOR_TYPE_CALLING)
+ .setAddress(TEST_URI)
+ .setCsDisconnectCause(SERVICE_OPTION_NOT_AVAILABLE)
+ .setEmergency(true)
+ .setEmergencyRegistrationResult(regResult);
+ attr = builder.build();
+ mDomainSelector.reselectDomain(attr);
+ processAllMessages();
+
+ // Verify reselection.
+ verify(mWwanSelectorCallback).onRequestEmergencyNetworkScan(
+ any(), anyInt(), anyBoolean(), any(), any());
+ verify(mTransportSelectorCallback, never())
+ .onSelectionTerminated(eq(DisconnectCause.NOT_VALID));
+ }
+
+ @Test
+ public void testTerminateSelectionAfterCsFailure() throws Exception {
+ mResultConsumer = null;
+ createSelector(SLOT_0_SUB_ID);
+ unsolBarringInfoChanged(false);
+
+ // mcc is identified and it starts with 00.
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(
+ UTRAN, REGISTRATION_STATE_UNKNOWN, 0, false, false, 0, 0, "003", "");
+ SelectionAttributes attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, regResult);
+ mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
+ processAllMessages();
+
+ bindImsServiceUnregistered();
+ processAllMessages();
+
+ verify(mWwanSelectorCallback, times(1)).onDomainSelected(eq(DOMAIN_CS), eq(false));
+
+ SelectionAttributes.Builder builder =
+ new SelectionAttributes.Builder(SLOT_0, SLOT_0_SUB_ID, SELECTOR_TYPE_CALLING)
+ .setAddress(TEST_URI)
+ .setCsDisconnectCause(SERVICE_OPTION_NOT_AVAILABLE)
+ .setEmergency(true)
+ .setEmergencyRegistrationResult(regResult);
+ attr = builder.build();
+ mDomainSelector.reselectDomain(attr);
+ processAllMessages();
+
+ // Verify selection termination.
+ verify(mWwanSelectorCallback, never()).onRequestEmergencyNetworkScan(
+ any(), anyInt(), anyBoolean(), any(), any());
+ verify(mTransportSelectorCallback)
+ .onSelectionTerminated(eq(DisconnectCause.NOT_VALID));
+ }
+
+ @Test
+ public void testTerminateSelectionAfterCsFailureAfterScan() throws Exception {
+ mResultConsumer = null;
+ createSelector(SLOT_0_SUB_ID);
+ unsolBarringInfoChanged(false);
+
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(
+ UNKNOWN, REGISTRATION_STATE_UNKNOWN, 0, false, false, 0, 0, "", "");
+ SelectionAttributes attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, regResult);
+ mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
+ processAllMessages();
+
+ bindImsServiceUnregistered();
+ processAllMessages();
+
+ verify(mTransportSelectorCallback, times(1)).onWwanSelected(any());
+ verify(mWwanSelectorCallback, times(1)).onRequestEmergencyNetworkScan(
+ any(), anyInt(), anyBoolean(), any(), any());
+ assertNotNull(mResultConsumer);
+
+ // mcc is not identified.
+ regResult = getEmergencyRegResult(UTRAN, REGISTRATION_STATE_UNKNOWN,
+ 0, false, false, 0, 0, "", "");
+ mResultConsumer.accept(regResult);
+ processAllMessages();
+
+ verify(mWwanSelectorCallback, times(1)).onDomainSelected(eq(DOMAIN_CS), eq(false));
+
+ SelectionAttributes.Builder builder =
+ new SelectionAttributes.Builder(SLOT_0, SLOT_0_SUB_ID, SELECTOR_TYPE_CALLING)
+ .setAddress(TEST_URI)
+ .setCsDisconnectCause(SERVICE_OPTION_NOT_AVAILABLE)
+ .setEmergency(true)
+ .setEmergencyRegistrationResult(regResult);
+ attr = builder.build();
+ mResultConsumer = null;
+ mDomainSelector.reselectDomain(attr);
+ processAllMessages();
+
+ // Verify reselection.
+ verify(mWwanSelectorCallback, times(2)).onRequestEmergencyNetworkScan(
+ any(), anyInt(), anyBoolean(), any(), any());
+ assertNotNull(mResultConsumer);
+
+ // mcc is identified but it doesn't start with 00.
+ regResult = getEmergencyRegResult(UTRAN, REGISTRATION_STATE_UNKNOWN,
+ 0, false, false, 0, 0, "999", "");
+ mResultConsumer.accept(regResult);
+ processAllMessages();
+
+ verify(mWwanSelectorCallback, times(2)).onDomainSelected(eq(DOMAIN_CS), eq(false));
+
+ mResultConsumer = null;
+ mDomainSelector.reselectDomain(attr);
+ processAllMessages();
+
+ // Verify reselection.
+ verify(mWwanSelectorCallback, times(3)).onRequestEmergencyNetworkScan(
+ any(), anyInt(), anyBoolean(), any(), any());
+ assertNotNull(mResultConsumer);
+
+ // mcc is identified and it starts with 00.
+ regResult = getEmergencyRegResult(UTRAN, REGISTRATION_STATE_UNKNOWN,
+ 0, false, false, 0, 0, "003", "");
+ mResultConsumer.accept(regResult);
+ processAllMessages();
+
+ verify(mWwanSelectorCallback, times(3)).onDomainSelected(eq(DOMAIN_CS), eq(false));
+
+ mDomainSelector.reselectDomain(attr);
+ processAllMessages();
+
+ // Verify selection termination.
+ verify(mWwanSelectorCallback, times(3)).onRequestEmergencyNetworkScan(
+ any(), anyInt(), anyBoolean(), any(), any());
+ verify(mTransportSelectorCallback)
+ .onSelectionTerminated(eq(DisconnectCause.NOT_VALID));
+ }
+
+ @Test
+ public void testMultipleWiFiNetworksAvailable() throws Exception {
+ createSelector(SLOT_0_SUB_ID);
+ unsolBarringInfoChanged(false);
+
+ EmergencyRegistrationResult regResult = getEmergencyRegResult(UNKNOWN,
+ REGISTRATION_STATE_UNKNOWN,
+ 0, false, false, 0, 0, "", "");
+ SelectionAttributes attr = getSelectionAttributes(SLOT_0, SLOT_0_SUB_ID, regResult);
+ mDomainSelector.selectDomain(attr, mTransportSelectorCallback);
+ processAllMessages();
+
+ bindImsServiceUnregistered();
+
+ verifyScanPsPreferred();
+
+ Network network1 = mock(Network.class);
+
+ // Wi-Fi is connected.
+ mNetworkCallback.onAvailable(network1);
+
+ assertTrue(mDomainSelector.isWiFiAvailable());
+ assertFalse(mDomainSelector.getWiFiNetworksAvailable().isEmpty());
+ assertTrue(mDomainSelector.getWiFiNetworksAvailable().contains(network1));
+
+ // Wi-Fi is lost.
+ mNetworkCallback.onLost(network1);
+
+ assertFalse(mDomainSelector.isWiFiAvailable());
+ assertTrue(mDomainSelector.getWiFiNetworksAvailable().isEmpty());
+
+ Network network2 = mock(Network.class);
+ Network network3 = mock(Network.class);
+
+ // Wi-Fi networks are connected.
+ mNetworkCallback.onAvailable(network2);
+
+ assertTrue(mDomainSelector.isWiFiAvailable());
+ assertFalse(mDomainSelector.getWiFiNetworksAvailable().isEmpty());
+ assertTrue(mDomainSelector.getWiFiNetworksAvailable().contains(network2));
+ assertFalse(mDomainSelector.getWiFiNetworksAvailable().contains(network3));
+
+ mNetworkCallback.onAvailable(network3);
+
+ assertTrue(mDomainSelector.isWiFiAvailable());
+ assertFalse(mDomainSelector.getWiFiNetworksAvailable().isEmpty());
+ assertTrue(mDomainSelector.getWiFiNetworksAvailable().contains(network2));
+ assertTrue(mDomainSelector.getWiFiNetworksAvailable().contains(network3));
+
+ // Wi-Fi network2 is lost.
+ mNetworkCallback.onLost(network2);
+
+ assertTrue(mDomainSelector.isWiFiAvailable());
+ assertFalse(mDomainSelector.getWiFiNetworksAvailable().isEmpty());
+ assertFalse(mDomainSelector.getWiFiNetworksAvailable().contains(network2));
+ assertTrue(mDomainSelector.getWiFiNetworksAvailable().contains(network3));
+
+ // Wi-Fi is unavailable.
+ mNetworkCallback.onUnavailable();
+
+ assertFalse(mDomainSelector.isWiFiAvailable());
+ assertTrue(mDomainSelector.getWiFiNetworksAvailable().isEmpty());
+ }
+
private void setupForScanListTest(PersistableBundle bundle) throws Exception {
setupForScanListTest(bundle, false);
}
@@ -3716,6 +4695,8 @@
mDomainSelector.clearResourceConfiguration();
replaceInstance(DomainSelectorBase.class,
"mWwanSelectorCallback", mDomainSelector, mWwanSelectorCallback);
+ replaceInstance(EmergencyCallDomainSelector.class, "mImsEmergencyRegistrationHelper",
+ mDomainSelector, mImsEmergencyRegistrationHelper);
}
private void verifyCsDialed() {
@@ -3877,6 +4858,7 @@
ltePreferredAfterNrFailed);
bundle.putStringArray(KEY_EMERGENCY_CDMA_PREFERRED_NUMBERS_STRING_ARRAY,
cdmaPreferredNumbers);
+ bundle.putBoolean(KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, false);
return bundle;
}
diff --git a/tests/src/com/android/services/telephony/domainselection/ImsEmergencyRegistrationStateHelperTest.java b/tests/src/com/android/services/telephony/domainselection/ImsEmergencyRegistrationStateHelperTest.java
new file mode 100644
index 0000000..41f1747
--- /dev/null
+++ b/tests/src/com/android/services/telephony/domainselection/ImsEmergencyRegistrationStateHelperTest.java
@@ -0,0 +1,212 @@
+/*
+ * Copyright (C) 2024 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.services.telephony.domainselection;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.HandlerThread;
+import android.telephony.ims.ImsException;
+import android.telephony.ims.ImsManager;
+import android.telephony.ims.ImsMmTelManager;
+import android.telephony.ims.ImsReasonInfo;
+import android.telephony.ims.ImsRegistrationAttributes;
+import android.telephony.ims.ImsStateCallback;
+import android.telephony.ims.RegistrationManager;
+import android.telephony.ims.stub.ImsRegistrationImplBase;
+import android.testing.TestableLooper;
+import android.util.Log;
+
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.TestContext;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.concurrent.Executor;
+
+/**
+ * Unit tests for ImsEmergencyRegistrationStateHelper.
+ */
+@RunWith(AndroidJUnit4.class)
+public class ImsEmergencyRegistrationStateHelperTest {
+ private static final String TAG = "ImsEmergencyRegistrationStateHelperTest";
+
+ private static final int SLOT_0 = 0;
+ private static final int SUB_1 = 1;
+
+ @Mock private ImsMmTelManager mMmTelManager;
+
+ private Context mContext;
+ private HandlerThread mHandlerThread;
+ private TestableLooper mLooper;
+ private ImsEmergencyRegistrationStateHelper mImsEmergencyRegistrationHelper;
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+ mContext = new TestContext() {
+ @Override
+ public String getSystemServiceName(Class<?> serviceClass) {
+ if (serviceClass == ImsManager.class) {
+ return Context.TELEPHONY_IMS_SERVICE;
+ }
+ return super.getSystemServiceName(serviceClass);
+ }
+ };
+
+ mHandlerThread = new HandlerThread(
+ ImsEmergencyRegistrationStateHelperTest.class.getSimpleName());
+ mHandlerThread.start();
+ try {
+ mLooper = new TestableLooper(mHandlerThread.getLooper());
+ } catch (Exception e) {
+ loge("Unable to create looper from handler.");
+ }
+ mImsEmergencyRegistrationHelper = new ImsEmergencyRegistrationStateHelper(
+ mContext, SLOT_0, SUB_1, mHandlerThread.getLooper());
+
+ ImsManager imsManager = mContext.getSystemService(ImsManager.class);
+ when(imsManager.getImsMmTelManager(eq(SUB_1))).thenReturn(mMmTelManager);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ if (mImsEmergencyRegistrationHelper != null) {
+ mImsEmergencyRegistrationHelper.destroy();
+ mImsEmergencyRegistrationHelper = null;
+ }
+ mMmTelManager = null;
+
+ if (mLooper != null) {
+ mLooper.destroy();
+ mLooper = null;
+ }
+ }
+
+ @Test
+ @SmallTest
+ public void testStart() throws ImsException {
+ mImsEmergencyRegistrationHelper.start();
+
+ verify(mMmTelManager).registerImsStateCallback(
+ any(Executor.class), any(ImsStateCallback.class));
+ assertFalse(mImsEmergencyRegistrationHelper.isImsEmergencyRegistered());
+ }
+
+ @Test
+ @SmallTest
+ public void testNotifyImsStateCallbackOnAvailable() throws ImsException {
+ ImsStateCallback callback = setUpImsStateCallback();
+ callback.onAvailable();
+ processAllMessages();
+
+ verify(mMmTelManager).registerImsEmergencyRegistrationCallback(
+ any(Executor.class), any(RegistrationManager.RegistrationCallback.class));
+ assertFalse(mImsEmergencyRegistrationHelper.isImsEmergencyRegistered());
+ }
+
+ @Test
+ @SmallTest
+ public void testNotifyImsRegistrationCallbackOnRegistered() throws ImsException {
+ RegistrationManager.RegistrationCallback callback = setUpImsEmergencyRegistrationCallback();
+
+ assertFalse(mImsEmergencyRegistrationHelper.isImsEmergencyRegistered());
+
+ callback.onRegistered(getImsEmergencyRegistrationAttributes());
+ processAllMessages();
+
+ assertTrue(mImsEmergencyRegistrationHelper.isImsEmergencyRegistered());
+ }
+
+ @Test
+ @SmallTest
+ public void testNotifyImsRegistrationCallbackOnRegisteredUnregistered() throws ImsException {
+ RegistrationManager.RegistrationCallback callback = setUpImsEmergencyRegistrationCallback();
+
+ assertFalse(mImsEmergencyRegistrationHelper.isImsEmergencyRegistered());
+
+ callback.onRegistered(getImsEmergencyRegistrationAttributes());
+ processAllMessages();
+
+ callback.onUnregistered(
+ new ImsReasonInfo(ImsReasonInfo.CODE_LOCAL_CALL_CS_RETRY_REQUIRED, 0, null), 0, 0);
+ processAllMessages();
+
+ assertFalse(mImsEmergencyRegistrationHelper.isImsEmergencyRegistered());
+ }
+
+ private ImsStateCallback setUpImsStateCallback() throws ImsException {
+ mImsEmergencyRegistrationHelper.start();
+
+ ArgumentCaptor<ImsStateCallback> callbackCaptor =
+ ArgumentCaptor.forClass(ImsStateCallback.class);
+
+ verify(mMmTelManager).registerImsStateCallback(
+ any(Executor.class), callbackCaptor.capture());
+
+ ImsStateCallback imsStateCallback = callbackCaptor.getValue();
+ assertNotNull(imsStateCallback);
+ return imsStateCallback;
+ }
+
+ private RegistrationManager.RegistrationCallback setUpImsEmergencyRegistrationCallback()
+ throws ImsException {
+ ImsStateCallback imsStateCallback = setUpImsStateCallback();
+ imsStateCallback.onAvailable();
+ processAllMessages();
+
+ ArgumentCaptor<RegistrationManager.RegistrationCallback> callbackCaptor =
+ ArgumentCaptor.forClass(RegistrationManager.RegistrationCallback.class);
+
+ verify(mMmTelManager).registerImsEmergencyRegistrationCallback(
+ any(Executor.class), callbackCaptor.capture());
+
+ RegistrationManager.RegistrationCallback registrationCallback = callbackCaptor.getValue();
+ assertNotNull(registrationCallback);
+ return registrationCallback;
+ }
+
+ private static ImsRegistrationAttributes getImsEmergencyRegistrationAttributes() {
+ return new ImsRegistrationAttributes.Builder(ImsRegistrationImplBase.REGISTRATION_TECH_LTE)
+ .setFlagRegistrationTypeEmergency()
+ .build();
+ }
+
+ private void processAllMessages() {
+ while (!mLooper.getLooper().getQueue().isIdle()) {
+ mLooper.processAllMessages();
+ }
+ }
+
+ private static void loge(String str) {
+ Log.e(TAG, str);
+ }
+}
diff --git a/tests/src/com/android/services/telephony/domainselection/NormalCallDomainSelectorTest.java b/tests/src/com/android/services/telephony/domainselection/NormalCallDomainSelectorTest.java
index 6e438bf..7acc7d6 100644
--- a/tests/src/com/android/services/telephony/domainselection/NormalCallDomainSelectorTest.java
+++ b/tests/src/com/android/services/telephony/domainselection/NormalCallDomainSelectorTest.java
@@ -19,6 +19,7 @@
import static android.telephony.DomainSelectionService.SELECTOR_TYPE_CALLING;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.any;
@@ -48,10 +49,13 @@
import android.telephony.ims.ImsManager;
import android.telephony.ims.ImsMmTelManager;
import android.telephony.ims.ImsReasonInfo;
+import android.testing.TestableLooper;
import android.util.Log;
import androidx.test.runner.AndroidJUnit4;
+import com.android.internal.telephony.CallFailCause;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -60,7 +64,6 @@
import org.mockito.MockitoAnnotations;
import java.util.List;
-import java.util.concurrent.Executors;
import java.util.function.Consumer;
/**
@@ -79,7 +82,7 @@
private HandlerThread mHandlerThread;
private NormalCallDomainSelector mNormalCallDomainSelector;
-
+ private TestableLooper mTestableLooper;
@Mock private Context mMockContext;
@Mock private CarrierConfigManager mMockCarrierConfigMgr;
@Mock private ImsManager mMockImsManager;
@@ -124,6 +127,12 @@
mNormalCallDomainSelector = new NormalCallDomainSelector(mMockContext, SLOT_ID, SUB_ID_1,
mHandlerThread.getLooper(), mMockImsStateTracker, mMockDestroyListener);
+
+ try {
+ setUpTestableLooper();
+ } catch (Exception e) {
+ fail(e.toString());
+ }
}
@After
@@ -131,6 +140,23 @@
if (mHandlerThread != null) {
mHandlerThread.quit();
}
+
+ if (mTestableLooper != null) {
+ mTestableLooper.destroy();
+ mTestableLooper = null;
+ }
+ }
+
+ private void setUpTestableLooper() throws Exception {
+ mTestableLooper = new TestableLooper(mNormalCallDomainSelector.getLooper());
+ }
+
+ private void processAllMessages() {
+ Log.d(TAG, "processAllMessages - start");
+ while (!mTestableLooper.getLooper().getQueue().isIdle()) {
+ mTestableLooper.processAllMessages();
+ }
+ Log.d(TAG, "processAllMessages - end");
}
private void initialize(ServiceState serviceState, boolean isImsRegistered,
@@ -154,22 +180,22 @@
@Test
public void testInitialState() {
- assertEquals(mNormalCallDomainSelector.getSelectorState(),
- NormalCallDomainSelector.SelectorState.INACTIVE);
+ assertEquals(NormalCallDomainSelector.SelectorState.INACTIVE,
+ mNormalCallDomainSelector.getSelectorState());
}
@Test
public void testDestroyedState() {
mNormalCallDomainSelector.destroy();
- assertEquals(mNormalCallDomainSelector.getSelectorState(),
- NormalCallDomainSelector.SelectorState.DESTROYED);
+ assertEquals(NormalCallDomainSelector.SelectorState.DESTROYED,
+ mNormalCallDomainSelector.getSelectorState());
}
@Test
public void testDestroyedDuringActiveState() {
- MockTransportSelectorCallback transportSelectorCallback =
- new MockTransportSelectorCallback(mNormalCallDomainSelector);
+ TestTransportSelectorCallback transportSelectorCallback =
+ new TestTransportSelectorCallback(mNormalCallDomainSelector);
DomainSelectionService.SelectionAttributes attributes =
new DomainSelectionService.SelectionAttributes.Builder(
@@ -183,19 +209,19 @@
mNormalCallDomainSelector.selectDomain(attributes, transportSelectorCallback);
- assertEquals(mNormalCallDomainSelector.getSelectorState(),
- NormalCallDomainSelector.SelectorState.ACTIVE);
+ assertEquals(NormalCallDomainSelector.SelectorState.ACTIVE,
+ mNormalCallDomainSelector.getSelectorState());
mNormalCallDomainSelector.destroy();
- assertEquals(mNormalCallDomainSelector.getSelectorState(),
- NormalCallDomainSelector.SelectorState.DESTROYED);
+ assertEquals(NormalCallDomainSelector.SelectorState.DESTROYED,
+ mNormalCallDomainSelector.getSelectorState());
}
@Test
public void testSelectDomainInputParams() {
- MockTransportSelectorCallback transportSelectorCallback =
- new MockTransportSelectorCallback(mNormalCallDomainSelector);
+ TestTransportSelectorCallback transportSelectorCallback =
+ new TestTransportSelectorCallback(mNormalCallDomainSelector);
DomainSelectionService.SelectionAttributes attributes =
new DomainSelectionService.SelectionAttributes.Builder(
@@ -208,8 +234,8 @@
.build();
mNormalCallDomainSelector.selectDomain(attributes, transportSelectorCallback);
- assertEquals(mNormalCallDomainSelector.getSelectorState(),
- NormalCallDomainSelector.SelectorState.ACTIVE);
+ assertEquals(NormalCallDomainSelector.SelectorState.ACTIVE,
+ mNormalCallDomainSelector.getSelectorState());
// Case 1: null inputs
try {
@@ -218,8 +244,8 @@
fail("Invalid input params not handled." + e.getMessage());
}
- assertEquals(mNormalCallDomainSelector.getSelectorState(),
- NormalCallDomainSelector.SelectorState.INACTIVE);
+ assertEquals(NormalCallDomainSelector.SelectorState.INACTIVE,
+ mNormalCallDomainSelector.getSelectorState());
// Case 2: null TransportSelectorCallback
try {
@@ -228,8 +254,8 @@
fail("Invalid params (SelectionAttributes) not handled." + e.getMessage());
}
- assertEquals(mNormalCallDomainSelector.getSelectorState(),
- NormalCallDomainSelector.SelectorState.INACTIVE);
+ assertEquals(NormalCallDomainSelector.SelectorState.INACTIVE,
+ mNormalCallDomainSelector.getSelectorState());
// Case 3: null SelectionAttributes
transportSelectorCallback.mSelectionTerminated = false;
@@ -239,11 +265,10 @@
fail("Invalid params (SelectionAttributes) not handled." + e.getMessage());
}
- assertTrue(transportSelectorCallback
- .verifyOnSelectionTerminated(DisconnectCause.OUTGOING_FAILURE));
-
- assertEquals(mNormalCallDomainSelector.getSelectorState(),
- NormalCallDomainSelector.SelectorState.DESTROYED);
+ assertTrue(transportSelectorCallback.mSelectionTerminated);
+ assertEquals(transportSelectorCallback.mCauseCode, DisconnectCause.OUTGOING_FAILURE);
+ assertEquals(NormalCallDomainSelector.SelectorState.DESTROYED,
+ mNormalCallDomainSelector.getSelectorState());
// Case 4: Invalid Subscription-id
attributes = new DomainSelectionService.SelectionAttributes.Builder(
@@ -260,11 +285,10 @@
fail("Invalid params (SelectionAttributes) not handled." + e.getMessage());
}
- assertTrue(transportSelectorCallback
- .verifyOnSelectionTerminated(DisconnectCause.OUTGOING_FAILURE));
-
- assertEquals(mNormalCallDomainSelector.getSelectorState(),
- NormalCallDomainSelector.SelectorState.DESTROYED);
+ assertTrue(transportSelectorCallback.mSelectionTerminated);
+ assertEquals(transportSelectorCallback.mCauseCode, DisconnectCause.OUTGOING_FAILURE);
+ assertEquals(NormalCallDomainSelector.SelectorState.DESTROYED,
+ mNormalCallDomainSelector.getSelectorState());
// Case 5: Invalid SELECTOR_TYPE
attributes =
@@ -282,11 +306,10 @@
fail("Invalid params (SelectionAttributes) not handled." + e.getMessage());
}
- assertTrue(transportSelectorCallback
- .verifyOnSelectionTerminated(DisconnectCause.OUTGOING_FAILURE));
-
- assertEquals(mNormalCallDomainSelector.getSelectorState(),
- NormalCallDomainSelector.SelectorState.DESTROYED);
+ assertTrue(transportSelectorCallback.mSelectionTerminated);
+ assertEquals(transportSelectorCallback.mCauseCode, DisconnectCause.OUTGOING_FAILURE);
+ assertEquals(NormalCallDomainSelector.SelectorState.DESTROYED,
+ mNormalCallDomainSelector.getSelectorState());
// Case 6: Emergency Call
attributes = new DomainSelectionService.SelectionAttributes.Builder(
@@ -303,17 +326,17 @@
fail("Invalid params (SelectionAttributes) not handled." + e.getMessage());
}
- assertEquals(mNormalCallDomainSelector.getSelectorState(),
- NormalCallDomainSelector.SelectorState.DESTROYED);
-
- assertTrue(transportSelectorCallback
- .verifyOnSelectionTerminated(DisconnectCause.OUTGOING_FAILURE));
+ assertTrue(transportSelectorCallback.mSelectionTerminated);
+ assertEquals(transportSelectorCallback.mCauseCode, DisconnectCause.OUTGOING_FAILURE);
+ assertEquals(NormalCallDomainSelector.SelectorState.DESTROYED,
+ mNormalCallDomainSelector.getSelectorState());
}
@Test
public void testOutOfService() {
- MockTransportSelectorCallback transportSelectorCallback =
- new MockTransportSelectorCallback(mNormalCallDomainSelector);
+ final TestTransportSelectorCallback transportSelectorCallback =
+ new TestTransportSelectorCallback(mNormalCallDomainSelector);
+
DomainSelectionService.SelectionAttributes attributes =
new DomainSelectionService.SelectionAttributes.Builder(
SLOT_ID, SUB_ID_1, SELECTOR_TYPE_CALLING)
@@ -330,17 +353,24 @@
mNormalCallDomainSelector.selectDomain(attributes, transportSelectorCallback);
- assertTrue(transportSelectorCallback
- .verifyOnSelectionTerminated(DisconnectCause.OUT_OF_SERVICE));
- assertEquals(mNormalCallDomainSelector.getSelectorState(),
- NormalCallDomainSelector.SelectorState.DESTROYED);
+ processAllMessages();
+ assertTrue(transportSelectorCallback.mSelectionTerminated);
+ assertEquals(DisconnectCause.OUT_OF_SERVICE, transportSelectorCallback.mCauseCode);
+
+ assertEquals(NormalCallDomainSelector.SelectorState.DESTROYED,
+ mNormalCallDomainSelector.getSelectorState());
}
@Test
public void testDomainSelection() {
- MockTransportSelectorCallback transportSelectorCallback =
- new MockTransportSelectorCallback(mNormalCallDomainSelector);
+ final TestTransportSelectorCallback transportSelectorCallback =
+ new TestTransportSelectorCallback(mNormalCallDomainSelector);
+
+ final ServiceState serviceState = new ServiceState();
+ serviceState.setState(ServiceState.STATE_IN_SERVICE);
+ initialize(serviceState, true, true, true, true);
+ transportSelectorCallback.reset();
DomainSelectionService.SelectionAttributes attributes =
new DomainSelectionService.SelectionAttributes.Builder(
SLOT_ID, SUB_ID_1, SELECTOR_TYPE_CALLING)
@@ -352,34 +382,17 @@
.build();
// Case 1: WLAN
- ServiceState serviceState = new ServiceState();
- serviceState.setState(ServiceState.STATE_IN_SERVICE);
- initialize(serviceState, true, true, true, true);
-
mNormalCallDomainSelector.selectDomain(attributes, transportSelectorCallback);
- assertTrue(transportSelectorCallback.verifyOnWlanSelected());
-
- assertEquals(mNormalCallDomainSelector.getSelectorState(),
- NormalCallDomainSelector.SelectorState.INACTIVE);
+ processAllMessages();
+ assertTrue(transportSelectorCallback.mWlanSelected);
+ assertEquals(NormalCallDomainSelector.SelectorState.INACTIVE,
+ mNormalCallDomainSelector.getSelectorState());
// Case 2: 5G
- mNormalCallDomainSelector.selectDomain(attributes, transportSelectorCallback);
-
+ serviceState.setState(ServiceState.STATE_IN_SERVICE);
initialize(serviceState, true, false, true, true);
- mNormalCallDomainSelector.selectDomain(attributes, transportSelectorCallback);
-
- assertTrue(transportSelectorCallback.verifyOnWwanSelected());
-
- assertTrue(transportSelectorCallback
- .verifyOnDomainSelected(NetworkRegistrationInfo.DOMAIN_PS));
-
- assertEquals(mNormalCallDomainSelector.getSelectorState(),
- NormalCallDomainSelector.SelectorState.INACTIVE);
-
- // Case 3: PS -> CS redial
- ImsReasonInfo imsReasonInfo = new ImsReasonInfo();
- imsReasonInfo.mCode = ImsReasonInfo.CODE_LOCAL_CALL_CS_RETRY_REQUIRED;
+ transportSelectorCallback.reset();
attributes = new DomainSelectionService.SelectionAttributes.Builder(
SLOT_ID, SUB_ID_1, SELECTOR_TYPE_CALLING)
.setAddress(TEST_URI)
@@ -387,54 +400,88 @@
.setEmergency(false)
.setVideoCall(false)
.setExitedFromAirplaneMode(false)
- .setPsDisconnectCause(imsReasonInfo)
+ .build();
+
+ mNormalCallDomainSelector.selectDomain(attributes, transportSelectorCallback);
+
+ processAllMessages();
+ assertTrue(transportSelectorCallback.mWwanSelected);
+ assertEquals(NetworkRegistrationInfo.DOMAIN_PS, transportSelectorCallback.mSelectedDomain);
+ assertEquals(NormalCallDomainSelector.SelectorState.INACTIVE,
+ mNormalCallDomainSelector.getSelectorState());
+
+
+ // Case 3: PS -> CS redial
+ final ImsReasonInfo imsReasonInfoCsRetry = new ImsReasonInfo(
+ ImsReasonInfo.CODE_LOCAL_CALL_CS_RETRY_REQUIRED, 0, null);
+ transportSelectorCallback.reset();
+ attributes = new DomainSelectionService.SelectionAttributes.Builder(
+ SLOT_ID, SUB_ID_1, SELECTOR_TYPE_CALLING)
+ .setAddress(TEST_URI)
+ .setCallId(TEST_CALLID)
+ .setEmergency(false)
+ .setVideoCall(false)
+ .setExitedFromAirplaneMode(false)
+ .setPsDisconnectCause(imsReasonInfoCsRetry)
.build();
mNormalCallDomainSelector.reselectDomain(attributes);
- assertTrue(transportSelectorCallback
- .verifyOnDomainSelected(NetworkRegistrationInfo.DOMAIN_CS));
-
- assertEquals(mNormalCallDomainSelector.getSelectorState(),
- NormalCallDomainSelector.SelectorState.INACTIVE);
+ processAllMessages();
+ assertEquals(transportSelectorCallback.mSelectedDomain, NetworkRegistrationInfo.DOMAIN_CS);
+ assertEquals(NormalCallDomainSelector.SelectorState.INACTIVE,
+ mNormalCallDomainSelector.getSelectorState());
// Case 4: CS call
+ transportSelectorCallback.reset();
+ initialize(serviceState, false, false, false, false);
NetworkRegistrationInfo nwRegistrationInfo = new NetworkRegistrationInfo(
NetworkRegistrationInfo.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
NetworkRegistrationInfo.REGISTRATION_STATE_HOME,
AccessNetworkConstants.AccessNetworkType.UTRAN, 0, false,
null, null, null, false, 0, 0, 0);
serviceState.addNetworkRegistrationInfo(nwRegistrationInfo);
+ attributes = new DomainSelectionService.SelectionAttributes.Builder(
+ SLOT_ID, SUB_ID_1, SELECTOR_TYPE_CALLING)
+ .setAddress(TEST_URI)
+ .setCallId(TEST_CALLID)
+ .setEmergency(false)
+ .setVideoCall(false)
+ .setExitedFromAirplaneMode(false)
+ .build();
mNormalCallDomainSelector.selectDomain(attributes, transportSelectorCallback);
- initialize(serviceState, false, false, false, false);
- mNormalCallDomainSelector.selectDomain(attributes, transportSelectorCallback);
-
- assertTrue(transportSelectorCallback.verifyOnWwanSelected());
-
- assertTrue(transportSelectorCallback
- .verifyOnDomainSelected(NetworkRegistrationInfo.DOMAIN_CS));
-
- assertEquals(mNormalCallDomainSelector.getSelectorState(),
- NormalCallDomainSelector.SelectorState.INACTIVE);
+ processAllMessages();
+ assertEquals(transportSelectorCallback.mSelectedDomain, NetworkRegistrationInfo.DOMAIN_CS);
+ assertEquals(NormalCallDomainSelector.SelectorState.INACTIVE,
+ mNormalCallDomainSelector.getSelectorState());
//Case 5: Backup calling
serviceState.setStateOutOfService();
+ transportSelectorCallback.reset();
+ attributes = new DomainSelectionService.SelectionAttributes.Builder(
+ SLOT_ID, SUB_ID_1, SELECTOR_TYPE_CALLING)
+ .setAddress(TEST_URI)
+ .setCallId(TEST_CALLID)
+ .setEmergency(false)
+ .setVideoCall(false)
+ .setExitedFromAirplaneMode(false)
+ .setPsDisconnectCause(imsReasonInfoCsRetry)
+ .build();
initialize(serviceState, true, true, true, true);
-
mNormalCallDomainSelector.selectDomain(attributes, transportSelectorCallback);
- assertTrue(transportSelectorCallback.verifyOnWlanSelected());
-
- assertEquals(mNormalCallDomainSelector.getSelectorState(),
- NormalCallDomainSelector.SelectorState.ACTIVE);
+ processAllMessages();
+ assertTrue(transportSelectorCallback.mWlanSelected);
+ assertEquals(NormalCallDomainSelector.SelectorState.INACTIVE,
+ mNormalCallDomainSelector.getSelectorState());
}
@Test
public void testWPSCallDomainSelection() {
- MockTransportSelectorCallback transportSelectorCallback =
- new MockTransportSelectorCallback(mNormalCallDomainSelector);
+ TestTransportSelectorCallback transportSelectorCallback =
+ new TestTransportSelectorCallback(mNormalCallDomainSelector);
DomainSelectionService.SelectionAttributes attributes =
new DomainSelectionService.SelectionAttributes.Builder(
SLOT_ID, SUB_ID_1, SELECTOR_TYPE_CALLING)
@@ -457,46 +504,43 @@
mNormalCallDomainSelector.selectDomain(attributes, transportSelectorCallback);
- assertTrue(transportSelectorCallback.verifyOnWwanSelected());
-
- assertTrue(transportSelectorCallback
- .verifyOnDomainSelected(NetworkRegistrationInfo.DOMAIN_CS));
-
- assertEquals(mNormalCallDomainSelector.getSelectorState(),
- NormalCallDomainSelector.SelectorState.INACTIVE);
+ processAllMessages();
+ assertTrue(transportSelectorCallback.mWwanSelected);
+ assertEquals(transportSelectorCallback.mSelectedDomain, NetworkRegistrationInfo.DOMAIN_CS);
+ assertEquals(NormalCallDomainSelector.SelectorState.INACTIVE,
+ mNormalCallDomainSelector.getSelectorState());
//Case 2: WPS supported by IMS and WLAN registered
+ transportSelectorCallback.reset();
config.putBoolean(CarrierConfigManager.KEY_SUPPORT_WPS_OVER_IMS_BOOL, true);
serviceState.setState(ServiceState.STATE_IN_SERVICE);
initialize(serviceState, true, true, true, true);
mNormalCallDomainSelector.selectDomain(attributes, transportSelectorCallback);
- assertTrue(transportSelectorCallback.verifyOnWlanSelected());
-
+ processAllMessages();
+ assertTrue(transportSelectorCallback.mWlanSelected);
assertEquals(mNormalCallDomainSelector.getSelectorState(),
NormalCallDomainSelector.SelectorState.INACTIVE);
//Case 2: WPS supported by IMS and LTE registered
+ transportSelectorCallback.reset();
config.putBoolean(CarrierConfigManager.KEY_SUPPORT_WPS_OVER_IMS_BOOL, true);
serviceState.setState(ServiceState.STATE_IN_SERVICE);
initialize(serviceState, true, false, true, true);
mNormalCallDomainSelector.selectDomain(attributes, transportSelectorCallback);
- assertTrue(transportSelectorCallback.verifyOnWwanSelected());
-
- assertTrue(transportSelectorCallback
- .verifyOnDomainSelected(NetworkRegistrationInfo.DOMAIN_PS));
-
- assertEquals(mNormalCallDomainSelector.getSelectorState(),
- NormalCallDomainSelector.SelectorState.INACTIVE);
+ processAllMessages();
+ assertEquals(transportSelectorCallback.mSelectedDomain, NetworkRegistrationInfo.DOMAIN_PS);
+ assertEquals(NormalCallDomainSelector.SelectorState.INACTIVE,
+ mNormalCallDomainSelector.getSelectorState());
}
@Test
public void testTtyCallDomainSelection() {
- MockTransportSelectorCallback transportSelectorCallback =
- new MockTransportSelectorCallback(mNormalCallDomainSelector);
+ TestTransportSelectorCallback transportSelectorCallback =
+ new TestTransportSelectorCallback(mNormalCallDomainSelector);
DomainSelectionService.SelectionAttributes attributes =
new DomainSelectionService.SelectionAttributes.Builder(
SLOT_ID, SUB_ID_1, SELECTOR_TYPE_CALLING)
@@ -520,42 +564,207 @@
mNormalCallDomainSelector.selectDomain(attributes, transportSelectorCallback);
- assertTrue(transportSelectorCallback.verifyOnWwanSelected());
-
- assertTrue(transportSelectorCallback
- .verifyOnDomainSelected(NetworkRegistrationInfo.DOMAIN_CS));
-
- assertEquals(mNormalCallDomainSelector.getSelectorState(),
- NormalCallDomainSelector.SelectorState.INACTIVE);
+ processAllMessages();
+ assertTrue(transportSelectorCallback.mWwanSelected);
+ assertEquals(transportSelectorCallback.mSelectedDomain, NetworkRegistrationInfo.DOMAIN_CS);
+ assertEquals(NormalCallDomainSelector.SelectorState.INACTIVE,
+ mNormalCallDomainSelector.getSelectorState());
//Case 2: TTY supported by IMS and TTY enabled
+ transportSelectorCallback.reset();
config.putBoolean(CarrierConfigManager.KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, true);
mNormalCallDomainSelector.selectDomain(attributes, transportSelectorCallback);
- assertTrue(transportSelectorCallback.verifyOnWwanSelected());
-
- assertTrue(transportSelectorCallback
- .verifyOnDomainSelected(NetworkRegistrationInfo.DOMAIN_PS));
-
- assertEquals(mNormalCallDomainSelector.getSelectorState(),
- NormalCallDomainSelector.SelectorState.INACTIVE);
+ processAllMessages();
+ assertEquals(transportSelectorCallback.mSelectedDomain, NetworkRegistrationInfo.DOMAIN_PS);
+ assertEquals(NormalCallDomainSelector.SelectorState.INACTIVE,
+ mNormalCallDomainSelector.getSelectorState());
//Case 3: TTY supported by IMS and TTY disabled
+ transportSelectorCallback.reset();
doReturn(TelecomManager.TTY_MODE_OFF).when(mMockTelecomManager).getCurrentTtyMode();
mNormalCallDomainSelector.selectDomain(attributes, transportSelectorCallback);
- assertTrue(transportSelectorCallback.verifyOnWwanSelected());
-
- assertTrue(transportSelectorCallback
- .verifyOnDomainSelected(NetworkRegistrationInfo.DOMAIN_PS));
-
- assertEquals(mNormalCallDomainSelector.getSelectorState(),
- NormalCallDomainSelector.SelectorState.INACTIVE);
+ processAllMessages();
+ assertEquals(transportSelectorCallback.mSelectedDomain, NetworkRegistrationInfo.DOMAIN_PS);
+ assertEquals(NormalCallDomainSelector.SelectorState.INACTIVE,
+ mNormalCallDomainSelector.getSelectorState());
}
+ @Test
+ public void testEmcCsFailureAndPsRedial() {
+ final TestTransportSelectorCallback transportSelectorCallback =
+ new TestTransportSelectorCallback(mNormalCallDomainSelector);
+ final ServiceState serviceState = new ServiceState();
- static class MockTransportSelectorCallback implements TransportSelectorCallback,
+ // dial CS call
+ serviceState.setState(ServiceState.STATE_IN_SERVICE);
+ initialize(serviceState, false, false, false, false);
+ NetworkRegistrationInfo nwRegistrationInfo = new NetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
+ NetworkRegistrationInfo.REGISTRATION_STATE_HOME,
+ AccessNetworkConstants.AccessNetworkType.UTRAN, 0, false,
+ null, null, null, false, 0, 0, 0);
+ serviceState.addNetworkRegistrationInfo(nwRegistrationInfo);
+ DomainSelectionService.SelectionAttributes attributes =
+ new DomainSelectionService.SelectionAttributes.Builder(
+ SLOT_ID, SUB_ID_1, SELECTOR_TYPE_CALLING)
+ .setAddress(TEST_URI)
+ .setCallId(TEST_CALLID)
+ .setEmergency(false)
+ .setVideoCall(false)
+ .setExitedFromAirplaneMode(false)
+ .build();
+
+ mNormalCallDomainSelector.selectDomain(attributes, transportSelectorCallback);
+
+ processAllMessages();
+ assertEquals(transportSelectorCallback.mSelectedDomain, NetworkRegistrationInfo.DOMAIN_CS);
+ assertEquals(NormalCallDomainSelector.SelectorState.INACTIVE,
+ mNormalCallDomainSelector.getSelectorState());
+
+ // EMC_REDIAL_ON_IMS
+ transportSelectorCallback.reset();
+ serviceState.setState(ServiceState.STATE_IN_SERVICE);
+ initialize(serviceState, true, false, true, false);
+ attributes = new DomainSelectionService.SelectionAttributes.Builder(
+ SLOT_ID, SUB_ID_1, SELECTOR_TYPE_CALLING)
+ .setAddress(TEST_URI)
+ .setCallId(TEST_CALLID)
+ .setEmergency(false)
+ .setVideoCall(false)
+ .setExitedFromAirplaneMode(false)
+ .setCsDisconnectCause(CallFailCause.EMC_REDIAL_ON_IMS)
+ .build();
+
+ mNormalCallDomainSelector.reselectDomain(attributes);
+
+ processAllMessages();
+ assertTrue(transportSelectorCallback.mWwanSelected);
+ assertEquals(NetworkRegistrationInfo.DOMAIN_PS, transportSelectorCallback.mSelectedDomain);
+ assertEquals(NormalCallDomainSelector.SelectorState.INACTIVE,
+ mNormalCallDomainSelector.getSelectorState());
+
+ // EMC_REDIAL_ON_VOWIFI
+ transportSelectorCallback.reset();
+ initialize(serviceState, true, true, true, false);
+ attributes = new DomainSelectionService.SelectionAttributes.Builder(
+ SLOT_ID, SUB_ID_1, SELECTOR_TYPE_CALLING)
+ .setAddress(TEST_URI)
+ .setCallId(TEST_CALLID)
+ .setEmergency(false)
+ .setVideoCall(false)
+ .setExitedFromAirplaneMode(false)
+ .setCsDisconnectCause(CallFailCause.EMC_REDIAL_ON_VOWIFI)
+ .build();
+
+ mNormalCallDomainSelector.reselectDomain(attributes);
+
+ processAllMessages();
+ assertTrue(transportSelectorCallback.mWlanSelected);
+ assertEquals(NormalCallDomainSelector.SelectorState.INACTIVE,
+ mNormalCallDomainSelector.getSelectorState());
+ }
+
+ @Test
+ public void testImsRegistrationStateTimeoutMessage() {
+ final TestTransportSelectorCallback transportSelectorCallback =
+ new TestTransportSelectorCallback(mNormalCallDomainSelector);
+
+ final ServiceState serviceState = new ServiceState();
+ serviceState.setState(ServiceState.STATE_IN_SERVICE);
+ mNormalCallDomainSelector.onServiceStateUpdated(serviceState);
+ doReturn(true).when(mMockImsStateTracker).isImsStateReady();
+ doReturn(true).when(mMockImsStateTracker).isImsRegistered();
+ doReturn(true).when(mMockImsStateTracker).isImsVoiceCapable();
+ doReturn(false).when(mMockImsStateTracker).isImsVideoCapable();
+ doReturn(true).when(mMockImsStateTracker).isImsRegisteredOverWlan();
+
+ DomainSelectionService.SelectionAttributes attributes =
+ new DomainSelectionService.SelectionAttributes.Builder(
+ SLOT_ID, SUB_ID_1, SELECTOR_TYPE_CALLING)
+ .setAddress(TEST_URI)
+ .setCallId(TEST_CALLID)
+ .setEmergency(false)
+ .setVideoCall(false)
+ .setExitedFromAirplaneMode(false)
+ .build();
+
+ mNormalCallDomainSelector.selectDomain(attributes, transportSelectorCallback);
+ assertTrue(mNormalCallDomainSelector.hasMessages(
+ NormalCallDomainSelector.MSG_WAIT_FOR_IMS_STATE_TIMEOUT));
+
+ mNormalCallDomainSelector.onImsRegistrationStateChanged();
+ mNormalCallDomainSelector.onImsMmTelCapabilitiesChanged();
+ processAllMessages();
+
+ assertFalse(mNormalCallDomainSelector.hasMessages(
+ NormalCallDomainSelector.MSG_WAIT_FOR_IMS_STATE_TIMEOUT));
+ assertTrue(transportSelectorCallback.mWlanSelected);
+ assertEquals(NormalCallDomainSelector.SelectorState.INACTIVE,
+ mNormalCallDomainSelector.getSelectorState());
+ }
+
+ @Test
+ public void testImsRegistrationStateTimeoutHandler() {
+ final TestTransportSelectorCallback transportSelectorCallback =
+ new TestTransportSelectorCallback(mNormalCallDomainSelector);
+
+ final ServiceState serviceState = new ServiceState();
+ serviceState.setState(ServiceState.STATE_IN_SERVICE);
+ mNormalCallDomainSelector.onServiceStateUpdated(serviceState);
+ doReturn(true).when(mMockImsStateTracker).isImsStateReady();
+ doReturn(false).when(mMockImsStateTracker).isImsRegistered();
+ doReturn(true).when(mMockImsStateTracker).isImsVoiceCapable();
+ doReturn(false).when(mMockImsStateTracker).isImsVideoCapable();
+ doReturn(true).when(mMockImsStateTracker).isImsRegisteredOverWlan();
+
+ DomainSelectionService.SelectionAttributes attributes =
+ new DomainSelectionService.SelectionAttributes.Builder(
+ SLOT_ID, SUB_ID_1, SELECTOR_TYPE_CALLING)
+ .setAddress(TEST_URI)
+ .setCallId(TEST_CALLID)
+ .setEmergency(false)
+ .setVideoCall(false)
+ .setExitedFromAirplaneMode(false)
+ .build();
+
+ mNormalCallDomainSelector.selectDomain(attributes, transportSelectorCallback);
+ assertTrue(mNormalCallDomainSelector.hasMessages(
+ NormalCallDomainSelector.MSG_WAIT_FOR_IMS_STATE_TIMEOUT));
+
+ mTestableLooper.moveTimeForward(
+ NormalCallDomainSelector.WAIT_FOR_IMS_STATE_TIMEOUT_MS + 10);
+ processAllMessages();
+
+ assertEquals(transportSelectorCallback.mSelectedDomain, NetworkRegistrationInfo.DOMAIN_CS);
+ assertEquals(NormalCallDomainSelector.SelectorState.INACTIVE,
+ mNormalCallDomainSelector.getSelectorState());
+ }
+
+ @Test
+ public void testReselectDomainNoTimeoutMessage() {
+ final TestTransportSelectorCallback transportSelectorCallback =
+ new TestTransportSelectorCallback(mNormalCallDomainSelector);
+
+ DomainSelectionService.SelectionAttributes attributes =
+ new DomainSelectionService.SelectionAttributes.Builder(
+ SLOT_ID, SUB_ID_1, SELECTOR_TYPE_CALLING)
+ .setAddress(TEST_URI)
+ .setCallId(TEST_CALLID)
+ .setEmergency(false)
+ .setVideoCall(false)
+ .setExitedFromAirplaneMode(false)
+ .build();
+
+ mNormalCallDomainSelector.selectDomain(null, transportSelectorCallback);
+ mNormalCallDomainSelector.reselectDomain(attributes);
+ assertFalse(mNormalCallDomainSelector.hasMessages(
+ NormalCallDomainSelector.MSG_WAIT_FOR_IMS_STATE_TIMEOUT));
+ }
+
+ static class TestTransportSelectorCallback implements TransportSelectorCallback,
WwanSelectorCallback {
public boolean mCreated;
public boolean mWlanSelected;
@@ -566,8 +775,9 @@
int mSelectedDomain;
NormalCallDomainSelector mNormalCallDomainSelector;
- MockTransportSelectorCallback(NormalCallDomainSelector normalCallDomainSelector) {
+ TestTransportSelectorCallback(NormalCallDomainSelector normalCallDomainSelector) {
mNormalCallDomainSelector = normalCallDomainSelector;
+ mCauseCode = DisconnectCause.NOT_VALID;
}
@Override
@@ -575,50 +785,21 @@
Log.d(TAG, "onCreated");
mCreated = true;
- assertEquals(mNormalCallDomainSelector.getSelectorState(),
- NormalCallDomainSelector.SelectorState.INACTIVE);
-
- notifyAll();
- }
-
- public boolean verifyOnCreated() {
- mCreated = false;
- Log.d(TAG, "verifyOnCreated");
- waitForCallback(mCreated);
- return mCreated;
+ assertEquals(NormalCallDomainSelector.SelectorState.INACTIVE,
+ mNormalCallDomainSelector.getSelectorState());
}
@Override
public synchronized void onWlanSelected(boolean useEmergencyPdn) {
Log.d(TAG, "onWlanSelected");
mWlanSelected = true;
-
- assertEquals(mNormalCallDomainSelector.getSelectorState(),
- NormalCallDomainSelector.SelectorState.INACTIVE);
-
- notifyAll();
- }
-
- public boolean verifyOnWlanSelected() {
- Log.d(TAG, "verifyOnWlanSelected");
- waitForCallback(mWlanSelected);
- return mWlanSelected;
}
@Override
public void onWwanSelected(final Consumer<WwanSelectorCallback> consumer) {
+ Log.d(TAG, "onWwanSelected");
mWwanSelected = true;
- Executors.newSingleThreadExecutor().execute(() -> {
- consumer.accept(this);
- });
-
- assertEquals(mNormalCallDomainSelector.getSelectorState(),
- NormalCallDomainSelector.SelectorState.INACTIVE);
- }
-
- public boolean verifyOnWwanSelected() {
- waitForCallback(mWwanSelected);
- return mWwanSelected;
+ consumer.accept(this);
}
@Override
@@ -627,31 +808,12 @@
mCauseCode = cause;
mSelectionTerminated = true;
- assertEquals(mNormalCallDomainSelector.getSelectorState(),
- NormalCallDomainSelector.SelectorState.INACTIVE);
+ assertEquals(NormalCallDomainSelector.SelectorState.INACTIVE,
+ mNormalCallDomainSelector.getSelectorState());
notifyAll();
}
- public boolean verifyOnSelectionTerminated(int cause) {
- Log.i(TAG, "verifyOnSelectionTerminated - called");
- waitForCallback(mSelectionTerminated);
- return (mSelectionTerminated && cause == mCauseCode);
- }
-
- private synchronized void waitForCallback(boolean condition) {
- long now = System.currentTimeMillis();
- long deadline = now + 1000;
- try {
- while (!condition && now < deadline) {
- wait(deadline - now);
- now = System.currentTimeMillis();
- }
- } catch (Exception e) {
- Log.i(TAG, e.getMessage());
- }
- }
-
@Override
public void onRequestEmergencyNetworkScan(@NonNull List<Integer> preferredNetworks,
int scanType,
@@ -667,18 +829,21 @@
Log.i(TAG, "onDomainSelected - called");
mSelectedDomain = domain;
mDomainSelected = true;
+ mWwanSelected = true;
- assertEquals(mNormalCallDomainSelector.getSelectorState(),
- NormalCallDomainSelector.SelectorState.INACTIVE);
+ assertEquals(NormalCallDomainSelector.SelectorState.INACTIVE,
+ mNormalCallDomainSelector.getSelectorState());
notifyAll();
}
-
- public boolean verifyOnDomainSelected(int domain) {
- Log.i(TAG, "verifyOnDomainSelected - called");
+ public void reset() {
+ mCreated = false;
+ mWlanSelected = false;
+ mWwanSelected = false;
+ mSelectionTerminated = false;
mDomainSelected = false;
- waitForCallback(mDomainSelected);
- return (domain == mSelectedDomain);
+ mCauseCode = DisconnectCause.NOT_VALID;
+ mSelectedDomain = NetworkRegistrationInfo.DOMAIN_UNKNOWN;
}
}
}
diff --git a/tests/src/com/android/services/telephony/domainselection/OWNERS b/tests/src/com/android/services/telephony/domainselection/OWNERS
index 2a76770..5874c98 100644
--- a/tests/src/com/android/services/telephony/domainselection/OWNERS
+++ b/tests/src/com/android/services/telephony/domainselection/OWNERS
@@ -1,7 +1,7 @@
# automatically inherit owners from fw/opt/telephony
hwangoo@google.com
-forestchoi@google.com
+jaesikkong@google.com
avinashmp@google.com
mkoon@google.com
seheele@google.com
diff --git a/utils/satellite/README.md b/utils/satellite/README.md
index 77ee0fb..34a8794 100644
--- a/utils/satellite/README.md
+++ b/utils/satellite/README.md
@@ -15,11 +15,15 @@
for dumping the binary file into human-readable format.
- `src/test` Contains the test code for the tools.
+`configdatagenerator`
+- `src/main` Contains the tool for generating satellite configdata protobuf file.
+- `src/test` Contains the test code for the configdatagenerator tool.
+
Run unit tests
=
- Build the tools and test code: Go to the tool directory (`packages/services/Telephony/tools/
satellite`) in the local workspace and run `mm`, e.g.,
-- Run unit tests: `$atest SatelliteToolsTests`
+- Run unit tests: `$atest SatelliteToolsTests`, `$atest SatelliteGenerateProtoTests`
Data file generate tools
=
@@ -43,6 +47,55 @@
- Example run command: `$satellite_createsats2file --input-file s2cells.txt --s2-level 12
--is-allowed-list true --output-file sats2.dat`
+`satellite_generateprotobuf`
+- Runs the `satellite_generateprotobuf` to create a binary file of TelephonyConfigProto whose format
+ is defined in telephony_config_update.proto
+- Command: `satellite_generateprotobuf --input-file <input.xml> --output-file <telephony_config.pb>`
+ - `--input-file` input XML file contains input information such as carrier id, carrier plmn,
+ allowed service list and country code list. This is example of input file.
+ ```xml
+ <satelliteconfig>
+ <!-- version -->
+ <version>14</version>
+
+ <!-- CarrierSupportedSatelliteServicesProto -->
+ <carriersupportedservices>
+ <carrier_id>1</carrier_id>
+ <providercapability>
+ <carrier_plmn>310160</carrier_plmn>
+ <service>1</service>
+ </providercapability>
+ <providercapability>
+ <carrier_plmn>310240</carrier_plmn>
+ <service>6</service>
+ </providercapability>
+ </carriersupportedservices>
+
+ <carriersupportedservices>
+ <carrier_id>1891</carrier_id>
+ <providercapability>
+ <carrier_plmn>45005</carrier_plmn>
+ <service>1</service>
+ <service>2</service>
+ </providercapability>
+ </carriersupportedservices>
+
+ <!-- SatelliteRegionProto -->
+ <satelliteregion>
+ <s2_cell_file>sats2.dat</s2_cell_file>
+ <country_code>US</country_code>
+ <country_code>KR</country_code>
+ <is_allowed>TRUE</is_allowed>
+ </satelliteregion>
+ </satelliteconfig>
+ ```
+ - `--output-file` The created binary TelephonyConfigProto file, which will be used by
+ the `ConfigUpdater` module for Satellite Project.
+- Build the tools: Go to the tool directory (`packages/services/Telephony/tools/satellite`)
+ in the local workspace and run `mm`.
+- Example run command: `satellite_generateprotobuf --input-file input.xml --output-file
+ telephony_config.pb`
+
Debug tools
=
@@ -64,4 +117,4 @@
`satellite_location_lookup`
- Check if a location is present in the input satellite S2 file.
- Run the tool: `$satellite_location_lookup --input-file <...> --lat-degrees <...>
- --lng-degrees <...>`
\ No newline at end of file
+ --lng-degrees <...>`
diff --git a/utils/satellite/configdatagenerator/Android.bp b/utils/satellite/configdatagenerator/Android.bp
new file mode 100644
index 0000000..b64b941
--- /dev/null
+++ b/utils/satellite/configdatagenerator/Android.bp
@@ -0,0 +1,49 @@
+// Copyright (C) 2024 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 {
+ default_team: "trendy_team_fwk_telephony",
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+java_library_host {
+ name: "satellite-generateproto-lib",
+ srcs: [
+ "src/main/java/**/*.java",
+ ],
+ static_libs: [
+ "telephony-config-update-proto-lite",
+ "jcommander",
+ ],
+}
+
+// A tool to generate configdata protubuf file
+java_binary_host {
+ name: "satellite_generateprotobuf",
+ main_class: "com.android.telephony.tools.configdatagenerate.ConfigDataGenerator",
+ static_libs: [
+ "satellite-generateproto-lib",
+ ],
+}
+
+// Tests for ConfigDataGenerator.
+java_test_host {
+ name: "SatelliteGenerateProtoTests",
+ srcs: ["src/test/java/**/*.java"],
+ static_libs: [
+ "junit",
+ "satellite-generateproto-lib",
+ ],
+ test_suites: ["general-tests"],
+}
diff --git a/utils/satellite/configdatagenerator/TEST_MAPPING b/utils/satellite/configdatagenerator/TEST_MAPPING
new file mode 100644
index 0000000..13a3e13
--- /dev/null
+++ b/utils/satellite/configdatagenerator/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "postsubmit": [
+ {
+ "name": "SatelliteGenerateProtoTests"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/utils/satellite/configdatagenerator/src/main/java/com/android/telephony/tools/configdatagenerate/ConfigDataGenerator.java b/utils/satellite/configdatagenerator/src/main/java/com/android/telephony/tools/configdatagenerate/ConfigDataGenerator.java
new file mode 100644
index 0000000..7e29e9a
--- /dev/null
+++ b/utils/satellite/configdatagenerator/src/main/java/com/android/telephony/tools/configdatagenerate/ConfigDataGenerator.java
@@ -0,0 +1,233 @@
+/*
+ * Copyright (C) 2024 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.telephony.tools.configdatagenerate;
+
+import com.beust.jcommander.JCommander;
+import com.beust.jcommander.Parameter;
+import com.beust.jcommander.ParameterException;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+/** Creates a protubuf file **/
+public class ConfigDataGenerator {
+ public static final String TAG_SATELLITE_CONFIG = "satelliteconfig";
+ public static final String TAG_VERSION = "version";
+ public static final String TAG_SUPPORTED_SERVICES = "carriersupportedservices";
+ public static final String TAG_CARRIER_ID = "carrier_id";
+ public static final String TAG_PROVIDER_CAPABILITY = "providercapability";
+ public static final String TAG_CARRIER_PLMN = "carrier_plmn";
+ public static final String TAG_SERVICE = "service";
+ public static final String TAG_SATELLITE_REGION = "satelliteregion";
+ public static final String TAG_S2_CELL_FILE = "s2_cell_file";
+ public static final String TAG_COUNTRY_CODE = "country_code";
+ public static final String TAG_IS_ALLOWED = "is_allowed";
+
+ /**
+ * Creates a protubuf file with user inputs
+ */
+ public static void main(String[] args) {
+ Arguments arguments = new Arguments();
+ JCommander.newBuilder()
+ .addObject(arguments)
+ .build()
+ .parse(args);
+ // Refer to the README file for an example of the input XML file
+ String inputFile = arguments.inputFile;
+ String outputFile = arguments.outputFile;
+ SatelliteConfigProtoGenerator.sProtoResultFile = outputFile;
+
+ Document doc = getDocumentFromInput(inputFile);
+
+ setSatelliteConfigVersion(doc);
+ createStarlinkConfigProto(doc);
+ createSkyloConfigProto(doc);
+
+ SatelliteConfigProtoGenerator.generateProto();
+
+ System.out.print("\n" + SatelliteConfigProtoGenerator.sProtoResultFile + " is generated\n");
+ }
+
+ private static class Arguments {
+ @Parameter(names = "--input-file",
+ description = "input xml file",
+ required = true)
+ public String inputFile;
+
+ @Parameter(names = "--output-file",
+ description = "out protobuf file",
+ required = false)
+ public String outputFile = SatelliteConfigProtoGenerator.sProtoResultFile;
+ }
+
+ private static Document getDocumentFromInput(String inputFile) {
+ File xmlFile = new File(inputFile);
+ DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
+ DocumentBuilder dBuilder = null;
+ Document doc = null;
+ try {
+ dBuilder = dbFactory.newDocumentBuilder();
+ doc = dBuilder.parse(xmlFile);
+ } catch (ParserConfigurationException | SAXException | IOException e) {
+ throw new RuntimeException("getDocumentFromInput: e=" + e);
+ }
+ doc.getDocumentElement().normalize();
+ return doc;
+ }
+
+ /**
+ * Set version after getting version from the input document
+ *
+ * @param doc the input document. Format of document should be
+ * <pre>
+ * <version>value1</version>
+ * </pre>
+ */
+ public static void setSatelliteConfigVersion(Document doc) {
+ NodeList versionList = doc.getElementsByTagName(TAG_VERSION);
+ Node versionNode = versionList.item(0);
+ System.out.println("Version: " + versionNode.getTextContent());
+ SatelliteConfigProtoGenerator.sVersion = Integer.parseInt(versionNode.getTextContent());
+ }
+
+
+ /**
+ * Creates a list of ServiceProto from the input document
+ *
+ * @param doc the input document. Format of document should be
+ * <pre>
+ * <carriersupportedservices>
+ * <carrier_id>value1</carrier_id>
+ * <providercapability>
+ * <carrier_plmn>value2</carrier_plmn>
+ * <service>value3</service>
+ * </providercapability>
+ * </carriersupportedservices>
+ * </pre>
+ */
+ public static void createStarlinkConfigProto(Document doc) {
+ NodeList carrierServicesList = doc.getElementsByTagName(TAG_SUPPORTED_SERVICES);
+ SatelliteConfigProtoGenerator.sServiceProtoList = new ArrayList<>();
+ for (int i = 0; i < carrierServicesList.getLength(); i++) {
+ Node carrierServiceNode = carrierServicesList.item(i);
+ if (carrierServiceNode.getNodeType() == Node.ELEMENT_NODE) {
+ Element carrierServiceElement = (Element) carrierServiceNode;
+ String carrierId = carrierServiceElement.getElementsByTagName(TAG_CARRIER_ID)
+ .item(0).getTextContent();
+ System.out.println("\nCarrier ID: " + carrierId);
+
+ NodeList providerCapabilityList = carrierServiceElement.getElementsByTagName(
+ TAG_PROVIDER_CAPABILITY);
+ ProviderCapabilityProto[] capabilityProtoList =
+ new ProviderCapabilityProto[providerCapabilityList.getLength()];
+ for (int j = 0; j < providerCapabilityList.getLength(); j++) {
+ Node providerCapabilityNode = providerCapabilityList.item(j);
+ if (providerCapabilityNode.getNodeType() == Node.ELEMENT_NODE) {
+ Element providerCapabilityElement = (Element) providerCapabilityNode;
+ String carrierPlmn = providerCapabilityElement.getElementsByTagName(
+ TAG_CARRIER_PLMN).item(0).getTextContent();
+ System.out.println(" Carrier PLMN: " + carrierPlmn);
+ if (!Util.isValidPlmn(carrierPlmn)) {
+ throw new ParameterException("Invalid plmn:" + carrierPlmn);
+ }
+
+ NodeList allowedServicesList = providerCapabilityElement
+ .getElementsByTagName(TAG_SERVICE);
+ System.out.print(" Allowed services: ");
+ int[] allowedServiceArray = new int[allowedServicesList.getLength()];
+ for (int k = 0; k < allowedServicesList.getLength(); k++) {
+ int service = Integer.parseInt(allowedServicesList.item(k)
+ .getTextContent());
+ System.out.print(service + " ");
+ if (!Util.isValidService(service)) {
+ throw new ParameterException("Invalid service:" + service);
+ }
+ allowedServiceArray[k] = service;
+ }
+ System.out.println();
+ ProviderCapabilityProto capabilityProto =
+ new ProviderCapabilityProto(carrierPlmn, allowedServiceArray);
+ capabilityProtoList[j] = capabilityProto;
+ }
+ }
+ ServiceProto serviceProto = new ServiceProto(Integer.parseInt(carrierId),
+ capabilityProtoList);
+ SatelliteConfigProtoGenerator.sServiceProtoList.add(serviceProto);
+ }
+ }
+ }
+
+ /**
+ * Creates a RegionProto from the input document
+ *
+ * @param doc the input document. Format of document should be
+ * <pre>
+ * <satelliteregion>
+ * <s2_cell_file>value1</s2_cell_file>
+ * <country_code>value2</country_code>
+ * <country_code>value3</country_code>
+ * <is_allowed>value4</is_allowed>
+ * </satelliteregion>
+ * </pre>
+ */
+ public static void createSkyloConfigProto(Document doc) {
+ NodeList satelliteRegionList = doc.getElementsByTagName(TAG_SATELLITE_REGION);
+ Node satelliteRegionNode = satelliteRegionList.item(0);
+ if (satelliteRegionNode != null && satelliteRegionNode.getNodeType() == Node.ELEMENT_NODE) {
+ Element satelliteRegionElement = (Element) satelliteRegionNode;
+ String s2CellFileName = satelliteRegionElement.getElementsByTagName(TAG_S2_CELL_FILE)
+ .item(0).getTextContent();
+ String isAllowedString = satelliteRegionElement.getElementsByTagName(TAG_IS_ALLOWED)
+ .item(0).getTextContent();
+ boolean isAllowed = false;
+ if (isAllowedString.equals("TRUE")) {
+ isAllowed = true;
+ }
+ System.out.println("\nSatellite Region:");
+ System.out.println(" S2 Cell File: " + s2CellFileName);
+ System.out.println(" Is Allowed: " + isAllowed);
+
+ NodeList countryCodesList = satelliteRegionElement.getElementsByTagName(
+ TAG_COUNTRY_CODE);
+ String[] listCountryCode = new String[countryCodesList.getLength()];
+ System.out.print(" Country Codes: ");
+ for (int k = 0; k < countryCodesList.getLength(); k++) {
+ String countryCode = countryCodesList.item(k).getTextContent();
+ System.out.print(countryCode + " ");
+ if (!Util.isValidCountryCode(countryCode)) {
+ throw new ParameterException("Invalid countryCode:" + countryCode);
+ }
+ listCountryCode[k] = countryCode;
+ }
+ System.out.println();
+ SatelliteConfigProtoGenerator.sRegionProto =
+ new RegionProto(s2CellFileName, listCountryCode, isAllowed);
+ }
+ }
+}
+
diff --git a/utils/satellite/configdatagenerator/src/main/java/com/android/telephony/tools/configdatagenerate/ProviderCapabilityProto.java b/utils/satellite/configdatagenerator/src/main/java/com/android/telephony/tools/configdatagenerate/ProviderCapabilityProto.java
new file mode 100644
index 0000000..9fe692d
--- /dev/null
+++ b/utils/satellite/configdatagenerator/src/main/java/com/android/telephony/tools/configdatagenerate/ProviderCapabilityProto.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2024 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.telephony.tools.configdatagenerate;
+
+public class ProviderCapabilityProto {
+
+ public String mPlmn;
+ public int[] mAllowedServices;
+
+ public ProviderCapabilityProto(String plmn, int[] allowedServices) {
+ mPlmn = plmn;
+ mAllowedServices = allowedServices;
+ }
+}
diff --git a/utils/satellite/configdatagenerator/src/main/java/com/android/telephony/tools/configdatagenerate/RegionProto.java b/utils/satellite/configdatagenerator/src/main/java/com/android/telephony/tools/configdatagenerate/RegionProto.java
new file mode 100644
index 0000000..be3b0cc
--- /dev/null
+++ b/utils/satellite/configdatagenerator/src/main/java/com/android/telephony/tools/configdatagenerate/RegionProto.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2024 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.telephony.tools.configdatagenerate;
+
+public class RegionProto {
+
+ String mS2CellFileName;
+ String[] mCountryCodeList;
+ boolean mIsAllowed;
+
+ public RegionProto(String s2CellFileName, String[] countryCodeList, boolean isAllowed) {
+ mS2CellFileName = s2CellFileName;
+ mCountryCodeList = countryCodeList;
+ mIsAllowed = isAllowed;
+ }
+}
diff --git a/utils/satellite/configdatagenerator/src/main/java/com/android/telephony/tools/configdatagenerate/SatelliteConfigProtoGenerator.java b/utils/satellite/configdatagenerator/src/main/java/com/android/telephony/tools/configdatagenerate/SatelliteConfigProtoGenerator.java
new file mode 100644
index 0000000..740e2ea
--- /dev/null
+++ b/utils/satellite/configdatagenerator/src/main/java/com/android/telephony/tools/configdatagenerate/SatelliteConfigProtoGenerator.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2024 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.telephony.tools.configdatagenerate;
+
+import com.android.internal.telephony.satellite.SatelliteConfigData;
+
+import com.google.protobuf.ByteString;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+
+public class SatelliteConfigProtoGenerator {
+
+ private static final String TAG = "ProtoGenerator";
+ public static String sProtoResultFile = "telephony_config.pb";
+ public static int sVersion;
+ public static ArrayList<ServiceProto> sServiceProtoList;
+ public static RegionProto sRegionProto;
+
+ /**
+ * Generate Protobuf.
+ *
+ * The output file is a binary file of TelephonyConfigProto.
+ *
+ * The format of TelephonyConfigProto is defined in
+ * https://source.corp.google.com/android/frameworks/opt/telephony/proto/src/
+ * telephony_config_update.proto
+ */
+ public static void generateProto() {
+ SatelliteConfigData.TelephonyConfigProto.Builder telephonyConfigBuilder =
+ SatelliteConfigData.TelephonyConfigProto.newBuilder();
+ SatelliteConfigData.SatelliteConfigProto.Builder satelliteConfigBuilder =
+ SatelliteConfigData.SatelliteConfigProto.newBuilder();
+
+ satelliteConfigBuilder.setVersion(sVersion); // Input version
+
+ if (sServiceProtoList != null) {
+ // carrierSupportedSatelliteServiceBuilder
+ SatelliteConfigData.CarrierSupportedSatelliteServicesProto.Builder
+ carrierSupportedSatelliteServiceBuilder =
+ SatelliteConfigData.CarrierSupportedSatelliteServicesProto.newBuilder();
+ for (int i = 0; i < sServiceProtoList.size(); i++) {
+ ServiceProto proto = sServiceProtoList.get(i);
+ carrierSupportedSatelliteServiceBuilder.setCarrierId(proto.mCarrierId);
+ SatelliteConfigData.SatelliteProviderCapabilityProto.Builder
+ satelliteProviderCapabilityBuilder =
+ SatelliteConfigData.SatelliteProviderCapabilityProto.newBuilder();
+ ProviderCapabilityProto[] capabilityProtoList = proto.mCapabilityProtoList;
+ for (int j = 0; j < capabilityProtoList.length; j++) {
+ ProviderCapabilityProto capabilityProto = capabilityProtoList[j];
+ satelliteProviderCapabilityBuilder.setCarrierPlmn(capabilityProto.mPlmn);
+ int[] allowedServiceList = capabilityProto.mAllowedServices;
+ for (int k = 0; k < allowedServiceList.length; k++) {
+ satelliteProviderCapabilityBuilder
+ .addAllowedServices(allowedServiceList[k]);
+ }
+ carrierSupportedSatelliteServiceBuilder
+ .addSupportedSatelliteProviderCapabilities(
+ satelliteProviderCapabilityBuilder);
+ satelliteProviderCapabilityBuilder.clear();
+ }
+ satelliteConfigBuilder.addCarrierSupportedSatelliteServices(
+ carrierSupportedSatelliteServiceBuilder);
+ carrierSupportedSatelliteServiceBuilder.clear();
+ }
+ } else {
+ System.out.print("ServiceProtoList does not exist");
+ }
+
+ if (sRegionProto != null) {
+ // satelliteRegionBuilder
+ SatelliteConfigData.SatelliteRegionProto.Builder satelliteRegionBuilder =
+ SatelliteConfigData.SatelliteRegionProto.newBuilder();
+ byte[] binaryData;
+ try {
+ binaryData = readFileToByteArray(sRegionProto.mS2CellFileName);
+ } catch (IOException e) {
+ throw new RuntimeException("Got exception in reading the file "
+ + sRegionProto.mS2CellFileName + ", e=" + e);
+ }
+ if (binaryData != null) {
+ satelliteRegionBuilder.setS2CellFile(ByteString.copyFrom(binaryData));
+ }
+
+ String[] countryCodeList = sRegionProto.mCountryCodeList;
+ for (int i = 0; i < countryCodeList.length; i++) {
+ satelliteRegionBuilder.addCountryCodes(countryCodeList[i]);
+ }
+ satelliteRegionBuilder.setIsAllowed(sRegionProto.mIsAllowed);
+ satelliteConfigBuilder.setDeviceSatelliteRegion(satelliteRegionBuilder);
+ } else {
+ System.out.print("RegionProto does not exist");
+ }
+
+ telephonyConfigBuilder.setSatellite(satelliteConfigBuilder);
+
+ writeToResultFile(telephonyConfigBuilder);
+ }
+
+ private static void writeToResultFile(SatelliteConfigData
+ .TelephonyConfigProto.Builder telephonyConfigBuilder) {
+ try {
+ File file = new File(sProtoResultFile);
+ if (file.exists()) {
+ file.delete();
+ }
+ FileOutputStream fos = new FileOutputStream(file);
+ SatelliteConfigData.TelephonyConfigProto telephonyConfigData =
+ telephonyConfigBuilder.build();
+ telephonyConfigData.writeTo(fos);
+
+ fos.close();
+ } catch (Exception e) {
+ throw new RuntimeException("Got exception in writing the file "
+ + sProtoResultFile + ", e=" + e);
+ }
+ }
+
+ private static byte[] readFileToByteArray(String fileName) throws IOException {
+ File sat2File = new File(fileName);
+ if (!sat2File.exists()) {
+ throw new IOException("sat2File " + fileName + " does not exist");
+ }
+
+ if (sat2File.exists() && sat2File.canRead()) {
+ FileInputStream fileInputStream = new FileInputStream(sat2File);
+ long fileSize = fileInputStream.available();
+ byte[] bytes = new byte[(int) fileSize];
+ int bytesRead = fileInputStream.read(bytes);
+ fileInputStream.close();
+ if (bytesRead != fileSize) {
+ throw new IOException("file read fail: " + sat2File.getCanonicalPath());
+ }
+ return bytes;
+ }
+ return null;
+ }
+}
diff --git a/utils/satellite/configdatagenerator/src/main/java/com/android/telephony/tools/configdatagenerate/ServiceProto.java b/utils/satellite/configdatagenerator/src/main/java/com/android/telephony/tools/configdatagenerate/ServiceProto.java
new file mode 100644
index 0000000..a17e1dd
--- /dev/null
+++ b/utils/satellite/configdatagenerator/src/main/java/com/android/telephony/tools/configdatagenerate/ServiceProto.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2024 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.telephony.tools.configdatagenerate;
+
+public class ServiceProto {
+
+ public int mCarrierId;
+ public ProviderCapabilityProto[] mCapabilityProtoList;
+
+ public ServiceProto(int carrierId, ProviderCapabilityProto[] capabilityProtolist) {
+ mCarrierId = carrierId;
+ mCapabilityProtoList = capabilityProtolist;
+ }
+}
diff --git a/utils/satellite/configdatagenerator/src/main/java/com/android/telephony/tools/configdatagenerate/Util.java b/utils/satellite/configdatagenerator/src/main/java/com/android/telephony/tools/configdatagenerate/Util.java
new file mode 100644
index 0000000..925e828
--- /dev/null
+++ b/utils/satellite/configdatagenerator/src/main/java/com/android/telephony/tools/configdatagenerate/Util.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2024 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.telephony.tools.configdatagenerate;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class Util {
+
+ public static final int SERVICE_TYPE_VOICE = 1;
+ public static final int SERVICE_TYPE_MMS = 6;
+
+ private static final int FIRST_SERVICE_TYPE = SERVICE_TYPE_VOICE;
+ private static final int LAST_SERVICE_TYPE = SERVICE_TYPE_MMS;
+
+ private static boolean isValidPattern(String input, String regex) {
+ if ((input == null) || (regex == null)) {
+ return false;
+ }
+ Pattern pattern = Pattern.compile(regex);
+ Matcher matcher = pattern.matcher(input);
+ if (!matcher.matches()) {
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * @param countryCode two letters country code based on the ISO 3166-1.
+ * @return {@code true} if the countryCode is valid {@code false} otherwise.
+ */
+ public static boolean isValidCountryCode(String countryCode) {
+ return isValidPattern(countryCode, "^[A-Za-z]{2}$");
+ }
+
+ /**
+ * @param plmn target plmn for validation.
+ * @return {@code true} if the target plmn is valid {@code false} otherwise.
+ */
+ public static boolean isValidPlmn(String plmn) {
+ return isValidPattern(plmn, "^(?:[0-9]{3})(?:[0-9]{2}|[0-9]{3})$");
+ }
+
+ /**
+ * @param serviceType target serviceType for validation.
+ * @return {@code true} if the target serviceType is valid {@code false} otherwise.
+ */
+ public static boolean isValidService(int serviceType) {
+ if (serviceType < FIRST_SERVICE_TYPE || serviceType > LAST_SERVICE_TYPE) {
+ return false;
+ }
+ return true;
+ }
+}
diff --git a/utils/satellite/configdatagenerator/src/test/java/com/android/telephony/tools/configdatagenerate/ConfigDataGeneratorTest.java b/utils/satellite/configdatagenerator/src/test/java/com/android/telephony/tools/configdatagenerate/ConfigDataGeneratorTest.java
new file mode 100644
index 0000000..f588815
--- /dev/null
+++ b/utils/satellite/configdatagenerator/src/test/java/com/android/telephony/tools/configdatagenerate/ConfigDataGeneratorTest.java
@@ -0,0 +1,324 @@
+/*
+ * Copyright (C) 2024 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.telephony.tools.configdatagenerate;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
+
+import com.android.internal.telephony.satellite.SatelliteConfigData.CarrierSupportedSatelliteServicesProto;
+import com.android.internal.telephony.satellite.SatelliteConfigData.SatelliteConfigProto;
+import com.android.internal.telephony.satellite.SatelliteConfigData.SatelliteProviderCapabilityProto;
+import com.android.internal.telephony.satellite.SatelliteConfigData.SatelliteRegionProto;
+import com.android.internal.telephony.satellite.SatelliteConfigData.TelephonyConfigProto;
+
+import com.google.protobuf.ByteString;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+public class ConfigDataGeneratorTest {
+ private Path mTempDirPath;
+
+ @Before
+ public void setUp() throws IOException {
+ mTempDirPath = createTempDir(this.getClass());
+ }
+
+ @After
+ public void tearDown() throws IOException {
+ if (mTempDirPath != null) {
+ deleteDirectory(mTempDirPath);
+ }
+ }
+
+ @Test
+ public void testConfigDataGeneratorWithInvalidPlmn() throws Exception {
+ Path inputDirPath = mTempDirPath.resolve("input");
+ Files.createDirectory(inputDirPath);
+ Path inputFilePath = inputDirPath.resolve("test_input.xml");
+ Path inputS2CellFilePath = inputDirPath.resolve("sats2.dat");
+
+ Path outputDirPath = mTempDirPath.resolve("output");
+ Files.createDirectory(outputDirPath);
+ Path outputFilePath = outputDirPath.resolve("test_out.pb");
+ String inputfileName = inputFilePath.toAbsolutePath().toString();
+ String inputS2CellFileName = inputS2CellFilePath.toAbsolutePath().toString();
+ File inputFile = new File(inputfileName);
+ ByteString inputByteStringForS2Cell = ByteString.copyFromUtf8("Test ByteString!");
+ writeByteStringToFile(inputS2CellFileName, inputByteStringForS2Cell);
+
+ createInputXml(inputFile, 14, 1, "310062222", 1,
+ "US", true, inputS2CellFileName);
+ String[] args = {
+ "--input-file", inputFilePath.toAbsolutePath().toString(),
+ "--output-file", outputFilePath.toAbsolutePath().toString()
+ };
+ try {
+ ConfigDataGenerator.main(args);
+ } catch (Exception ex) {
+ // Expected exception because input plmn is invalid
+ return;
+ }
+ fail("Exception should have been caught");
+ }
+
+ @Test
+ public void testConfigDataGeneratorWithInvalidService() throws Exception {
+ Path inputDirPath = mTempDirPath.resolve("input");
+ Files.createDirectory(inputDirPath);
+ Path inputFilePath = inputDirPath.resolve("test_input.xml");
+ Path inputS2CellFilePath = inputDirPath.resolve("sats2.dat");
+
+ Path outputDirPath = mTempDirPath.resolve("output");
+ Files.createDirectory(outputDirPath);
+ Path outputFilePath = outputDirPath.resolve("test_out.pb");
+ String inputfileName = inputFilePath.toAbsolutePath().toString();
+ String inputS2CellFileName = inputS2CellFilePath.toAbsolutePath().toString();
+ File inputFile = new File(inputfileName);
+ ByteString inputByteStringForS2Cell = ByteString.copyFromUtf8("Test ByteString!");
+ writeByteStringToFile(inputS2CellFileName, inputByteStringForS2Cell);
+
+ createInputXml(inputFile, 14, 1, "31006", -1,
+ "US", true, inputS2CellFileName);
+ String[] args = {
+ "--input-file", inputFilePath.toAbsolutePath().toString(),
+ "--output-file", outputFilePath.toAbsolutePath().toString()
+ };
+ try {
+ ConfigDataGenerator.main(args);
+ } catch (Exception ex) {
+ // Expected exception because input allowed service is invalid
+ return;
+ }
+ fail("Exception should have been caught");
+ }
+
+ @Test
+ public void testConfigDataGeneratorWithInvalidCountryCode() throws Exception {
+ Path inputDirPath = mTempDirPath.resolve("input");
+ Files.createDirectory(inputDirPath);
+ Path inputFilePath = inputDirPath.resolve("test_input.xml");
+ Path inputS2CellFilePath = inputDirPath.resolve("sats2.dat");
+
+ Path outputDirPath = mTempDirPath.resolve("output");
+ Files.createDirectory(outputDirPath);
+ Path outputFilePath = outputDirPath.resolve("test_out.pb");
+ String inputfileName = inputFilePath.toAbsolutePath().toString();
+ String inputS2CellFileName = inputS2CellFilePath.toAbsolutePath().toString();
+ File inputFile = new File(inputfileName);
+ ByteString inputByteStringForS2Cell = ByteString.copyFromUtf8("Test ByteString!");
+ writeByteStringToFile(inputS2CellFileName, inputByteStringForS2Cell);
+
+ createInputXml(inputFile, 14, 1, "31006", 1,
+ "USSSS", true, inputS2CellFileName);
+ String[] args = {
+ "--input-file", inputFilePath.toAbsolutePath().toString(),
+ "--output-file", outputFilePath.toAbsolutePath().toString()
+ };
+ try {
+ ConfigDataGenerator.main(args);
+ } catch (Exception ex) {
+ // Expected exception because input country code is invalid
+ return;
+ }
+ fail("Exception should have been caught");
+ }
+
+ @Test
+ public void testConfigDataGeneratorWithValidInput() throws Exception {
+ Path inputDirPath = mTempDirPath.resolve("input");
+ Files.createDirectory(inputDirPath);
+ Path inputFilePath = inputDirPath.resolve("test_input.xml");
+ Path inputS2CellFilePath = inputDirPath.resolve("sats2.dat");
+
+ Path outputDirPath = mTempDirPath.resolve("output");
+ Files.createDirectory(outputDirPath);
+ Path outputFilePath = outputDirPath.resolve("test_out.pb");
+ String inputfileName = inputFilePath.toAbsolutePath().toString();
+ String inputS2CellFileName = inputS2CellFilePath.toAbsolutePath().toString();
+ File inputFile = new File(inputfileName);
+ String outputFileName = outputFilePath.toAbsolutePath().toString();
+
+
+ int inputVersion = 14;
+ int inputCarrierId = 1;
+ String inputPlmn = "31006";
+ int inputAllowedService = 1;
+ String inputCountryCode = "US";
+ boolean inputIsAllowed = true;
+ ByteString inputByteStringForS2Cell = ByteString.copyFromUtf8("Test ByteString!");
+ writeByteStringToFile(inputS2CellFileName, inputByteStringForS2Cell);
+ createInputXml(inputFile, inputVersion, inputCarrierId, inputPlmn, inputAllowedService,
+ inputCountryCode, inputIsAllowed, inputS2CellFileName);
+ String[] args = {
+ "--input-file", inputFilePath.toAbsolutePath().toString(),
+ "--output-file", outputFilePath.toAbsolutePath().toString()
+ };
+ try {
+ ConfigDataGenerator.main(args);
+ } catch (Exception ex) {
+ fail("Unexpected exception when executing the tool ex=" + ex);
+ }
+
+ Path filePath = Paths.get(outputFileName);
+ byte[] fileBytes = Files.readAllBytes(filePath);
+ TelephonyConfigProto telephonyConfigProto = TelephonyConfigProto.parseFrom(fileBytes);
+ SatelliteConfigProto satelliteConfigProto = telephonyConfigProto.getSatellite();
+ int version = satelliteConfigProto.getVersion();
+ assertEquals(inputVersion, version);
+ CarrierSupportedSatelliteServicesProto serviceProto =
+ satelliteConfigProto.getCarrierSupportedSatelliteServices(0);
+ int carrierId = serviceProto.getCarrierId();
+ assertEquals(inputCarrierId, carrierId);
+ SatelliteProviderCapabilityProto providerCapabilityProto =
+ serviceProto.getSupportedSatelliteProviderCapabilities(0);
+ String plmn = providerCapabilityProto.getCarrierPlmn();
+ assertEquals(inputPlmn, plmn);
+ int allowedService = providerCapabilityProto.getAllowedServices(0);
+ assertEquals(inputAllowedService, allowedService);
+
+ SatelliteRegionProto regionProto = satelliteConfigProto.getDeviceSatelliteRegion();
+ String countryCode = regionProto.getCountryCodes(0);
+ assertEquals(inputCountryCode, countryCode);
+ ByteString s2cellfile = regionProto.getS2CellFile();
+ byte[] fileBytesForInputS2CellFile = Files.readAllBytes(Paths.get(inputS2CellFileName));
+ ByteString inputS2CellFile = ByteString.copyFrom(fileBytesForInputS2CellFile);
+ assertEquals(inputS2CellFile, s2cellfile);
+ boolean isAllowed = regionProto.getIsAllowed();
+ assertEquals(inputIsAllowed, isAllowed);
+ }
+
+ private void createInputXml(File outputFile, int version, int carrierId, String plmn,
+ int allowedService, String countryCode, boolean isAllowed, String inputS2CellFileName) {
+ try {
+ DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+ DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
+
+ // Create Document and Root Element
+ Document doc = docBuilder.newDocument();
+ Element rootElement = doc.createElement(ConfigDataGenerator.TAG_SATELLITE_CONFIG);
+ doc.appendChild(rootElement);
+
+ // Add <version>
+ Element versionElement = doc.createElement(ConfigDataGenerator.TAG_VERSION);
+ versionElement.appendChild(doc.createTextNode(String.valueOf(version)));
+ rootElement.appendChild(versionElement);
+
+ // Add <carriersupportedservices>
+ rootElement.appendChild(
+ createCarrierSupportedServices(doc, carrierId, plmn, allowedService));
+
+ // Add <satelliteregion>
+ Element satelliteRegion = doc.createElement(ConfigDataGenerator.TAG_SATELLITE_REGION);
+ satelliteRegion.appendChild(
+ createElementWithText(doc, ConfigDataGenerator.TAG_S2_CELL_FILE,
+ inputS2CellFileName));
+ satelliteRegion.appendChild(
+ createElementWithText(doc, ConfigDataGenerator.TAG_COUNTRY_CODE, countryCode));
+ satelliteRegion.appendChild(
+ createElementWithText(doc, ConfigDataGenerator.TAG_IS_ALLOWED,
+ isAllowed ? "TRUE" : "FALSE"));
+ rootElement.appendChild(satelliteRegion);
+
+ // Write XML to File
+ TransformerFactory transformerFactory = TransformerFactory.newInstance();
+ Transformer transformer = transformerFactory.newTransformer();
+ DOMSource source = new DOMSource(doc);
+ StreamResult result = new StreamResult(outputFile);
+ transformer.transform(source, result);
+
+ } catch (Exception e) {
+ throw new RuntimeException("Got exception in creating input file , e=" + e);
+ }
+ }
+
+ private static Element createCarrierSupportedServices(Document doc, int carrierId,
+ String carrierPlmn, int... services) {
+ Element carrierSupportedServices = doc.createElement(
+ ConfigDataGenerator.TAG_SUPPORTED_SERVICES);
+ carrierSupportedServices.appendChild(createElementWithText(doc,
+ ConfigDataGenerator.TAG_CARRIER_ID, String.valueOf(carrierId)));
+
+ Element providerCapability = doc.createElement(ConfigDataGenerator.TAG_PROVIDER_CAPABILITY);
+ providerCapability.appendChild(createElementWithText(doc,
+ ConfigDataGenerator.TAG_CARRIER_PLMN, carrierPlmn));
+ for (int service : services) {
+ providerCapability.appendChild(createElementWithText(doc,
+ ConfigDataGenerator.TAG_SERVICE, String.valueOf(service)));
+ }
+ carrierSupportedServices.appendChild(providerCapability);
+
+ return carrierSupportedServices;
+ }
+
+ private static Element createElementWithText(Document doc, String tagName, String textContent) {
+ Element element = doc.createElement(tagName);
+ element.appendChild(doc.createTextNode(textContent));
+ return element;
+ }
+
+ private static Path createTempDir(Class<?> testClass) throws IOException {
+ return Files.createTempDirectory(testClass.getSimpleName());
+ }
+
+ private static void deleteDirectory(Path dir) throws IOException {
+ Files.walkFileTree(dir, new SimpleFileVisitor<>() {
+ @Override
+ public FileVisitResult visitFile(Path path, BasicFileAttributes basicFileAttributes)
+ throws IOException {
+ Files.deleteIfExists(path);
+ return FileVisitResult.CONTINUE;
+ }
+
+ @Override
+ public FileVisitResult postVisitDirectory(Path path, IOException e) throws IOException {
+ Files.delete(path);
+ return FileVisitResult.CONTINUE;
+ }
+ });
+ assertFalse(Files.exists(dir));
+ }
+
+ private void writeByteStringToFile(String fileName, ByteString byteString) {
+ try (FileOutputStream fos = new FileOutputStream(fileName)) {
+ fos.write(byteString.toByteArray());
+ } catch (IOException e) {
+ System.err.println("Error writing to file: " + e.getMessage());
+ }
+ }
+}
diff --git a/utils/satellite/s2storage/src/readonly/java/com/android/telephony/sats2range/read/SuffixTableBlock.java b/utils/satellite/s2storage/src/readonly/java/com/android/telephony/sats2range/read/SuffixTableBlock.java
index 1a6fad7..90ddd89 100644
--- a/utils/satellite/s2storage/src/readonly/java/com/android/telephony/sats2range/read/SuffixTableBlock.java
+++ b/utils/satellite/s2storage/src/readonly/java/com/android/telephony/sats2range/read/SuffixTableBlock.java
@@ -100,7 +100,7 @@
if (blockData.getSize() == 0) {
throw new IllegalArgumentException("blockData=" + blockData + ", is zero length");
}
- IntValueTypedPackedTable packedTable = new IntValueTypedPackedTable(blockData);
+ IntValueTypedPackedTable packedTable = new IntValueTypedPackedTable(blockData, true);
PopulatedSuffixTableBlock delegate = new PopulatedSuffixTableBlock(fileFormat, packedTable);
return new SuffixTableBlock(fileFormat, delegate);
}
diff --git a/utils/satellite/s2storage/src/testutils/java/com/android/telephony/sats2range/testutils/TestUtils.java b/utils/satellite/s2storage/src/testutils/java/com/android/telephony/sats2range/testutils/TestUtils.java
index 3cf2c78..3dfc720 100644
--- a/utils/satellite/s2storage/src/testutils/java/com/android/telephony/sats2range/testutils/TestUtils.java
+++ b/utils/satellite/s2storage/src/testutils/java/com/android/telephony/sats2range/testutils/TestUtils.java
@@ -107,22 +107,19 @@
try (PrintStream printer = new PrintStream(outputFile)) {
// Range 1
for (int suffix = 1000; suffix < 2000; suffix++) {
- printer.println(
- Long.toUnsignedString(fileFormat.createCellId(0b100_11111111, suffix)));
+ printer.println(fileFormat.createCellId(0b100_11111111, suffix));
}
// Range 2
for (int suffix = 2001; suffix < 3000; suffix++) {
- printer.println(
- Long.toUnsignedString(fileFormat.createCellId(0b100_11111111, suffix)));
+ printer.println(fileFormat.createCellId(0b100_11111111, suffix));
}
// Range 3
for (int suffix = 1000; suffix < 2000; suffix++) {
- printer.println(
- Long.toUnsignedString(fileFormat.createCellId(0b101_11111111, suffix)));
+ printer.println(fileFormat.createCellId(0b101_11111111, suffix));
}
- printer.print(Long.toUnsignedString(fileFormat.createCellId(0b101_11111111, 2000)));
+ printer.print(fileFormat.createCellId(0b101_11111111, 2000));
printer.close();
}
@@ -133,13 +130,13 @@
File outputFile, SatS2RangeFileFormat fileFormat) throws Exception {
try (PrintStream printer = new PrintStream(outputFile)) {
// Valid line
- printer.println(Long.toUnsignedString(fileFormat.createCellId(0b100_11111111, 100)));
+ printer.println(fileFormat.createCellId(0b100_11111111, 100));
// Invalid line
printer.print("Invalid line");
// Another valid line
- printer.println(Long.toUnsignedString(fileFormat.createCellId(0b100_11111111, 200)));
+ printer.println(fileFormat.createCellId(0b100_11111111, 200));
printer.close();
}
diff --git a/utils/satellite/s2storage/src/write/java/com/android/telephony/sats2range/write/SuffixTableWriter.java b/utils/satellite/s2storage/src/write/java/com/android/telephony/sats2range/write/SuffixTableWriter.java
index d9e4575..dc265d5 100644
--- a/utils/satellite/s2storage/src/write/java/com/android/telephony/sats2range/write/SuffixTableWriter.java
+++ b/utils/satellite/s2storage/src/write/java/com/android/telephony/sats2range/write/SuffixTableWriter.java
@@ -68,8 +68,8 @@
byte[] blockSharedData = SuffixTableSharedDataWriter.toBytes(sharedData);
FileOutputStream fileOutputStream = new FileOutputStream(mFile);
boolean signedValue = false;
- mPackedTableWriter = PackedTableWriter.create(
- fileOutputStream, entrySizeByteCount, keySizeBits, signedValue, blockSharedData);
+ mPackedTableWriter = PackedTableWriter.create(fileOutputStream, entrySizeByteCount,
+ keySizeBits, signedValue, blockSharedData, true);
}
/** Returns a {@link BlockWriter} capable of generating the block data for an empty table. */
diff --git a/utils/satellite/tools/src/main/java/com/android/telephony/tools/sats2/SatS2FileCreator.java b/utils/satellite/tools/src/main/java/com/android/telephony/tools/sats2/SatS2FileCreator.java
index bc25d6b..dd7d8c0 100644
--- a/utils/satellite/tools/src/main/java/com/android/telephony/tools/sats2/SatS2FileCreator.java
+++ b/utils/satellite/tools/src/main/java/com/android/telephony/tools/sats2/SatS2FileCreator.java
@@ -42,8 +42,8 @@
public final class SatS2FileCreator {
/**
* @param inputFile The input text file containing the list of S2 Cell IDs. Each line in the
- * file contains a number in the range of an unsigned-64bit number which
- * represents the ID of a S2 cell.
+ * file contains a number in the range of a 64-bit number which represents the
+ * ID of a S2 cell.
* @param s2Level The S2 level of all S2 cells in the input file.
* @param isAllowedList {@code true} means the input file contains an allowed list of S2 cells.
* {@code false} means the input file contains a disallowed list of S2
@@ -133,7 +133,7 @@
* Read a list of S2 cells from the inputFile.
*
* @param inputFile A file containing the list of S2 cells. Each line in the inputFile contains
- * an unsigned long number - the ID of a S2 cell.
+ * a 64-bit number - the ID of a S2 cell.
* @return A list of S2 cells.
*/
private static List<Long> readS2CellsFromFile(String inputFile) throws Exception {
@@ -143,7 +143,7 @@
while (scanner.hasNextLine()) {
String line = scanner.nextLine();
try {
- s2Cells.add(Long.parseUnsignedLong(line));
+ s2Cells.add(Long.parseLong(line));
} catch (Exception ex) {
throw new IllegalStateException("Input s2 cell file has invalid format, "
+ "current line=" + line);
diff --git a/utils/satellite/tools/src/main/java/com/android/telephony/tools/sats2/SatS2LocationLookup.java b/utils/satellite/tools/src/main/java/com/android/telephony/tools/sats2/SatS2LocationLookup.java
index 444ff8d..713cca8 100644
--- a/utils/satellite/tools/src/main/java/com/android/telephony/tools/sats2/SatS2LocationLookup.java
+++ b/utils/satellite/tools/src/main/java/com/android/telephony/tools/sats2/SatS2LocationLookup.java
@@ -41,7 +41,8 @@
SatS2RangeFileReader.open(new File(arguments.inputFile))) {
S2CellId s2CellId = getS2CellId(arguments.latDegrees, arguments.lngDegrees,
satS2RangeFileReader.getS2Level());
- System.out.println("s2CellId=" + Long.toUnsignedString(s2CellId.id()));
+ System.out.println("s2CellId=" + Long.toUnsignedString(s2CellId.id())
+ + ", token=" + s2CellId.toToken());
if (satS2RangeFileReader.findEntryByCellId(s2CellId.id()) == null) {
System.out.println("The input file does not contain the input location");
} else {