Merge "Disable CDMA calls" 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 8b5934f..bafcc6f 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -9201,10 +9201,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 {
@@ -9232,7 +9234,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 {
diff --git a/src/com/android/phone/satellite/accesscontrol/SatelliteAccessConfigurationParser.java b/src/com/android/phone/satellite/accesscontrol/SatelliteAccessConfigurationParser.java
index 895edfd..ad0926b 100644
--- a/src/com/android/phone/satellite/accesscontrol/SatelliteAccessConfigurationParser.java
+++ b/src/com/android/phone/satellite/accesscontrol/SatelliteAccessConfigurationParser.java
@@ -325,7 +325,7 @@
}
private static boolean isValidEarfcn(int earfcn) {
- if (earfcn >= 0 && earfcn <= 65535) {
+ if (earfcn >= 0) {
return true;
}
loge("isValidEarfcn: earfcn value is out of valid range: " + earfcn);
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];