Don't tear down a network unnecessarily.

If conditions ease so restricted networks are now allowed don't
just assume every up network needs to be torn down.  Instead
check and see if it's marked restricted (or not, not-restricted)
first.

bug:30490689
Change-Id: Ib19d45979f6f9e0b605a3e5b39f569a01d30d42b

1 files changed, 11 insertions, 0 deletions

diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
index 11e8cc14e..2b4b39b2e 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
@@ -909,6 +909,17 @@ public class DcTracker extends Handler {
                 if (apnContext.isConnectedOrConnecting() &&
                         apnContext.getApnSetting().isMetered(mPhone.getContext(),
                         mPhone.getSubId(), mPhone.getServiceState().getDataRoaming())) {
+
+                    final DcAsyncChannel dataConnectionAc = apnContext.getDcAc();
+                    if (dataConnectionAc != null) {
+                        final NetworkCapabilities nc =
+                                dataConnectionAc.getNetworkCapabilitiesSync();
+                        if (nc != null && nc.hasCapability(NetworkCapabilities.
+                              NET_CAPABILITY_NOT_RESTRICTED)) {
+                            if (DBG) log("not tearing down unrestricted metered net:" + apnContext);
+                            continue;
+                        }
+                    }
                     if (DBG) log("tearing down restricted metered net: " + apnContext);
                     apnContext.setReason(Phone.REASON_DATA_ENABLED);
                     cleanUpConnection(true, apnContext);