Snap for 8283691 from 5ad5e0b9663a745a5f1309df4439acf2ae5eb7bb to tm-d1-release (79fcf814) · Commits · e / os / android_frameworks_opt_telephony

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -120,6 +120,7 @@ public class NetworkTypeController extends StateMachine {
		sEvents[EVENT_INITIALIZE] = "EVENT_INITIALIZE";
		sEvents[EVENT_PHYSICAL_CHANNEL_CONFIG_CHANGED] = "EVENT_PHYSICAL_CHANNEL_CONFIG_CHANGED";
		sEvents[EVENT_PCO_DATA_CHANGED] = "EVENT_PCO_DATA_CHANGED";
		sEvents[EVENT_BANDWIDTH_CHANGED] = "EVENT_BANDWIDTH_CHANGED";
		sEvents[EVENT_UPDATE_NR_ADVANCED_STATE] = "EVENT_UPDATE_NR_ADVANCED_STATE";
		}

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

+11 −8

Original line number	Diff line number	Diff line
		@@ -1374,7 +1374,7 @@ public class RILUtils {
		android.hardware.radio.network.RadioAccessSpecifierBands bandsInHalFormat =
		new android.hardware.radio.network.RadioAccessSpecifierBands();
		rasInHalFormat.accessNetwork = convertToHalAccessNetworkAidl(ras.getRadioAccessNetwork());
		int[] bands = null;
		int[] bands;
		if (ras.getBands() != null) {
		bands = new int[ras.getBands().length];
		for (int i = 0; i < ras.getBands().length; i++) {
		@@ -1385,29 +1385,32 @@ public class RILUtils {
		}
		switch (ras.getRadioAccessNetwork()) {
		case AccessNetworkConstants.AccessNetworkType.GERAN:
		bandsInHalFormat.geranBands(bands);
		bandsInHalFormat.setGeranBands(bands);
		break;
		case AccessNetworkConstants.AccessNetworkType.UTRAN:
		bandsInHalFormat.utranBands(bands);
		bandsInHalFormat.setUtranBands(bands);
		break;
		case AccessNetworkConstants.AccessNetworkType.EUTRAN:
		bandsInHalFormat.eutranBands(bands);
		bandsInHalFormat.setEutranBands(bands);
		break;
		case AccessNetworkConstants.AccessNetworkType.NGRAN:
		bandsInHalFormat.ngranBands(bands);
		bandsInHalFormat.setNgranBands(bands);
		break;
		default:
		return null;
		}
		rasInHalFormat.bands = bandsInHalFormat;

		int[] channels;
		if (ras.getChannels() != null) {
		int[] channels = new int[ras.getChannels().length];
		channels = new int[ras.getChannels().length];
		for (int i = 0; i < ras.getChannels().length; i++) {
		channels[i] = ras.getChannels()[i];
		}
		rasInHalFormat.channels = channels;
		} else {
		channels = new int[0];
		}
		rasInHalFormat.channels = channels;

		return rasInHalFormat;
		}
		@@ -2751,7 +2754,7 @@ public class RILUtils {
		android.hardware.radio.network.CellIdentityGsm cid) {
		return new CellIdentityGsm(cid.lac, cid.cid, cid.arfcn,
		cid.bsic == (byte) 0xFF ? CellInfo.UNAVAILABLE : cid.bsic, cid.mcc, cid.mnc,
		"", "", new ArraySet<>());
		cid.operatorNames.alphaLong, cid.operatorNames.alphaShort, new ArraySet<>());
		}

		/**

src/java/com/android/internal/telephony/data/CellularDataService.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -92,9 +92,8 @@ public class CellularDataService extends DataService {
		int error = (int) ar.result;
		callback.onDeactivateDataCallComplete(ar.exception != null
		? DataServiceCallback.RESULT_ERROR_ILLEGAL_STATE
		: error == RadioError.RADIO_NOT_AVAILABLE
		? DataServiceCallback.RESULT_ERROR_RADIO_NOT_AVAILABLE
		: RESULT_SUCCESS);
		: error == RadioError.NONE ? RESULT_SUCCESS
		: DataServiceCallback.RESULT_ERROR_INVALID_RESPONSE);
		break;
		case SET_INITIAL_ATTACH_APN_COMPLETE:
		callback.onSetInitialAttachApnComplete(ar.exception != null

src/java/com/android/internal/telephony/data/DataNetwork.java

+75 −3

Original line number	Diff line number	Diff line
		@@ -124,7 +124,7 @@ import java.util.stream.Collectors;
		* {@link DisconnectingState} when performing graceful tear down or when sending the data
		* deactivation request. At the end, it enters {@link DisconnectedState} when {@link DataService}
		* notifies data disconnected. Note that an unsolicited disconnected event from {@link DataService}
		* or a RADIO_NOT_AVAILABLE response can immediately move data network from {@link ConnectedState}
		* or any vendor HAL failure response can immediately move data network from {@link ConnectedState}
		* to {@link DisconnectedState}. {@link DisconnectedState} is the final state of a data network.
		*
		* State machine diagram:
		@@ -237,6 +237,18 @@ public class DataNetwork extends StateMachine {
		TEAR_DOWN_REASON_HANDOVER_NOT_ALLOWED,
		TEAR_DOWN_REASON_VCN_REQUESTED,
		TEAR_DOWN_REASON_VOPS_NOT_SUPPORTED,
		TEAR_DOWN_REASON_DEFAULT_DATA_UNSELECTED,
		TEAR_DOWN_REASON_NOT_IN_SERVICE,
		TEAR_DOWN_REASON_DATA_CONFIG_NOT_READY,
		TEAR_DOWN_REASON_PENDING_TEAR_DOWN_ALL,
		TEAR_DOWN_REASON_NO_SUITABLE_DATA_PROFILE,
		TEAR_DOWN_REASON_EMERGENCY_CALL,
		TEAR_DOWN_REASON_RETRY_SCHEDULED,
		TEAR_DOWN_REASON_DATA_THROTTLED,
		TEAR_DOWN_REASON_DATA_PROFILE_INVALID,
		TEAR_DOWN_REASON_DATA_PROFILE_NOT_PREFERRED,
		TEAR_DOWN_REASON_NOT_ALLOWED_BY_POLICY,
		TEAR_DOWN_REASON_ILLEGAL_STATE,
		})
		public @interface TearDownReason {}

		@@ -288,6 +300,42 @@ public class DataNetwork extends StateMachine {
		/** Data network tear down due to VOPS no longer supported. */
		public static final int TEAR_DOWN_REASON_VOPS_NOT_SUPPORTED = 16;

		/** Data network tear down due to default data unselected. */
		public static final int TEAR_DOWN_REASON_DEFAULT_DATA_UNSELECTED = 17;

		/** Data network tear down due to device not in service. */
		public static final int TEAR_DOWN_REASON_NOT_IN_SERVICE = 18;

		/** Data network tear down due to data config not ready. */
		public static final int TEAR_DOWN_REASON_DATA_CONFIG_NOT_READY = 19;

		/** Data network tear down due to tear down all pending. */
		public static final int TEAR_DOWN_REASON_PENDING_TEAR_DOWN_ALL = 20;

		/** Data network tear down due to no suitable data profile. */
		public static final int TEAR_DOWN_REASON_NO_SUITABLE_DATA_PROFILE = 21;

		/** Data network tear down due to emergency call. */
		public static final int TEAR_DOWN_REASON_EMERGENCY_CALL = 22;

		/** Data network tear down due to retry scheduled. */
		public static final int TEAR_DOWN_REASON_RETRY_SCHEDULED = 23;

		/** Data network tear down due to data throttled. */
		public static final int TEAR_DOWN_REASON_DATA_THROTTLED = 24;

		/** Data network tear down due to data profile invalid. */
		public static final int TEAR_DOWN_REASON_DATA_PROFILE_INVALID = 25;

		/** Data network tear down due to data profile not preferred. */
		public static final int TEAR_DOWN_REASON_DATA_PROFILE_NOT_PREFERRED = 26;

		/** Data network tear down due to not allowed by policy. */
		public static final int TEAR_DOWN_REASON_NOT_ALLOWED_BY_POLICY = 27;

		/** Data network tear down due to illegal state. */
		public static final int TEAR_DOWN_REASON_ILLEGAL_STATE = 28;

		@IntDef(prefix = {"BANDWIDTH_SOURCE_"},
		value = {
		BANDWIDTH_SOURCE_UNKNOWN,
		@@ -1955,8 +2003,8 @@ public class DataNetwork extends StateMachine {
		private void onDeactivateResponse(@DataServiceCallback.ResultCode int resultCode) {
		logl("onDeactivateResponse: resultCode="
		+ DataServiceCallback.resultCodeToString(resultCode));
		if (resultCode == DataServiceCallback.RESULT_ERROR_RADIO_NOT_AVAILABLE) {
		log("Remove network since deactivate request returned RADIO_NOT_AVAILABLE.");
		if (resultCode == DataServiceCallback.RESULT_ERROR_INVALID_RESPONSE) {
		log("Remove network since deactivate request returned an error.");
		mDataNetworkCallback.invokeFromExecutor(
		() -> mDataNetworkCallback.onDisconnected(
		DataNetwork.this, DataFailCause.RADIO_NOT_AVAILABLE));
		@@ -2657,6 +2705,30 @@ public class DataNetwork extends StateMachine {
		return "TEAR_DOWN_REASON_VCN_REQUESTED";
		case TEAR_DOWN_REASON_VOPS_NOT_SUPPORTED:
		return "TEAR_DOWN_REASON_VOPS_NOT_SUPPORTED";
		case TEAR_DOWN_REASON_DEFAULT_DATA_UNSELECTED:
		return "TEAR_DOWN_REASON_DEFAULT_DATA_UNSELECTED";
		case TEAR_DOWN_REASON_NOT_IN_SERVICE:
		return "TEAR_DOWN_REASON_NOT_IN_SERVICE";
		case TEAR_DOWN_REASON_DATA_CONFIG_NOT_READY:
		return "TEAR_DOWN_REASON_DATA_CONFIG_NOT_READY";
		case TEAR_DOWN_REASON_PENDING_TEAR_DOWN_ALL:
		return "TEAR_DOWN_REASON_PENDING_TEAR_DOWN_ALL";
		case TEAR_DOWN_REASON_NO_SUITABLE_DATA_PROFILE:
		return "TEAR_DOWN_REASON_NO_SUITABLE_DATA_PROFILE";
		case TEAR_DOWN_REASON_EMERGENCY_CALL:
		return "TEAR_DOWN_REASON_EMERGENCY_CALL";
		case TEAR_DOWN_REASON_RETRY_SCHEDULED:
		return "TEAR_DOWN_REASON_RETRY_SCHEDULED";
		case TEAR_DOWN_REASON_DATA_THROTTLED:
		return "TEAR_DOWN_REASON_DATA_THROTTLED";
		case TEAR_DOWN_REASON_DATA_PROFILE_INVALID:
		return "TEAR_DOWN_REASON_DATA_PROFILE_INVALID";
		case TEAR_DOWN_REASON_DATA_PROFILE_NOT_PREFERRED:
		return "TEAR_DOWN_REASON_DATA_PROFILE_NOT_PREFERRED";
		case TEAR_DOWN_REASON_NOT_ALLOWED_BY_POLICY:
		return "TEAR_DOWN_REASON_NOT_ALLOWED_BY_POLICY";
		case TEAR_DOWN_REASON_ILLEGAL_STATE:
		return "TEAR_DOWN_REASON_ILLEGAL_STATE";
		default:
		return "UNKNOWN(" + reason + ")";
		}

src/java/com/android/internal/telephony/data/DataNetworkController.java

+28 −3

Original line number	Diff line number	Diff line
		@@ -1483,7 +1483,8 @@ public class DataNetworkController extends Handler {

		// If users switch preferred profile in APN editor, we need to tear down network.
		if (dataNetwork.isInternetSupported()
		&& !mDataProfileManager.isDataProfilePreferred(dataProfile)) {
		&& !mDataProfileManager.isDataProfilePreferred(dataProfile)
		&& mDataProfileManager.isAnyPreferredDataProfileExisting()) {
		evaluation.addDataDisallowedReason(DataDisallowedReason.DATA_PROFILE_NOT_PREFERRED);
		}

		@@ -1616,20 +1617,44 @@ public class DataNetworkController extends Handler {
		return DataNetwork.TEAR_DOWN_REASON_DATA_DISABLED;
		case ROAMING_DISABLED:
		return DataNetwork.TEAR_DOWN_REASON_ROAMING_DISABLED;
		case DEFAULT_DATA_UNSELECTED:
		return DataNetwork.TEAR_DOWN_REASON_DEFAULT_DATA_UNSELECTED;
		case NOT_IN_SERVICE:
		return DataNetwork.TEAR_DOWN_REASON_NOT_IN_SERVICE;
		case DATA_CONFIG_NOT_READY:
		return DataNetwork.TEAR_DOWN_REASON_DATA_CONFIG_NOT_READY;
		case SIM_NOT_READY:
		return DataNetwork.TEAR_DOWN_REASON_SIM_REMOVAL;
		case CONCURRENT_VOICE_DATA_NOT_ALLOWED:
		return DataNetwork.TEAR_DOWN_REASON_CONCURRENT_VOICE_DATA_NOT_ALLOWED;
		case DATA_RESTRICTED_BY_NETWORK:
		return DataNetwork.TEAR_DOWN_REASON_DATA_RESTRICTED_BY_NETWORK;
		case RADIO_DISABLED_BY_CARRIER:
		return DataNetwork.TEAR_DOWN_REASON_POWER_OFF_BY_CARRIER;
		case RADIO_POWER_OFF:
		return DataNetwork.TEAR_DOWN_REASON_AIRPLANE_MODE_ON;
		case PENDING_TEAR_DOWN_ALL:
		return DataNetwork.TEAR_DOWN_REASON_PENDING_TEAR_DOWN_ALL;
		case RADIO_DISABLED_BY_CARRIER:
		return DataNetwork.TEAR_DOWN_REASON_POWER_OFF_BY_CARRIER;
		case DATA_SERVICE_NOT_READY:
		return DataNetwork.TEAR_DOWN_REASON_DATA_SERVICE_NOT_READY;
		case NO_SUITABLE_DATA_PROFILE:
		return DataNetwork.TEAR_DOWN_REASON_NO_SUITABLE_DATA_PROFILE;
		case DATA_NETWORK_TYPE_NOT_ALLOWED:
		return DataNetwork.TEAR_DOWN_REASON_RAT_NOT_ALLOWED;
		case EMERGENCY_CALL:
		return DataNetwork.TEAR_DOWN_REASON_EMERGENCY_CALL;
		case RETRY_SCHEDULED:
		return DataNetwork.TEAR_DOWN_REASON_RETRY_SCHEDULED;
		case DATA_THROTTLED:
		return DataNetwork.TEAR_DOWN_REASON_DATA_THROTTLED;
		case DATA_PROFILE_INVALID:
		return DataNetwork.TEAR_DOWN_REASON_DATA_PROFILE_INVALID;
		case DATA_PROFILE_NOT_PREFERRED:
		return DataNetwork.TEAR_DOWN_REASON_DATA_PROFILE_NOT_PREFERRED;
		case NOT_ALLOWED_BY_POLICY:
		return DataNetwork.TEAR_DOWN_REASON_NOT_ALLOWED_BY_POLICY;
		case ILLEGAL_STATE:
		return DataNetwork.TEAR_DOWN_REASON_ILLEGAL_STATE;
		case VOPS_NOT_SUPPORTED:
		return DataNetwork.TEAR_DOWN_REASON_VOPS_NOT_SUPPORTED;
		}