am 4b43f944: am 495056ab: Merge "Turn off DUN connection after tethering." into honeycomb am: b3708c3de8

Original change: undetermined

Change-Id: I762614fe76f60da3ee31c006183272c52e8548d9
This commit is contained in:
Robert Greenwalt
2021-05-31 11:01:48 +00:00
committed by Automerger Merge Worker

View File

@@ -849,7 +849,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
usedNetworkType = ConnectivityManager.TYPE_MOBILE_MMS;
} else if (TextUtils.equals(feature, Phone.FEATURE_ENABLE_SUPL)) {
usedNetworkType = ConnectivityManager.TYPE_MOBILE_SUPL;
} else if (TextUtils.equals(feature, Phone.FEATURE_ENABLE_DUN)) {
} else if (TextUtils.equals(feature, Phone.FEATURE_ENABLE_DUN) ||
TextUtils.equals(feature, Phone.FEATURE_ENABLE_DUN_ALWAYS)) {
usedNetworkType = ConnectivityManager.TYPE_MOBILE_DUN;
} else if (TextUtils.equals(feature, Phone.FEATURE_ENABLE_HIPRI)) {
usedNetworkType = ConnectivityManager.TYPE_MOBILE_HIPRI;
@@ -870,6 +871,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
return 1;
}
callTeardown = true;
} else {
if (DBG) log("not a known feature - dropping");
}
}
if (DBG) log("Doing network teardown");