Merge "Try CSFB if emergency service is not supported in scanned network" into 24D1-dev
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 9b1c106..8b68df6 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -595,8 +595,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>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 45b04cc..db81f01 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -382,9 +382,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>
diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index 0a5122f..1386dce 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -2570,17 +2570,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);
diff --git a/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java b/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java
index 435601f..db47d67 100644
--- a/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java
+++ b/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java
@@ -2245,7 +2245,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 +2256,12 @@
ArgumentCaptor<android.telecom.Connection> connectionCaptor =
ArgumentCaptor.forClass(android.telecom.Connection.class);
- verify(mEmergencyStateTracker, times(1))
+ verify(mDomainSelectionResolver)
+ .getDomainSelectionConnection(eq(mPhone0), eq(SELECTOR_TYPE_CALLING), eq(true));
+ verify(mEmergencyStateTracker)
.startEmergencyCall(eq(mPhone0), connectionCaptor.capture(), eq(false));
verify(mSatelliteSOSMessageRecommender).onEmergencyCallStarted(any());
- verify(mDomainSelectionResolver, times(0))
- .getDomainSelectionConnection(eq(mPhone0), eq(SELECTOR_TYPE_CALLING), eq(true));
- verify(mEmergencyCallDomainSelectionConnection, times(0))
- .createEmergencyConnection(any(), any());
+ verify(mEmergencyCallDomainSelectionConnection).createEmergencyConnection(any(), any());
android.telecom.Connection tc = connectionCaptor.getValue();
@@ -2275,7 +2276,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