Snap for 5663715 from ad505a8f4d8ad95ae6517be4cd87d8e5523757fa to qt-c2f2-release (0d6564cc) · Commits · e / os / android_frameworks_opt_telephony

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

+12 −3

Original line number	Diff line number	Diff line
		@@ -110,6 +110,14 @@ public class MultiSimSettingController extends Handler {
		/** The singleton instance. */
		private static MultiSimSettingController sInstance = null;

		// This will be set true when handling EVENT_ALL_SUBSCRIPTIONS_LOADED. The reason of keeping
		// a local variable instead of calling SubscriptionInfoUpdater#isSubInfoInitialized is, there
		// might be a race condition that we receive EVENT_SUBSCRIPTION_INFO_CHANGED first, then
		// EVENT_ALL_SUBSCRIPTIONS_LOADED. And calling SubscriptionInfoUpdater#isSubInfoInitialized
		// will make us handle EVENT_SUBSCRIPTION_INFO_CHANGED unexpectedly and causing us to believe
		// the SIMs are newly inserted instead of being initialized.
		private boolean mSubInfoInitialized = false;

		/**
		* Return the singleton or create one if not existed.
		*/
		@@ -252,6 +260,7 @@ public class MultiSimSettingController extends Handler {
		*/
		private void onAllSubscriptionsLoaded() {
		if (DBG) log("onAllSubscriptionsLoaded");
		mSubInfoInitialized = true;
		updateDefaults(/init/ true);
		disableDataForNonDefaultNonOpportunisticSubscriptions();
		deactivateGroupedOpportunisticSubscriptionIfNeeded();
		@@ -264,7 +273,7 @@ public class MultiSimSettingController extends Handler {
		*/
		private void onSubscriptionsChanged() {
		if (DBG) log("onSubscriptionsChanged");
		if (!SubscriptionInfoUpdater.isSubInfoInitialized()) return;
		if (!mSubInfoInitialized) return;
		updateDefaults(/init/ false);
		disableDataForNonDefaultNonOpportunisticSubscriptions();
		deactivateGroupedOpportunisticSubscriptionIfNeeded();
		@@ -349,7 +358,7 @@ public class MultiSimSettingController extends Handler {
		private void updateDefaults(boolean init) {
		if (DBG) log("updateDefaults");

		if (!SubscriptionInfoUpdater.isSubInfoInitialized()) return;
		if (!mSubInfoInitialized) return;

		List<SubscriptionInfo> activeSubInfos = mSubController
		.getActiveSubscriptionInfoList(mContext.getOpPackageName());
		@@ -545,7 +554,7 @@ public class MultiSimSettingController extends Handler {
		}

		private void disableDataForNonDefaultNonOpportunisticSubscriptions() {
		if (!SubscriptionInfoUpdater.isSubInfoInitialized()) return;
		if (!mSubInfoInitialized) return;

		int defaultDataSub = mSubController.getDefaultDataSubId();

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -4093,6 +4093,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		pw.println(" getActiveApnTypes()=" + getActiveApnTypes());
		pw.println(" needsOtaServiceProvisioning=" + needsOtaServiceProvisioning());
		pw.println(" isInEmergencySmsMode=" + isInEmergencySmsMode());
		pw.println(" service state=" + getServiceState());
		pw.flush();
		pw.println("++++++++++++++++++++++++++++++++");

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

+59 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,12 @@ import android.service.carrier.CarrierIdentifier;
		import android.telephony.AccessNetworkConstants.AccessNetworkType;
		import android.telephony.CarrierRestrictionRules;
		import android.telephony.CellInfo;
		import android.telephony.CellSignalStrengthCdma;
		import android.telephony.CellSignalStrengthGsm;
		import android.telephony.CellSignalStrengthLte;
		import android.telephony.CellSignalStrengthNr;
		import android.telephony.CellSignalStrengthTdscdma;
		import android.telephony.CellSignalStrengthWcdma;
		import android.telephony.ClientRequestStats;
		import android.telephony.ImsiEncryptionInfo;
		import android.telephony.ModemActivityInfo;
		@@ -83,6 +89,7 @@ import android.telephony.RadioAccessFamily;
		import android.telephony.RadioAccessSpecifier;
		import android.telephony.Rlog;
		import android.telephony.ServiceState;
		import android.telephony.SignalStrength;
		import android.telephony.SmsManager;
		import android.telephony.TelephonyHistogram;
		import android.telephony.TelephonyManager;
		@@ -5883,6 +5890,58 @@ public class RIL extends BaseCommands implements CommandsInterface {
		return response;
		}

		/**
		* Fixup for SignalStrength 1.0 to Assume GSM to WCDMA when
		* The current RAT type is one of the UMTS RATs.
		* @param signalStrength the initial signal strength
		* @return a new SignalStrength if RAT is UMTS or existing SignalStrength
		*/
		public SignalStrength fixupSignalStrength10(SignalStrength signalStrength) {
		List<CellSignalStrengthGsm> gsmList = signalStrength.getCellSignalStrengths(
		CellSignalStrengthGsm.class);
		// If GSM is not the primary type, then bail out; no fixup needed.
		if (gsmList == null \|\| gsmList.get(0) == null \|\| !gsmList.get(0).isValid()) {
		return signalStrength;
		}

		CellSignalStrengthGsm gsmStrength = gsmList.get(0);

		// Use the voice RAT which is a guarantee in GSM and UMTS
		int voiceRat = ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN;
		Phone phone = PhoneFactory.getPhone(mPhoneId);
		if (phone != null) {
		ServiceState ss = phone.getServiceState();
		if (ss != null) {
		voiceRat = ss.getRilVoiceRadioTechnology();
		}
		}
		switch (voiceRat) {
		case ServiceState.RIL_RADIO_TECHNOLOGY_UMTS: /* fallthrough */
		case ServiceState.RIL_RADIO_TECHNOLOGY_HSDPA: /* fallthrough */
		case ServiceState.RIL_RADIO_TECHNOLOGY_HSUPA: /* fallthrough */
		case ServiceState.RIL_RADIO_TECHNOLOGY_HSPA: /* fallthrough */
		case ServiceState.RIL_RADIO_TECHNOLOGY_HSPAP: /* fallthrough */
		break;
		default:
		// If we are not currently on WCDMA/HSPA, then we don't need to do a fixup.
		return signalStrength;
		}

		// The service state reports WCDMA, and the SignalStrength is reported for GSM, so at this
		// point we take an educated guess that the GSM SignalStrength report is actually for
		// WCDMA. Also, if we are in WCDMA/GSM we can safely assume that there are no other valid
		// signal strength reports (no SRLTE, which is the only supported case in HAL 1.0).
		// Thus, we just construct a new SignalStrength and migrate RSSI and BER from the
		// GSM report to the WCDMA report, leaving everything else empty.
		return new SignalStrength(
		new CellSignalStrengthCdma(), new CellSignalStrengthGsm(),
		new CellSignalStrengthWcdma(gsmStrength.getRssi(),
		gsmStrength.getBitErrorRate(),
		CellInfo.UNAVAILABLE, CellInfo.UNAVAILABLE),
		new CellSignalStrengthTdscdma(), new CellSignalStrengthLte(),
		new CellSignalStrengthNr());
		}

		/**
		* Convert CellInfo defined in 1.4/types.hal to CellInfo type.
		* @param records List of CellInfo defined in 1.4/types.hal.

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -229,7 +229,9 @@ public class RadioIndication extends IRadioIndication.Stub {
		android.hardware.radio.V1_0.SignalStrength signalStrength) {
		mRil.processIndication(indicationType);

		SignalStrength ss = new SignalStrength(signalStrength);
		SignalStrength ssInitial = new SignalStrength(signalStrength);

		SignalStrength ss = mRil.fixupSignalStrength10(ssInitial);
		// Note this is set to "verbose" because it happens frequently
		if (RIL.RILJ_LOGV) mRil.unsljLogvRet(RIL_UNSOL_SIGNAL_STRENGTH, ss);

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -5232,6 +5232,10 @@ public class ServiceStateTracker extends Handler {
		mNewSS.addNetworkRegistrationInfo(nri);
		}
		mNewSS.setOperatorAlphaLong(operator);
		// Since it's in airplane mode, cellular must be out of service. The only possible
		// transport for data to go through is the IWLAN transport. Setting this to true
		// so that ServiceState.getDataNetworkType can report the right RAT.
		mNewSS.setIwlanPreferred(true);
		log("pollStateDone: mNewSS = " + mNewSS);
		}
		return;