am 325c15df: am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev

* commit '325c15dfe3c31ea4d5e343fb170a0d20ad71bb4f':
  Reduce CONNECTIVITY_CHANGE bcasts
This commit is contained in:
Robert Greenwalt
2015-08-28 22:34:16 +00:00
committed by Android Git Automerger

View File

@@ -1038,11 +1038,13 @@ public class ConnectivityManager {
type = "enableDUN"; type = "enableDUN";
result = TYPE_MOBILE_DUN; result = TYPE_MOBILE_DUN;
} else if (netCap.hasCapability(NetworkCapabilities.NET_CAPABILITY_SUPL)) { } else if (netCap.hasCapability(NetworkCapabilities.NET_CAPABILITY_SUPL)) {
type = "enableSUPL"; type = "enableSUPL";
result = TYPE_MOBILE_SUPL; result = TYPE_MOBILE_SUPL;
} else if (netCap.hasCapability(NetworkCapabilities.NET_CAPABILITY_MMS)) { // back out this hack for mms as they no longer need this and it's causing
type = "enableMMS"; // device slowdowns - b/23350688 (note, supl still needs this)
result = TYPE_MOBILE_MMS; //} else if (netCap.hasCapability(NetworkCapabilities.NET_CAPABILITY_MMS)) {
// type = "enableMMS";
// result = TYPE_MOBILE_MMS;
} else if (netCap.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) { } else if (netCap.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) {
type = "enableHIPRI"; type = "enableHIPRI";
result = TYPE_MOBILE_HIPRI; result = TYPE_MOBILE_HIPRI;