Merge "Get rid of SIM record access in DcTracker" into rvc-dev am: 7ab4020223 am: bc7d7cd3aa (55618c23) · Commits · e / os / android_frameworks_opt_telephony

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

+6 −7

Original line number	Diff line number	Diff line
		@@ -90,6 +90,7 @@ import com.android.internal.telephony.dataconnection.TransportManager;
		import com.android.internal.telephony.emergency.EmergencyNumberTracker;
		import com.android.internal.telephony.gsm.GsmMmiCode;
		import com.android.internal.telephony.gsm.SuppServiceNotification;
		import com.android.internal.telephony.imsphone.ImsPhoneMmiCode;
		import com.android.internal.telephony.test.SimulatedRadioControl;
		import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppType;
		import com.android.internal.telephony.uicc.IccCardStatus;
		@@ -108,7 +109,6 @@ import com.android.internal.telephony.uicc.UiccProfile;
		import com.android.internal.telephony.uicc.UiccSlot;
		import com.android.internal.telephony.util.ArrayUtils;
		import com.android.telephony.Rlog;
		import com.android.internal.telephony.imsphone.ImsPhoneMmiCode;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		@@ -3172,7 +3172,7 @@ public class GsmCdmaPhone extends Phone {
		simOperatorNumeric);
		}
		}
		updateDataConnectionTracker();
		updateCurrentCarrierInProvider();
		}
		}

		@@ -4043,10 +4043,9 @@ public class GsmCdmaPhone extends Phone {
		return dialString;
		}

		/**
		* @return operator numeric.
		*/
		private String getOperatorNumeric() {
		@Override
		@NonNull
		public String getOperatorNumeric() {
		String operatorNumeric = null;
		if (isPhoneTypeGsm()) {
		IccRecords r = mIccRecords.get();
		@@ -4088,7 +4087,7 @@ public class GsmCdmaPhone extends Phone {
		+ " operatorNumeric = " + operatorNumeric);

		}
		return operatorNumeric;
		return TextUtils.emptyIfNull(operatorNumeric);
		}

		/**

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

+10 −10

Original line number	Diff line number	Diff line
		@@ -4039,16 +4039,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		return getLocaleFromCarrierProperties();
		}

		public void updateDataConnectionTracker() {
		if (mTransportManager != null) {
		for (int transport : mTransportManager.getAvailableTransports()) {
		if (getDcTracker(transport) != null) {
		getDcTracker(transport).update();
		}
		}
		}
		}

		public boolean updateCurrentCarrierInProvider() {
		return false;
		}
		@@ -4243,6 +4233,16 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		return RIL.RADIO_HAL_VERSION_UNKNOWN;
		}

		/**
		* Get the SIM's MCC/MNC
		*
		* @return MCC/MNC in string format, empty string if not available.
		*/
		@NonNull
		public String getOperatorNumeric() {
		return "";
		}

		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		pw.println("Phone: subId=" + getSubId());
		pw.println(" mPhoneId=" + mPhoneId);

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

+0 −17

Original line number	Diff line number	Diff line
		@@ -1309,9 +1309,6 @@ public class SubscriptionController extends ISub.Stub {
		if (DBG) logdl("[addSubInfoRecord] sim name = " + nameToSet);
		}

		// Once the records are loaded, notify DcTracker
		PhoneFactory.getPhone(slotIndex).updateDataConnectionTracker();

		if (DBG) logdl("[addSubInfoRecord]- info size=" + sSlotIndexToSubIds.size());
		}

		@@ -2423,9 +2420,6 @@ public class SubscriptionController extends ISub.Stub {
		}
		}

		// FIXME is this still needed?
		updateAllDataConnectionTrackers();

		int previousDefaultSub = getDefaultSubId();
		Settings.Global.putInt(mContext.getContentResolver(),
		Settings.Global.MULTI_SIM_DATA_CALL_SUBSCRIPTION, subId);
		@@ -2439,17 +2433,6 @@ public class SubscriptionController extends ISub.Stub {
		}
		}

		@UnsupportedAppUsage
		private void updateAllDataConnectionTrackers() {
		// Tell Phone Proxies to update data connection tracker
		int len = TelephonyManager.from(mContext).getActiveModemCount();
		if (DBG) logd("[updateAllDataConnectionTrackers] activeModemCount=" + len);
		for (int phoneId = 0; phoneId < len; phoneId++) {
		if (DBG) logd("[updateAllDataConnectionTrackers] phoneId=" + phoneId);
		PhoneFactory.getPhone(phoneId).updateDataConnectionTracker();
		}
		}

		@UnsupportedAppUsage
		private void broadcastDefaultDataSubIdChanged(int subId) {
		// Broadcast an Intent for default data sub change

src/java/com/android/internal/telephony/dataconnection/DataConnectionReasons.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -106,7 +106,7 @@ public class DataConnectionReasons {

		// Belows are all hard failure reasons.
		NOT_ATTACHED(true),
		RECORD_NOT_LOADED(true),
		SIM_NOT_READY(true),
		INVALID_PHONE_STATE(true),
		CONCURRENT_VOICE_DATA_NOT_ALLOWED(true),
		PS_RESTRICTED(true),

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+89 −178

File changed.

Preview size limit exceeded, changes collapsed.