Snap for 6313343 from 452b34df853d1326b1d8e4df19bc43b9d1065563 to qt-qpr3-release (07672f21) · Commits · e / os / android_frameworks_opt_telephony

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

+25 −2

Original line number	Diff line number	Diff line
		@@ -220,6 +220,7 @@ public class ServiceStateTracker extends Handler {
		private RegistrantList mPsRestrictDisabledRegistrants = new RegistrantList();
		private RegistrantList mImsCapabilityChangedRegistrants = new RegistrantList();
		private RegistrantList mNrStateChangedRegistrants = new RegistrantList();
		private RegistrantList mNrFrequencyChangedRegistrants = new RegistrantList();

		/* Radio power off pending flag and tag counter */
		private boolean mPendingRadioPowerOffAfterDataOff = false;
		@@ -1556,8 +1557,11 @@ public class ServiceStateTracker extends Handler {
		}
		mPhone.notifyPhysicalChannelConfiguration(list);
		mLastPhysicalChannelConfigList = list;
		boolean hasChanged =
		updateNrFrequencyRangeFromPhysicalChannelConfigs(list, mSS);
		boolean hasChanged = false;
		if (updateNrFrequencyRangeFromPhysicalChannelConfigs(list, mSS)) {
		mNrFrequencyChangedRegistrants.notifyRegistrants();
		hasChanged = true;
		}
		if (updateNrStateFromPhysicalChannelConfigs(list, mSS)) {
		mNrStateChangedRegistrants.notifyRegistrants();
		hasChanged = true;
		@@ -5584,6 +5588,25 @@ public class ServiceStateTracker extends Handler {
		mNrStateChangedRegistrants.remove(h);
		}

		/**
		* Registers for 5G NR frequency changed.
		* @param h handler to notify
		* @param what what code of message when delivered
		* @param obj placed in Message.obj
		*/
		public void registerForNrFrequencyChanged(Handler h, int what, Object obj) {
		Registrant r = new Registrant(h, what, obj);
		mNrFrequencyChangedRegistrants.add(r);
		}

		/**
		* Unregisters for 5G NR frequency changed.
		* @param h handler to notify
		*/
		public void unregisterForNrFrequencyChanged(Handler h) {
		mNrFrequencyChangedRegistrants.remove(h);
		}

		/**
		* Get the NR data connection context ids.
		*

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

+87 −39

Original line number	Diff line number	Diff line
		@@ -265,6 +265,7 @@ public class DataConnection extends StateMachine {
		private Object mUserData;
		private int mSubscriptionOverride;
		private int mRilRat = ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN;
		private boolean mUnmeteredOverride;
		private int mDataRegState = Integer.MAX_VALUE;
		private NetworkInfo mNetworkInfo;

		@@ -318,9 +319,9 @@ public class DataConnection extends StateMachine {
		static final int EVENT_REEVALUATE_RESTRICTED_STATE = BASE + 25;
		static final int EVENT_REEVALUATE_DATA_CONNECTION_PROPERTIES = BASE + 26;
		static final int EVENT_NR_STATE_CHANGED = BASE + 27;

		private static final int CMD_TO_STRING_COUNT =
		EVENT_NR_STATE_CHANGED - BASE + 1;
		static final int EVENT_DATA_CONNECTION_METEREDNESS_CHANGED = BASE + 28;
		static final int EVENT_NR_FREQUENCY_CHANGED = BASE + 29;
		private static final int CMD_TO_STRING_COUNT = EVENT_NR_FREQUENCY_CHANGED - BASE + 1;

		private static String[] sCmdToString = new String[CMD_TO_STRING_COUNT];
		static {
		@@ -356,8 +357,10 @@ public class DataConnection extends StateMachine {
		"EVENT_REEVALUATE_RESTRICTED_STATE";
		sCmdToString[EVENT_REEVALUATE_DATA_CONNECTION_PROPERTIES - BASE] =
		"EVENT_REEVALUATE_DATA_CONNECTION_PROPERTIES";
		sCmdToString[EVENT_NR_STATE_CHANGED - BASE] =
		"EVENT_NR_STATE_CHANGED";
		sCmdToString[EVENT_NR_STATE_CHANGED - BASE] = "EVENT_NR_STATE_CHANGED";
		sCmdToString[EVENT_DATA_CONNECTION_METEREDNESS_CHANGED - BASE] =
		"EVENT_DATA_CONNECTION_METEREDNESS_CHANGED";
		sCmdToString[EVENT_NR_FREQUENCY_CHANGED - BASE] = "EVENT_NR_FREQUENCY_CHANGED";
		}
		// Convert cmd to string or null if unknown
		static String cmdToString(int cmd) {
		@@ -731,6 +734,14 @@ public class DataConnection extends StateMachine {
		sendMessage(obtainMessage(EVENT_DATA_CONNECTION_OVERRIDE_CHANGED));
		}

		/**
		* Update NetworkCapabilities.NET_CAPABILITY_NOT_METERED based on meteredness
		* @param isUnmetered whether this DC should be set to unmetered or not
		*/
		public void onMeterednessChanged(boolean isUnmetered) {
		sendMessage(obtainMessage(EVENT_DATA_CONNECTION_METEREDNESS_CHANGED, isUnmetered));
		}

		/**
		* TearDown the data connection when the deactivation is complete a Message with
		* msg.what == EVENT_DEACTIVATE_DONE
		@@ -900,6 +911,8 @@ public class DataConnection extends StateMachine {
		mDcFailCause = DataFailCause.NONE;
		mDisabledApnTypeBitMask = 0;
		mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
		mSubscriptionOverride = 0;
		mUnmeteredOverride = false;
		}

		/**
		@@ -1077,6 +1090,24 @@ public class DataConnection extends StateMachine {
		mLinkProperties.setTcpBufferSizes(sizes);
		}

		private void updateLinkBandwidths(NetworkCapabilities caps, int rilRat) {
		String ratName = ServiceState.rilRadioTechnologyToString(rilRat);
		if (rilRat == ServiceState.RIL_RADIO_TECHNOLOGY_LTE && isNRConnected()) {
		ratName = mPhone.getServiceState().getNrFrequencyRange()
		== ServiceState.FREQUENCY_RANGE_MMWAVE
		? DctConstants.RAT_NAME_NR_NSA_MMWAVE : DctConstants.RAT_NAME_NR_NSA;
		}

		if (DBG) log("updateLinkBandwidths: " + ratName);

		Pair<Integer, Integer> values = mDct.getLinkBandwidths(ratName);
		if (values == null) {
		values = new Pair<>(14, 14);
		}
		caps.setLinkDownstreamBandwidthKbps(values.first);
		caps.setLinkUpstreamBandwidthKbps(values.second);
		}

		/**
		* Indicates if this data connection was established for unmetered use only. Note that this
		* flag should be populated when data becomes active. And if it is set to true, it can be set to
		@@ -1278,29 +1309,7 @@ public class DataConnection extends StateMachine {
		result.removeCapability(NetworkCapabilities.NET_CAPABILITY_DUN);
		}

		int up = 14;
		int down = 14;
		switch (mRilRat) {
		case ServiceState.RIL_RADIO_TECHNOLOGY_GPRS: up = 80; down = 80; break;
		case ServiceState.RIL_RADIO_TECHNOLOGY_EDGE: up = 59; down = 236; break;
		case ServiceState.RIL_RADIO_TECHNOLOGY_UMTS: up = 384; down = 384; break;
		case ServiceState.RIL_RADIO_TECHNOLOGY_IS95A: // fall through
		case ServiceState.RIL_RADIO_TECHNOLOGY_IS95B: up = 14; down = 14; break;
		case ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_0: up = 153; down = 2457; break;
		case ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_A: up = 1843; down = 3174; break;
		case ServiceState.RIL_RADIO_TECHNOLOGY_1xRTT: up = 100; down = 100; break;
		case ServiceState.RIL_RADIO_TECHNOLOGY_HSDPA: up = 2048; down = 14336; break;
		case ServiceState.RIL_RADIO_TECHNOLOGY_HSUPA: up = 5898; down = 14336; break;
		case ServiceState.RIL_RADIO_TECHNOLOGY_HSPA: up = 5898; down = 14336; break;
		case ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_B: up = 1843; down = 5017; break;
		case ServiceState.RIL_RADIO_TECHNOLOGY_LTE: up = 51200; down = 102400; break;
		case ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA: up = 51200; down = 102400; break;
		case ServiceState.RIL_RADIO_TECHNOLOGY_EHRPD: up = 153; down = 2516; break;
		case ServiceState.RIL_RADIO_TECHNOLOGY_HSPAP: up = 11264; down = 43008; break;
		default:
		}
		result.setLinkUpstreamBandwidthKbps(up);
		result.setLinkDownstreamBandwidthKbps(down);
		updateLinkBandwidths(result, mRilRat);

		result.setNetworkSpecifier(new StringNetworkSpecifier(Integer.toString(mSubId)));

		@@ -1317,6 +1326,11 @@ public class DataConnection extends StateMachine {
		result.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED);
		}

		// Override set by DcTracker
		if (mUnmeteredOverride) {
		result.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED);
		}

		return result;
		}

		@@ -1507,6 +1521,8 @@ public class DataConnection extends StateMachine {
		DataConnection.EVENT_DATA_CONNECTION_ROAM_OFF, null, true);
		mPhone.getServiceStateTracker().registerForNrStateChanged(getHandler(),
		DataConnection.EVENT_NR_STATE_CHANGED, null);
		mPhone.getServiceStateTracker().registerForNrFrequencyChanged(getHandler(),
		DataConnection.EVENT_NR_FREQUENCY_CHANGED, null);

		// Add ourselves to the list of data connections
		mDcController.addDc(DataConnection.this);
		@@ -1521,6 +1537,8 @@ public class DataConnection extends StateMachine {

		mPhone.getServiceStateTracker().unregisterForDataRoamingOn(getHandler());
		mPhone.getServiceStateTracker().unregisterForDataRoamingOff(getHandler());
		mPhone.getServiceStateTracker().unregisterForNrStateChanged(getHandler());
		mPhone.getServiceStateTracker().unregisterForNrFrequencyChanged(getHandler());

		// Remove ourselves from the DC lists
		mDcController.removeDc(DataConnection.this);
		@@ -1604,6 +1622,14 @@ public class DataConnection extends StateMachine {
		mNetworkAgent.sendLinkProperties(mLinkProperties, DataConnection.this);
		}
		break;
		case EVENT_DATA_CONNECTION_METEREDNESS_CHANGED:
		boolean isUnmetered = (boolean) msg.obj;
		if (isUnmetered == mUnmeteredOverride) {
		break;
		}
		mUnmeteredOverride = isUnmetered;
		// fallthrough
		case EVENT_NR_FREQUENCY_CHANGED:
		case EVENT_DATA_CONNECTION_ROAM_ON:
		case EVENT_DATA_CONNECTION_ROAM_OFF:
		case EVENT_DATA_CONNECTION_OVERRIDE_CHANGED:
		@@ -2182,6 +2208,14 @@ public class DataConnection extends StateMachine {
		}
		case EVENT_DATA_CONNECTION_ROAM_ON:
		case EVENT_DATA_CONNECTION_ROAM_OFF:
		case EVENT_DATA_CONNECTION_METEREDNESS_CHANGED:
		boolean isUnmetered = (boolean) msg.obj;
		if (isUnmetered == mUnmeteredOverride) {
		retVal = HANDLED;
		break;
		}
		mUnmeteredOverride = isUnmetered;
		// fallthrough
		case EVENT_DATA_CONNECTION_OVERRIDE_CHANGED: {
		updateNetworkInfo();
		if (mNetworkAgent != null) {
		@@ -2197,15 +2231,23 @@ public class DataConnection extends StateMachine {
		if (ar.exception != null) {
		log("EVENT_BW_REFRESH_RESPONSE: error ignoring, e=" + ar.exception);
		} else {
		final LinkCapacityEstimate lce = (LinkCapacityEstimate) ar.result;
		boolean useModem = DctConstants.BANDWIDTH_SOURCE_MODEM_KEY.equals(
		mPhone.getContext().getResources().getString(com.android.internal.R
		.string.config_bandwidthEstimateSource));
		NetworkCapabilities nc = getNetworkCapabilities();
		if (mPhone.getLceStatus() == RILConstants.LCE_ACTIVE) {
		LinkCapacityEstimate lce = (LinkCapacityEstimate) ar.result;
		if (useModem && mPhone.getLceStatus() == RILConstants.LCE_ACTIVE) {
		if (lce.downlinkCapacityKbps != LinkCapacityEstimate.INVALID) {
		nc.setLinkDownstreamBandwidthKbps(lce.downlinkCapacityKbps);
		}
		if (lce.uplinkCapacityKbps != LinkCapacityEstimate.INVALID) {
		nc.setLinkUpstreamBandwidthKbps(lce.uplinkCapacityKbps);
		}
		}
		if (mNetworkAgent != null) {
		mNetworkAgent.sendNetworkCapabilities(nc, DataConnection.this);
		}
		}
		}
		retVal = HANDLED;
		break;
		}
		@@ -2319,14 +2361,19 @@ public class DataConnection extends StateMachine {
		if (ar.exception != null) {
		loge("EVENT_LINK_CAPACITY_CHANGED e=" + ar.exception);
		} else {
		LinkCapacityEstimate lce = (LinkCapacityEstimate) ar.result;
		boolean useModem = DctConstants.BANDWIDTH_SOURCE_MODEM_KEY.equals(
		mPhone.getContext().getResources().getString(com.android.internal.R
		.string.config_bandwidthEstimateSource));
		NetworkCapabilities nc = getNetworkCapabilities();
		if (useModem) {
		LinkCapacityEstimate lce = (LinkCapacityEstimate) ar.result;
		if (lce.downlinkCapacityKbps != LinkCapacityEstimate.INVALID) {
		nc.setLinkDownstreamBandwidthKbps(lce.downlinkCapacityKbps);
		}
		if (lce.uplinkCapacityKbps != LinkCapacityEstimate.INVALID) {
		nc.setLinkUpstreamBandwidthKbps(lce.uplinkCapacityKbps);
		}
		}
		if (mNetworkAgent != null) {
		mNetworkAgent.sendNetworkCapabilities(nc, DataConnection.this);
		}
		@@ -2931,6 +2978,7 @@ public class DataConnection extends StateMachine {
		pw.println("mUnmeteredUseOnly=" + mUnmeteredUseOnly);
		pw.println("disallowedApnTypes="
		+ ApnSetting.getApnTypesStringFromBitmask(getDisallowedApnTypes()));
		pw.println("mUnmeteredOverride=" + mUnmeteredOverride);
		pw.println("mInstanceNumber=" + mInstanceNumber);
		pw.println("mAc=" + mAc);
		pw.println("mScore=" + mScore);

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

+0 −27

Original line number	Diff line number	Diff line
		@@ -18,10 +18,8 @@ package com.android.internal.telephony.dataconnection;

		import android.content.Context;
		import android.hardware.radio.V1_4.DataConnActiveStatus;
		import android.net.INetworkPolicyListener;
		import android.net.LinkAddress;
		import android.net.LinkProperties.CompareResult;
		import android.net.NetworkPolicyManager;
		import android.net.NetworkUtils;
		import android.os.AsyncResult;
		import android.os.Build;
		@@ -69,7 +67,6 @@ public class DcController extends StateMachine {
		private DccDefaultState mDccDefaultState = new DccDefaultState();

		final TelephonyManager mTelephonyManager;
		final NetworkPolicyManager mNetworkPolicyManager;

		private PhoneStateListener mPhoneStateListener;

		@@ -107,8 +104,6 @@ public class DcController extends StateMachine {

		mTelephonyManager = (TelephonyManager) phone.getContext()
		.getSystemService(Context.TELEPHONY_SERVICE);
		mNetworkPolicyManager = (NetworkPolicyManager) phone.getContext()
		.getSystemService(Context.NETWORK_POLICY_SERVICE);

		mDcTesterDeactivateAll = (Build.IS_DEBUGGABLE)
		? new DcTesterDeactivateAll(mPhone, DcController.this, getHandler())
		@@ -173,21 +168,6 @@ public class DcController extends StateMachine {
		return mExecutingCarrierChange;
		}

		private final INetworkPolicyListener mListener = new NetworkPolicyManager.Listener() {
		@Override
		public void onSubscriptionOverride(int subId, int overrideMask, int overrideValue) {
		if (mPhone == null \|\| mPhone.getSubId() != subId) return;

		final HashMap<Integer, DataConnection> dcListActiveByCid;
		synchronized (mDcListAll) {
		dcListActiveByCid = new HashMap<>(mDcListActiveByCid);
		}
		for (DataConnection dc : dcListActiveByCid.values()) {
		dc.onSubscriptionOverride(overrideMask, overrideValue);
		}
		}
		};

		private class DccDefaultState extends State {
		@Override
		public void enter() {
		@@ -199,10 +179,6 @@ public class DcController extends StateMachine {

		mDataServiceManager.registerForDataCallListChanged(getHandler(),
		DataConnection.EVENT_DATA_STATE_CHANGED);

		if (mNetworkPolicyManager != null) {
		mNetworkPolicyManager.registerListener(mListener);
		}
		}

		@Override
		@@ -216,9 +192,6 @@ public class DcController extends StateMachine {
		if (mDcTesterDeactivateAll != null) {
		mDcTesterDeactivateAll.dispose();
		}
		if (mNetworkPolicyManager != null) {
		mNetworkPolicyManager.unregisterListener(mListener);
		}
		}

		@Override

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

+279 −0

File changed.

Preview size limit exceeded, changes collapsed.

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java

+284 −1

File changed.

Preview size limit exceeded, changes collapsed.