Merge "Correctly support LTE carrier aggregation" (fbd1a399) · Commits · e / os / android_frameworks_opt_telephony

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

+63 −57

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ import android.telephony.NetworkServiceCallback;
		import android.telephony.Rlog;
		import android.telephony.ServiceState;
		import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;

		import java.util.ArrayList;
		import java.util.List;
		@@ -192,10 +193,6 @@ public class CellularNetworkService extends NetworkService {
		return availableServices;
		}

		private int getAccessNetworkTechnologyFromRat(int rilRat) {
		return ServiceState.rilRadioTechnologyToNetworkType(rilRat);
		}

		private NetworkRegistrationInfo getRegistrationStateFromResult(Object result, int domain) {
		if (result == null) {
		return null;
		@@ -219,7 +216,10 @@ public class CellularNetworkService extends NetworkService {
		android.hardware.radio.V1_0.VoiceRegStateResult voiceRegState =
		(android.hardware.radio.V1_0.VoiceRegStateResult) result;
		int regState = getRegStateFromHalRegState(voiceRegState.regState);
		int accessNetworkTechnology = getAccessNetworkTechnologyFromRat(voiceRegState.rat);
		int networkType = ServiceState.rilRadioTechnologyToNetworkType(voiceRegState.rat);
		if (networkType == TelephonyManager.NETWORK_TYPE_LTE_CA) {
		networkType = TelephonyManager.NETWORK_TYPE_LTE;
		}
		int reasonForDenial = voiceRegState.reasonForDenial;
		boolean emergencyOnly = isEmergencyOnly(voiceRegState.regState);
		boolean cssSupported = voiceRegState.cssSupported;
		@@ -232,14 +232,17 @@ public class CellularNetworkService extends NetworkService {
		convertHalCellIdentityToCellIdentity(voiceRegState.cellIdentity);

		return new NetworkRegistrationInfo(domain, transportType, regState,
		accessNetworkTechnology, reasonForDenial, emergencyOnly, availableServices,
		networkType, reasonForDenial, emergencyOnly, availableServices,
		cellIdentity, cssSupported, roamingIndicator, systemIsInPrl,
		defaultRoamingIndicator);
		} else if (result instanceof android.hardware.radio.V1_2.VoiceRegStateResult) {
		android.hardware.radio.V1_2.VoiceRegStateResult voiceRegState =
		(android.hardware.radio.V1_2.VoiceRegStateResult) result;
		int regState = getRegStateFromHalRegState(voiceRegState.regState);
		int accessNetworkTechnology = getAccessNetworkTechnologyFromRat(voiceRegState.rat);
		int networkType = ServiceState.rilRadioTechnologyToNetworkType(voiceRegState.rat);
		if (networkType == TelephonyManager.NETWORK_TYPE_LTE_CA) {
		networkType = TelephonyManager.NETWORK_TYPE_LTE;
		}
		int reasonForDenial = voiceRegState.reasonForDenial;
		boolean emergencyOnly = isEmergencyOnly(voiceRegState.regState);
		boolean cssSupported = voiceRegState.cssSupported;
		@@ -252,7 +255,7 @@ public class CellularNetworkService extends NetworkService {
		convertHalCellIdentityToCellIdentity(voiceRegState.cellIdentity);

		return new NetworkRegistrationInfo(domain, transportType, regState,
		accessNetworkTechnology, reasonForDenial, emergencyOnly, availableServices,
		networkType, reasonForDenial, emergencyOnly, availableServices,
		cellIdentity, cssSupported, roamingIndicator, systemIsInPrl,
		defaultRoamingIndicator);
		}
		@@ -262,61 +265,51 @@ public class CellularNetworkService extends NetworkService {

		private NetworkRegistrationInfo createRegistrationStateFromDataRegState(Object result) {
		int domain = NetworkRegistrationInfo.DOMAIN_PS;
		int regState = NetworkRegistrationInfo.REGISTRATION_STATE_UNKNOWN;
		int transportType = AccessNetworkConstants.TRANSPORT_TYPE_WWAN;
		int networkType = TelephonyManager.NETWORK_TYPE_UNKNOWN;
		int reasonForDenial = 0;
		boolean isUsingCarrierAggregation = false;
		boolean emergencyOnly = false;
		int maxDataCalls = 0;
		CellIdentity cellIdentity;
		boolean isEndcAvailable = false;
		boolean isNrAvailable = false;
		boolean isDcNrRestricted = false;

		if (result instanceof android.hardware.radio.V1_0.DataRegStateResult) {
		android.hardware.radio.V1_0.DataRegStateResult dataRegState =
		(android.hardware.radio.V1_0.DataRegStateResult) result;
		int regState = getRegStateFromHalRegState(dataRegState.regState);
		int accessNetworkTechnology = getAccessNetworkTechnologyFromRat(dataRegState.rat);
		int reasonForDenial = dataRegState.reasonDataDenied;
		boolean emergencyOnly = isEmergencyOnly(dataRegState.regState);
		int maxDataCalls = dataRegState.maxDataCalls;
		List<Integer> availableServices = getAvailableServices(
		regState, domain, emergencyOnly);
		CellIdentity cellIdentity =
		convertHalCellIdentityToCellIdentity(dataRegState.cellIdentity);
		LteVopsSupportInfo lteVopsSupportInfo =
		new LteVopsSupportInfo(LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE,
		LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE);
		return new NetworkRegistrationInfo(domain, transportType, regState,
		accessNetworkTechnology, reasonForDenial, emergencyOnly,
		availableServices, cellIdentity, maxDataCalls, false /* isDcNrRestricted */,
		false /* isNrAvailable /, false / isEnDcAvailable */, lteVopsSupportInfo);

		if (result instanceof android.hardware.radio.V1_0.DataRegStateResult) {
		android.hardware.radio.V1_0.DataRegStateResult dataRegState =
		(android.hardware.radio.V1_0.DataRegStateResult) result;
		regState = getRegStateFromHalRegState(dataRegState.regState);
		networkType = ServiceState.rilRadioTechnologyToNetworkType(dataRegState.rat);
		reasonForDenial = dataRegState.reasonDataDenied;
		emergencyOnly = isEmergencyOnly(dataRegState.regState);
		maxDataCalls = dataRegState.maxDataCalls;

		cellIdentity = convertHalCellIdentityToCellIdentity(dataRegState.cellIdentity);
		} else if (result instanceof android.hardware.radio.V1_2.DataRegStateResult) {
		android.hardware.radio.V1_2.DataRegStateResult dataRegState =
		(android.hardware.radio.V1_2.DataRegStateResult) result;
		int regState = getRegStateFromHalRegState(dataRegState.regState);
		int accessNetworkTechnology = getAccessNetworkTechnologyFromRat(dataRegState.rat);
		int reasonForDenial = dataRegState.reasonDataDenied;
		boolean emergencyOnly = isEmergencyOnly(dataRegState.regState);
		int maxDataCalls = dataRegState.maxDataCalls;
		List<Integer> availableServices = getAvailableServices(
		regState, domain, emergencyOnly);
		CellIdentity cellIdentity =
		convertHalCellIdentityToCellIdentity(dataRegState.cellIdentity);
		LteVopsSupportInfo lteVopsSupportInfo =
		new LteVopsSupportInfo(LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE,
		LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE);
		return new NetworkRegistrationInfo(domain, transportType, regState,
		accessNetworkTechnology, reasonForDenial, emergencyOnly, availableServices,
		cellIdentity, maxDataCalls, false /* isDcNrRestricted */,
		false /* isNrAvailable /, false / isEnDcAvailable */, lteVopsSupportInfo);
		regState = getRegStateFromHalRegState(dataRegState.regState);
		networkType = ServiceState.rilRadioTechnologyToNetworkType(dataRegState.rat);
		reasonForDenial = dataRegState.reasonDataDenied;
		emergencyOnly = isEmergencyOnly(dataRegState.regState);
		maxDataCalls = dataRegState.maxDataCalls;
		cellIdentity = convertHalCellIdentityToCellIdentity(dataRegState.cellIdentity);
		} else if (result instanceof android.hardware.radio.V1_4.DataRegStateResult) {
		android.hardware.radio.V1_4.DataRegStateResult dataRegState =
		(android.hardware.radio.V1_4.DataRegStateResult) result;
		int regState = getRegStateFromHalRegState(dataRegState.base.regState);
		int accessNetworkTechnology =
		getAccessNetworkTechnologyFromRat(dataRegState.base.rat);
		LteVopsSupportInfo lteVopsSupportInfo = null;
		int reasonForDenial = dataRegState.base.reasonDataDenied;
		boolean emergencyOnly = isEmergencyOnly(dataRegState.base.regState);
		int maxDataCalls = dataRegState.base.maxDataCalls;
		List<Integer> availableServices = getAvailableServices(
		regState, domain, emergencyOnly);
		CellIdentity cellIdentity =
		convertHalCellIdentityToCellIdentity(dataRegState.base.cellIdentity);
		regState = getRegStateFromHalRegState(dataRegState.base.regState);
		networkType = ServiceState.rilRadioTechnologyToNetworkType(dataRegState.base.rat);

		reasonForDenial = dataRegState.base.reasonDataDenied;
		emergencyOnly = isEmergencyOnly(dataRegState.base.regState);
		maxDataCalls = dataRegState.base.maxDataCalls;
		cellIdentity = convertHalCellIdentityToCellIdentity(dataRegState.base.cellIdentity);
		android.hardware.radio.V1_4.NrIndicators nrIndicators = dataRegState.nrIndicators;

		// Check for lteVopsInfo only if its initialized and RAT is EUTRAN
		@@ -333,15 +326,28 @@ public class CellularNetworkService extends NetworkService {
		LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE);
		}

		return new NetworkRegistrationInfo(domain, transportType, regState,
		accessNetworkTechnology, reasonForDenial, emergencyOnly, availableServices,
		cellIdentity, maxDataCalls, nrIndicators.isDcNrRestricted,
		nrIndicators.isNrAvailable, nrIndicators.isEndcAvailable,
		lteVopsSupportInfo);
		}
		isEndcAvailable = nrIndicators.isEndcAvailable;
		isNrAvailable = nrIndicators.isNrAvailable;
		isDcNrRestricted = nrIndicators.isDcNrRestricted;
		} else {
		loge("Unknown type of DataRegStateResult " + result);
		return null;
		}

		List<Integer> availableServices = getAvailableServices(
		regState, domain, emergencyOnly);

		if (networkType == TelephonyManager.NETWORK_TYPE_LTE_CA) {
		isUsingCarrierAggregation = true;
		networkType = TelephonyManager.NETWORK_TYPE_LTE;
		}

		return new NetworkRegistrationInfo(domain, transportType, regState, networkType,
		reasonForDenial, emergencyOnly, availableServices, cellIdentity, maxDataCalls,
		isDcNrRestricted, isNrAvailable, isEndcAvailable, lteVopsSupportInfo,
		isUsingCarrierAggregation);
		}

		private LteVopsSupportInfo convertHalLteVopsSupportInfo(
		boolean vopsSupport, boolean emcBearerSupport) {
		int vops = LteVopsSupportInfo.LTE_STATUS_NOT_SUPPORTED;

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -2153,6 +2153,8 @@ public class ServiceStateTracker extends Handler {

		updateServiceStateLteEarfcnBoost(mNewSS,
		getLteEarfcn(networkRegState.getCellIdentity()));

		mNewSS.setIsUsingCarrierAggregation(dataSpecificStates.isUsingCarrierAggregation);
		break;
		}

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

+0 −2

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

		import static android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE;
		import static android.telephony.TelephonyManager.NETWORK_TYPE_LTE;
		import static android.telephony.TelephonyManager.NETWORK_TYPE_LTE_CA;
		import static android.telephony.TelephonyManager.NETWORK_TYPE_NR;

		import static com.android.internal.telephony.RILConstants.DATA_PROFILE_DEFAULT;
		@@ -3855,7 +3854,6 @@ public class DcTracker extends Handler {
		mAutoAttachEnabled.set(mPhone.getPhoneId() != phoneSwitcher.getPreferredDataPhoneId()
		&& serviceState.getVoiceRegState() == ServiceState.STATE_IN_SERVICE
		&& serviceState.getVoiceNetworkType() != NETWORK_TYPE_LTE
		&& serviceState.getVoiceNetworkType() != NETWORK_TYPE_LTE_CA
		&& serviceState.getVoiceNetworkType() != NETWORK_TYPE_NR);
		}

tests/telephonytests/src/com/android/internal/telephony/CellularNetworkServiceTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -167,7 +167,7 @@ public class CellularNetworkServiceTest extends TelephonyTest {
		domain, AccessNetworkConstants.TRANSPORT_TYPE_WWAN, voiceRegState,
		ServiceState.rilRadioTechnologyToNetworkType(voiceRadioTech), reasonForDenial,
		false, availableServices, null, maxDataCalls, false, false, false,
		lteVopsSupportInfo);
		lteVopsSupportInfo, false);

		try {
		verify(mCallback, times(1)).onRequestNetworkRegistrationInfoComplete(

tests/telephonytests/src/com/android/internal/telephony/ServiceStateTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -320,7 +320,7 @@ public class ServiceStateTest extends TestCase {

		wwanDataRegState = new NetworkRegistrationInfo(
		NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
		0, 0, 0, true, null, null, 0, false, false, false, lteVopsSupportInfo);
		0, 0, 0, true, null, null, 0, false, false, false, lteVopsSupportInfo, false);
		ss.addNetworkRegistrationInfo(wwanDataRegState);
		assertEquals(ss.getNetworkRegistrationInfo(NetworkRegistrationInfo.DOMAIN_PS,
		AccessNetworkConstants.TRANSPORT_TYPE_WWAN), wwanDataRegState);