Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d7e50ae authored Aug 01, 2023 by Rambo Wang Committed by Automerger Merge Worker Aug 01, 2023

Merge changes from topic "ANM-DSM-ENT-UP" into main am: d02ca165

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2683649

Change-Id: Ie6c9fdde29753c894a3061b42a4e0ce71baae94f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 93894636 d02ca165

src/java/com/android/internal/telephony/data/AccessNetworksManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -491,7 +491,7 @@ public class AccessNetworksManager extends Handler {
		b = mCarrierConfigManager.getConfigForSubId(mPhone.getSubId(),
		CarrierConfigManager
		.KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_PACKAGE_OVERRIDE_STRING);
		if (!b.isEmpty()) {
		if (b != null && !b.isEmpty()) {
		// If carrier config overrides it, use the one from carrier config
		String carrierConfigPackageName = b.getString(CarrierConfigManager
		.KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_PACKAGE_OVERRIDE_STRING);
		@@ -522,7 +522,7 @@ public class AccessNetworksManager extends Handler {
		b = mCarrierConfigManager.getConfigForSubId(mPhone.getSubId(),
		CarrierConfigManager
		.KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_CLASS_OVERRIDE_STRING);
		if (!b.isEmpty()) {
		if (b != null && !b.isEmpty()) {
		// If carrier config overrides it, use the one from carrier config
		String carrierConfigClassName = b.getString(CarrierConfigManager
		.KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_CLASS_OVERRIDE_STRING);

src/java/com/android/internal/telephony/data/DataServiceManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -630,13 +630,13 @@ public class DataServiceManager extends Handler {

		@NonNull
		private PersistableBundle getCarrierConfigSubset(String key) {
		PersistableBundle configs = new PersistableBundle();
		PersistableBundle configs = null;
		try {
		configs = mCarrierConfigManager.getConfigForSubId(mPhone.getSubId(), key);
		} catch (RuntimeException e) {
		loge("CarrierConfigLoader is not available.");
		}
		return configs;
		return configs != null ? configs : new PersistableBundle();
		}

		private void sendCompleteMessage(Message msg, @DataServiceCallback.ResultCode int code) {

src/java/com/android/internal/telephony/emergency/EmergencyNumberTracker.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -350,7 +350,7 @@ public class EmergencyNumberTracker extends Handler {

		@NonNull
		private PersistableBundle getCarrierConfigSubset(String key) {
		PersistableBundle bundle = new PersistableBundle();
		PersistableBundle bundle = null;

		if (mPhone != null) {
		CarrierConfigManager ccm =
		@@ -363,7 +363,7 @@ public class EmergencyNumberTracker extends Handler {
		loge("CarrierConfigLoader is not available.");
		}
		}
		return bundle;
		return bundle != null ? bundle : new PersistableBundle();
		}

		private String getInitialCountryIso() {

src/java/com/android/internal/telephony/uicc/UiccProfile.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -1819,13 +1819,13 @@ public class UiccProfile extends IccCard {

		@NonNull
		private PersistableBundle getCarrierConfigSubset(int subId, String... keys) {
		PersistableBundle bundle = new PersistableBundle();
		PersistableBundle bundle = null;
		try {
		bundle = mCarrierConfigManager.getConfigForSubId(subId, keys);
		} catch (RuntimeException e) {
		loge("CarrierConfigLoader is not available.");
		}
		return bundle;
		return bundle != null ? bundle : new PersistableBundle();
		}

		private static String eventToString(int event) {