Merge cherrypicks of ['googleplex-android-review.googlesource.com/24816916'] into udc-qpr1-release. (f0b8162e) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -249,6 +249,7 @@ public class GsmCdmaPhone extends Phone {
		private String mImeiSv;
		private String mVmNumber;
		private int mImeiType = IMEI_TYPE_UNKNOWN;
		private int mSimState = TelephonyManager.SIM_STATE_UNKNOWN;

		@VisibleForTesting
		public CellBroadcastConfigTracker mCellBroadcastConfigTracker =
		@@ -426,9 +427,9 @@ public class GsmCdmaPhone extends Phone {
		if (mPhoneId == intent.getIntExtra(
		SubscriptionManager.EXTRA_SLOT_INDEX,
		SubscriptionManager.INVALID_SIM_SLOT_INDEX)) {
		int simState = intent.getIntExtra(TelephonyManager.EXTRA_SIM_STATE,
		mSimState = intent.getIntExtra(TelephonyManager.EXTRA_SIM_STATE,
		TelephonyManager.SIM_STATE_UNKNOWN);
		if (simState == TelephonyManager.SIM_STATE_LOADED
		if (mSimState == TelephonyManager.SIM_STATE_LOADED
		&& currentSlotSubIdChanged()) {
		setNetworkSelectionModeAutomatic(null);
		}
		@@ -5025,6 +5026,10 @@ public class GsmCdmaPhone extends Phone {
		return;
		}

		if (mSimState != TelephonyManager.SIM_STATE_LOADED) {
		return;
		}

		if (config == null) {
		loge("didn't get the vonr_enabled_bool from the carrier config.");
		return;