Snap for 6606167 from 091143461257b1f5d0eb1ffa2c60f9d776d07171 to rvc-release (f1503c2d) · Commits · e / os / android_frameworks_opt_telephony

jarjar-rules-shared.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -19,3 +19,6 @@ rule com.android.internal.util.State* com.android.internal.telephony.State@1
		rule com.android.internal.util.StateMachine* com.android.internal.telephony.StateMachine@1
		rule com.android.internal.util.UserIcons* com.android.internal.telephony.UserIcons@1
		rule com.google.i18n.phonenumbers.** com.android.internal.telephony.phonenumbers.@1

		# Module library in frameworks/libs/net
		rule com.android.net.module.util.** com.android.internal.telephony.util.@1

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

+11 −2

Original line number	Diff line number	Diff line
		@@ -528,12 +528,15 @@ public class NetworkTypeController extends StateMachine {
		* This is the initial state.
		*/
		private final class LegacyState extends State {
		private Boolean mIsNrRestricted = false;

		@Override
		public void enter() {
		if (DBG) log("Entering LegacyState");
		updateTimers();
		updateOverrideNetworkType();
		if (!mIsPrimaryTimerActive && !mIsSecondaryTimerActive) {
		mIsNrRestricted = isNrRestricted();
		mPreviousState = getName();
		}
		}
		@@ -552,6 +555,7 @@ public class NetworkTypeController extends StateMachine {
		} else {
		updateOverrideNetworkType();
		}
		mIsNrRestricted = isNrRestricted();
		break;
		case EVENT_NR_STATE_CHANGED:
		if (isNrConnected()) {
		@@ -561,6 +565,7 @@ public class NetworkTypeController extends StateMachine {
		} else if (isLte(rat) && isNrRestricted()) {
		updateOverrideNetworkType();
		}
		mIsNrRestricted = isNrRestricted();
		break;
		case EVENT_NR_FREQUENCY_CHANGED:
		case EVENT_DATA_ACTIVITY_CHANGED:
		@@ -577,7 +582,7 @@ public class NetworkTypeController extends StateMachine {

		@Override
		public String getName() {
		return isNrRestricted() ? STATE_RESTRICTED : STATE_LEGACY;
		return mIsNrRestricted ? STATE_RESTRICTED : STATE_LEGACY;
		}
		}

		@@ -717,12 +722,15 @@ public class NetworkTypeController extends StateMachine {
		* Device is connected to 5G NR as the secondary cell.
		*/
		private final class NrConnectedState extends State {
		private Boolean mIsNrMmwave = false;

		@Override
		public void enter() {
		if (DBG) log("Entering NrConnectedState");
		updateTimers();
		updateOverrideNetworkType();
		if (!mIsPrimaryTimerActive && !mIsSecondaryTimerActive) {
		mIsNrMmwave = isNrMmwave();
		mPreviousState = getName();
		}
		}
		@@ -762,6 +770,7 @@ public class NetworkTypeController extends StateMachine {
		// STATE_CONNECTED -> STATE_CONNECTED_MMWAVE
		transitionTo(mNrConnectedState);
		}
		mIsNrMmwave = isNrMmwave();
		break;
		case EVENT_DATA_ACTIVITY_CHANGED:
		if (!isNrConnected()) {
		@@ -780,7 +789,7 @@ public class NetworkTypeController extends StateMachine {

		@Override
		public String getName() {
		return isNrMmwave() ? STATE_CONNECTED_MMWAVE : STATE_CONNECTED;
		return mIsNrMmwave ? STATE_CONNECTED_MMWAVE : STATE_CONNECTED;
		}
		}

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -2785,6 +2785,13 @@ public class ServiceStateTracker extends Handler {
		} else if (!TextUtils.isEmpty(plmn) && !TextUtils.isEmpty(wfcVoiceSpnFormat)) {
		// Show PLMN + Wi-Fi Calling if there is no valid SPN in the above case
		String originalPlmn = plmn.trim();

		PersistableBundle config = getCarrierConfig();
		if (mIccRecords != null && config.getBoolean(
		CarrierConfigManager.KEY_WFC_CARRIER_NAME_OVERRIDE_BY_PNN_BOOL)) {
		originalPlmn = mIccRecords.getPnnHomeName();
		}

		plmn = String.format(wfcVoiceSpnFormat, originalPlmn);
		} else if (mSS.getState() == ServiceState.STATE_POWER_OFF
		\|\| (showPlmn && TextUtils.equals(spn, plmn))) {