Merge "Connect to CellularNetworkService in SST." (e44a7285) · Commits · e / os / android_frameworks_opt_telephony

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

+6 −3

Original line number	Diff line number	Diff line
		@@ -167,8 +167,7 @@ public class CellularNetworkService extends NetworkService {
		}
		}

		private int[] getAvailableServices(int regState, int domain,
		boolean emergencyOnly) {
		private int[] getAvailableServices(int regState, int domain, boolean emergencyOnly) {
		int[] availableServices = null;

		// In emergency only states, only SERVICE_TYPE_EMERGENCY is available.
		@@ -177,7 +176,7 @@ public class CellularNetworkService extends NetworkService {
		if (emergencyOnly) {
		availableServices = new int[] {NetworkRegistrationState.SERVICE_TYPE_EMERGENCY};
		} else if (regState == NetworkRegistrationState.REG_STATE_ROAMING
		\|\| regState != NetworkRegistrationState.REG_STATE_HOME) {
		\|\| regState == NetworkRegistrationState.REG_STATE_HOME) {
		if (domain == NetworkRegistrationState.DOMAIN_PS) {
		availableServices = new int[] {NetworkRegistrationState.SERVICE_TYPE_DATA};
		} else if (domain == NetworkRegistrationState.DOMAIN_CS) {
		@@ -243,6 +242,10 @@ public class CellularNetworkService extends NetworkService {

		private CellIdentity convertHalCellIdentityToCellIdentity(
		android.hardware.radio.V1_0.CellIdentity cellIdentity) {
		if (cellIdentity == null) {
		return null;
		}

		CellIdentity result = null;
		switch(cellIdentity.cellInfoType) {
		case CellInfoType.GSM: {