Merge "Remove earfcn max value validation check" into main
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index a5c21a2..9e2e943 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -271,7 +271,7 @@
<string name="preferred_network_mode_nr_lte_tdscdma_wcdma_summary" msgid="5912457779733343522">"Föredraget nätverksläge: NR/LTE/TDSCDMA/WCDMA"</string>
<string name="preferred_network_mode_nr_lte_tdscdma_gsm_wcdma_summary" msgid="6769797110309412576">"Föredraget nätverksläge: NR/LTE/TDSCDMA/GSM/WCDMA"</string>
<string name="preferred_network_mode_nr_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="4260661428277578573">"Föredraget nätverksläge: NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
- <string name="call_category" msgid="4394703838833058138">"Ringer upp"</string>
+ <string name="call_category" msgid="4394703838833058138">"Samtal"</string>
<string name="network_operator_category" msgid="4992217193732304680">"Nätverk"</string>
<string name="enhanced_4g_lte_mode_title" msgid="4213420368777080540">"Förbättrat 4G LTE-läge"</string>
<!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (7240155150166394308) -->
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 27a9101..7cba4fc 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1836,7 +1836,7 @@
}
case CMD_MODEM_REBOOT:
request = (MainThreadRequest) msg.obj;
- onCompleted = obtainMessage(EVENT_RESET_MODEM_CONFIG_DONE, request);
+ onCompleted = obtainMessage(EVENT_CMD_MODEM_REBOOT_DONE, request);
defaultPhone.rebootModem(onCompleted);
break;
case EVENT_CMD_MODEM_REBOOT_DONE:
@@ -2577,6 +2577,7 @@
}
private void sendEraseModemConfig(@NonNull Phone phone) {
+ if (mFeatureFlags.cleanupCdma()) return;
Boolean success = (Boolean) sendRequest(CMD_ERASE_MODEM_CONFIG, null);
if (DBG) log("eraseModemConfig:" + ' ' + (success ? "ok" : "fail"));
}
@@ -6458,6 +6459,7 @@
*/
@Override
public boolean resetModemConfig(int slotIndex) {
+ if (mFeatureFlags.cleanupCdma()) return false;
Phone phone = PhoneFactory.getPhone(slotIndex);
if (phone != null) {
TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
@@ -9166,10 +9168,12 @@
}
String aid = null;
try {
- aid = UiccController.getInstance().getUiccPort(phone.getPhoneId())
- .getApplicationByType(appType).getAid();
+ UiccCardApplication app = UiccController.getInstance()
+ .getUiccPort(phone.getPhoneId()).getApplicationByType(appType);
+ if (app == null) return null;
+ aid = app.getAid();
} catch (Exception e) {
- Log.e(LOG_TAG, "Not getting aid. Exception ex=" + e);
+ Log.e(LOG_TAG, "Not getting aid", e);
}
return aid;
} finally {
@@ -9197,7 +9201,7 @@
try {
esn = phone.getEsn();
} catch (Exception e) {
- Log.e(LOG_TAG, "Not getting ESN. Exception ex=" + e);
+ Log.e(LOG_TAG, "Not getting ESN", e);
}
return esn;
} finally {
@@ -13333,12 +13337,9 @@
*
* @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.
- *
- * @throws SecurityException if the caller doesn't have the required permission.
*/
@Override
public void requestIsSatelliteSupported(@NonNull ResultReceiver result) {
- enforceSatelliteCommunicationPermission("requestIsSatelliteSupported");
final long identity = Binder.clearCallingIdentity();
try {
mSatelliteController.requestIsSatelliteSupported(result);
@@ -13784,6 +13785,26 @@
}
/**
+ * Request to get the name to display for Satellite subscription.
+ *
+ * @param result The result receiver that returns the display name to use for satellite feature
+ * in the UI for current satellite subscription 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 requestSatelliteDisplayName(@NonNull ResultReceiver result) {
+ enforceSatelliteCommunicationPermission("requestSatelliteDisplayName");
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ mSatelliteController.requestSatelliteDisplayName(result);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+ }
+
+ /**
* Request to get the currently selected satellite subscription id.
*
* @param result The result receiver that returns the currently selected satellite subscription
diff --git a/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java b/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java
index 9618f7a..c0f02cd 100644
--- a/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java
+++ b/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java
@@ -1491,10 +1491,8 @@
+ String.join(", ", mSatelliteDisallowedReasons.toString()));
notifySatelliteDisallowedReasonsChanged();
int subId = mSatelliteController.getSelectedSatelliteSubId();
- int carrierRoamingNtnConnectType =
- mSatelliteController.getCarrierRoamingNtnConnectType(subId);
if (mSatelliteController.isSatelliteSystemNotificationsEnabled(
- carrierRoamingNtnConnectType)) {
+ CarrierConfigManager.CARRIER_ROAMING_NTN_CONNECT_MANUAL)) {
showSatelliteSystemNotification();
}
}
diff --git a/src/com/android/phone/settings/RadioInfo.java b/src/com/android/phone/settings/RadioInfo.java
index 4d98d92..4a50296 100644
--- a/src/com/android/phone/settings/RadioInfo.java
+++ b/src/com/android/phone/settings/RadioInfo.java
@@ -206,7 +206,8 @@
ServiceState.RIL_RADIO_TECHNOLOGY_GSM,
ServiceState.RIL_RADIO_TECHNOLOGY_TD_SCDMA,
ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA,
- ServiceState.RIL_RADIO_TECHNOLOGY_NR
+ ServiceState.RIL_RADIO_TECHNOLOGY_NR,
+ ServiceState.RIL_RADIO_TECHNOLOGY_NB_IOT_NTN
};
private static String[] sPhoneIndexLabels = new String[0];