Snap for 9121707 from 46dbee08fc876fc0d77c0ad94d9a933341f05945 to tm-qpr1-release (400854bc) · Commits · e / os / android_frameworks_opt_telephony

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

+11 −6

Original line number	Diff line number	Diff line
		@@ -2451,26 +2451,31 @@ public class DataNetwork extends StateMachine {
		reportAnomaly("Invalid DataCallResponse detected",
		"1f273e9d-b09c-46eb-ad1c-421d01f61164");
		}
		if (mDataProfile.getApnSetting() != null && mPhone.getServiceState().getDataRegState()
		== ServiceState.STATE_IN_SERVICE) {
		NetworkRegistrationInfo nri = getNetworkRegistrationInfo();
		if (mDataProfile.getApnSetting() != null && nri != null && nri.isInService()) {
		boolean isRoaming = mPhone.getServiceState().getDataRoamingFromRegistration();
		int protocol = isRoaming ? mDataProfile.getApnSetting().getRoamingProtocol()
		: mDataProfile.getApnSetting().getProtocol();
		String underlyingDataService = mTransport
		== AccessNetworkConstants.TRANSPORT_TYPE_WWAN
		? "RIL" : "IWLAN data service";
		if (protocol == ApnSetting.PROTOCOL_IP) {
		if (response.getAddresses().stream().anyMatch(
		la -> la.getAddress() instanceof java.net.Inet6Address)) {
		loge("Invalid DataCallResponse. Requested IPv4 but got IPv6 address. "
		+ response);
		reportAnomaly("RIL reported mismatched IP type. Requested IPv6 "
		+ "but got IPv4 address.", "7744f920-fb64-4db0-ba47-de0eae485a7f");
		reportAnomaly(underlyingDataService + " reported mismatched IP "
		+ "type. Requested IPv4 but got IPv6 address.",
		"7744f920-fb64-4db0-ba47-de0eae485a80");
		}
		} else if (protocol == ApnSetting.PROTOCOL_IPV6) {
		if (response.getAddresses().stream().anyMatch(
		la -> la.getAddress() instanceof java.net.Inet4Address)) {
		loge("Invalid DataCallResponse. Requested IPv6 but got IPv4 address. "
		+ response);
		reportAnomaly("RIL reported mismatched IP type. Requested IPv4 "
		+ "but got IPv6 address.", "7744f920-fb64-4db0-ba47-de0eae485a7f");
		reportAnomaly(underlyingDataService + " reported mismatched IP "
		+ "type. Requested IPv6 but got IPv4 address.",
		"7744f920-fb64-4db0-ba47-de0eae485a80");
		}
		}
		}