Merge "Fixed crash in data connection" (05378942) · Commits · e / os / android_frameworks_opt_telephony

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -872,7 +872,8 @@ public class DataConnection extends StateMachine {
		if (mApnSetting != null) {
		for (String type : mApnSetting.types) {
		if (!mRestrictedNetworkOverride
		&& mConnectionParams.mUnmeteredUseOnly && ApnSetting.isMeteredApnType(type,
		&& (mConnectionParams != null && mConnectionParams.mUnmeteredUseOnly)
		&& ApnSetting.isMeteredApnType(type,
		mPhone.getContext(), mPhone.getSubId(),
		mPhone.getServiceState().getDataRoaming())) {
		log("Dropped the metered " + type + " for the unmetered data call.");
		@@ -935,7 +936,8 @@ public class DataConnection extends StateMachine {
		// Mark NOT_METERED in the following cases,
		// 1. All APNs in APN settings are unmetered.
		// 2. The non-restricted data and is intended for unmetered use only.
		if ((mConnectionParams.mUnmeteredUseOnly && !mRestrictedNetworkOverride)
		if (((mConnectionParams != null && mConnectionParams.mUnmeteredUseOnly)
		&& !mRestrictedNetworkOverride)
		\|\| !mApnSetting.isMetered(mPhone.getContext(), mPhone.getSubId(),
		mPhone.getServiceState().getDataRoaming())) {
		result.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED);