Merge "Only tearing down restricted metered data when data is enabled" into oc-dr1-dev (76fef02b) · Commits · e / os / android_frameworks_opt_telephony

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

+4 −3

Original line number	Diff line number	Diff line
		@@ -904,11 +904,12 @@ public class DcTracker extends Handler {
		if (dcac != null) {
		final NetworkCapabilities netCaps = dcac.getNetworkCapabilitiesSync();
		if (netCaps != null && !netCaps.hasCapability(NetworkCapabilities
		.NET_CAPABILITY_NOT_RESTRICTED)) {
		.NET_CAPABILITY_NOT_RESTRICTED) && !netCaps.hasCapability(
		NetworkCapabilities.NET_CAPABILITY_NOT_METERED)) {
		if (DBG) {
		log("Tearing down restricted net:" + apnContext);
		log("Tearing down restricted metered net:" + apnContext);
		}
		// Tearing down the restricted data call (metered or unmetered) when
		// Tearing down the restricted metered data call when
		// conditions change. This will allow reestablishing a new unrestricted
		// data connection.
		apnContext.setReason(Phone.REASON_DATA_ENABLED);