Snap for 8479981 from 87eea9fe91e665611a233ea5d8f5442c1a3e0be8 to tm-d1-release (b7c1e150) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -295,8 +295,10 @@ public class RadioMessagingProxy extends RadioServiceProxy {
		if (gsmPdu != null) {
		msg.gsmMessage = new android.hardware.radio.messaging.GsmSmsMessage[]{
		RILUtils.convertToHalGsmSmsMessageAidl(smscPdu, gsmPdu)};
		msg.cdmaMessage = new android.hardware.radio.messaging.CdmaSmsMessage[0];
		}
		if (cdmaPdu != null) {
		msg.gsmMessage = new android.hardware.radio.messaging.GsmSmsMessage[0];
		msg.cdmaMessage = new android.hardware.radio.messaging.CdmaSmsMessage[]{
		RILUtils.convertToHalCdmaSmsMessageAidl(cdmaPdu)};
		}

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

+7 −2

Original line number	Diff line number	Diff line
		@@ -1831,8 +1831,13 @@ public class DataNetworkController extends Handler {

		// Matching the rules by the configured order. Bail out if find first matching rule.
		for (HandoverRule rule : handoverRules) {
		// Check if the rule is only for roaming and we are not roaming.
		if (rule.isOnlyForRoaming && !mServiceState.getDataRoaming()) continue;
		// Check if the rule is only for roaming and we are not roaming. Use the real
		// roaming state reported by modem instead of using the overridden roaming state.
		if (rule.isOnlyForRoaming && !mServiceState.getDataRoamingFromRegistration()) {
		// If the rule is for roaming only, and the device is not roaming, then bypass
		// this rule.
		continue;
		}

		if (rule.sourceAccessNetworks.contains(sourceAccessNetwork)
		&& rule.targetAccessNetworks.contains(targetAccessNetwork)) {

src/java/com/android/internal/telephony/metrics/MetricsCollector.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import static com.android.internal.telephony.TelephonyStatsLog.CARRIER_ID_TABLE_
		import static com.android.internal.telephony.TelephonyStatsLog.CELLULAR_DATA_SERVICE_SWITCH;
		import static com.android.internal.telephony.TelephonyStatsLog.CELLULAR_SERVICE_STATE;
		import static com.android.internal.telephony.TelephonyStatsLog.DATA_CALL_SESSION;
		import static com.android.internal.telephony.TelephonyStatsLog.DEVICE_TELEPHONY_PROPERTIES;
		import static com.android.internal.telephony.TelephonyStatsLog.GBA_EVENT;
		import static com.android.internal.telephony.TelephonyStatsLog.IMS_DEDICATED_BEARER_EVENT;
		import static com.android.internal.telephony.TelephonyStatsLog.IMS_DEDICATED_BEARER_LISTENER_EVENT;
		@@ -165,6 +166,7 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
		registerAtom(SIP_TRANSPORT_FEATURE_TAG_STATS, POLICY_PULL_DAILY);
		registerAtom(SIP_MESSAGE_RESPONSE, POLICY_PULL_DAILY);
		registerAtom(SIP_TRANSPORT_SESSION, POLICY_PULL_DAILY);
		registerAtom(DEVICE_TELEPHONY_PROPERTIES, null);
		registerAtom(IMS_DEDICATED_BEARER_LISTENER_EVENT, POLICY_PULL_DAILY);
		registerAtom(IMS_DEDICATED_BEARER_EVENT, POLICY_PULL_DAILY);
		registerAtom(IMS_REGISTRATION_SERVICE_DESC_STATS, POLICY_PULL_DAILY);
		@@ -217,6 +219,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
		return pullImsRegistrationTermination(data);
		case TELEPHONY_NETWORK_REQUESTS_V2:
		return pullTelephonyNetworkRequestsV2(data);
		case DEVICE_TELEPHONY_PROPERTIES:
		return pullDeviceTelephonyProperties(data);
		case IMS_REGISTRATION_FEATURE_TAG_STATS:
		return pullImsRegistrationFeatureTagStats(data);
		case RCS_CLIENT_PROVISIONING_STATS:
		@@ -471,6 +475,17 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
		}
		}

		private static int pullDeviceTelephonyProperties(List<StatsEvent> data) {
		Phone[] phones = getPhonesIfAny();
		if (phones.length == 0) {
		return StatsManager.PULL_SKIP;
		}

		data.add(TelephonyStatsLog.buildStatsEvent(DEVICE_TELEPHONY_PROPERTIES,
		phones[0].isUsingNewDataStack()));
		return StatsManager.PULL_SUCCESS;
		}

		private int pullImsRegistrationFeatureTagStats(List<StatsEvent> data) {
		RcsStats.getInstance().onFlushIncompleteImsRegistrationFeatureTagStats();

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

+39 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,8 @@ import static org.mockito.Mockito.mock;

		import android.hardware.radio.V1_6.NrSignalStrength;
		import android.os.Parcel;
		import android.os.PersistableBundle;
		import android.telephony.CarrierConfigManager;
		import android.telephony.CellInfo;
		import android.telephony.CellSignalStrength;
		import android.telephony.CellSignalStrengthNr;
		@@ -255,4 +257,41 @@ public class CellSignalStrengthNrTest extends TelephonyTest {
		css.updateLevel(null, mSS);
		assertEquals(1 /* MODERATE */, css.getLevel());
		}

		@Test
		public void testSignalLevel_ThresholdBoundaries() {
		int[] ssRsrpThresholds = {
		-110, /* SIGNAL_STRENGTH_POOR */
		-90, /* SIGNAL_STRENGTH_MODERATE */
		-80, /* SIGNAL_STRENGTH_GOOD */
		-65, /* SIGNAL_STRENGTH_GREAT */
		};
		PersistableBundle bundle = new PersistableBundle();
		bundle.putInt(CarrierConfigManager.KEY_PARAMETERS_USE_FOR_5G_NR_SIGNAL_BAR_INT,
		CellSignalStrengthNr.USE_SSRSRP);
		bundle.putIntArray(CarrierConfigManager.KEY_5G_NR_SSRSRP_THRESHOLDS_INT_ARRAY,
		ssRsrpThresholds);

		CellSignalStrengthNr css;

		css = new CellSignalStrengthNr(CSIRSRP, CSIRSRQ, CSISINR, ssRsrpThresholds[0], SSRSRQ,
		SSSINR);
		css.updateLevel(bundle, null);
		assertEquals(CellSignalStrength.SIGNAL_STRENGTH_POOR, css.getLevel());

		css = new CellSignalStrengthNr(CSIRSRP, CSIRSRQ, CSISINR, ssRsrpThresholds[1], SSRSRQ,
		SSSINR);
		css.updateLevel(bundle, null);
		assertEquals(CellSignalStrength.SIGNAL_STRENGTH_MODERATE, css.getLevel());

		css = new CellSignalStrengthNr(CSIRSRP, CSIRSRQ, CSISINR, ssRsrpThresholds[2], SSRSRQ,
		SSSINR);
		css.updateLevel(bundle, null);
		assertEquals(CellSignalStrength.SIGNAL_STRENGTH_GOOD, css.getLevel());

		css = new CellSignalStrengthNr(CSIRSRP, CSIRSRQ, CSISINR, ssRsrpThresholds[3], SSRSRQ,
		SSSINR);
		css.updateLevel(bundle, null);
		assertEquals(CellSignalStrength.SIGNAL_STRENGTH_GREAT, css.getLevel());
		}
		}

tests/telephonytests/src/com/android/internal/telephony/data/DataNetworkControllerTest.java

+51 −0

Original line number	Diff line number	Diff line
		@@ -461,6 +461,8 @@ public class DataNetworkControllerTest extends TelephonyTest {
		.setRegistrationState(regState)
		.setDomain(NetworkRegistrationInfo.DOMAIN_CS)
		.build());
		ss.setDataRoamingFromRegistration(regState
		== NetworkRegistrationInfo.REGISTRATION_STATE_ROAMING);
		doReturn(ss).when(mSST).getServiceState();
		doReturn(ss).when(mPhone).getServiceState();

		@@ -1728,6 +1730,55 @@ public class DataNetworkControllerTest extends TelephonyTest {
		any());
		}

		@Test
		public void testHandoverDataNetworkNotAllowedByRoamingPolicy() throws Exception {
		mCarrierConfig.putStringArray(CarrierConfigManager.KEY_IWLAN_HANDOVER_POLICY_STRING_ARRAY,
		new String[]{"source=EUTRAN\|NGRAN\|IWLAN, target=EUTRAN\|NGRAN\|IWLAN, roaming=true, "
		+ "type=disallowed, capabilities=IMS"});
		serviceStateChanged(TelephonyManager.NETWORK_TYPE_LTE,
		NetworkRegistrationInfo.REGISTRATION_STATE_ROAMING);
		// Force data config manager to reload the carrier config.
		mDataNetworkControllerUT.getDataConfigManager().obtainMessage(
		1/EVENT_CARRIER_CONFIG_CHANGED/).sendToTarget();
		doReturn(AccessNetworkConstants.TRANSPORT_TYPE_WLAN).when(mAccessNetworksManager)
		.getPreferredTransportByNetworkCapability(NetworkCapabilities.NET_CAPABILITY_IMS);

		processAllMessages();

		// Bring up IMS PDN on IWLAN
		testSetupImsDataNetwork();

		doReturn(AccessNetworkConstants.TRANSPORT_TYPE_WWAN).when(mAccessNetworksManager)
		.getPreferredTransportByNetworkCapability(NetworkCapabilities.NET_CAPABILITY_IMS);
		mAccessNetworksManagerCallback.onPreferredTransportChanged(
		NetworkCapabilities.NET_CAPABILITY_IMS);

		// Verify IMS PDN is connected.
		verifyConnectedNetworkHasCapabilities(NetworkCapabilities.NET_CAPABILITY_IMS);

		// After this, IMS data network should be disconnected, and DNC should attempt to
		// establish a new one on cellular
		processAllMessages();

		// Verify all data disconnected.
		verify(mMockedDataNetworkControllerCallback).onAnyDataNetworkExistingChanged(eq(false));

		// Should setup a new one instead of handover.
		verify(mMockedWwanDataServiceManager).setupDataCall(anyInt(), any(DataProfile.class),
		anyBoolean(), anyBoolean(), eq(DataService.REQUEST_REASON_NORMAL), any(), anyInt(),
		any(), any(), anyBoolean(), any(Message.class));


		// A new data network should be connected on IWLAN
		List<DataNetwork> dataNetworkList = getDataNetworks();
		assertThat(dataNetworkList).hasSize(1);
		assertThat(dataNetworkList.get(0).isConnected()).isTrue();
		assertThat(dataNetworkList.get(0).getNetworkCapabilities().hasCapability(
		NetworkCapabilities.NET_CAPABILITY_IMS)).isTrue();
		assertThat(dataNetworkList.get(0).getTransport())
		.isEqualTo(AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
		}

		@Test
		public void testHandoverDataNetworkRetry() throws Exception {
		testSetupImsDataNetwork();