diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2015-08-28 21:47:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-28 21:47:20 +0000 |
| commit | 77d02900d8ab287f8dcecabda44766e15dbfad4f (patch) | |
| tree | 72b9e216333430fb10a207874062690ae15cba0f | |
| parent | e3238e53ded59d360447d94f4d52d3b20de906c2 (diff) | |
| parent | 5799f428063cec8f0b85cdff41185e0725b19b74 (diff) | |
| download | frameworks_base-77d02900d8ab287f8dcecabda44766e15dbfad4f.zip frameworks_base-77d02900d8ab287f8dcecabda44766e15dbfad4f.tar.gz frameworks_base-77d02900d8ab287f8dcecabda44766e15dbfad4f.tar.bz2 | |
am 5799f428: am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev
* commit '5799f428063cec8f0b85cdff41185e0725b19b74':
Reduce CONNECTIVITY_CHANGE bcasts
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index a4e6219..ec0cc6d 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -1038,11 +1038,13 @@ public class ConnectivityManager { type = "enableDUN"; result = TYPE_MOBILE_DUN; } else if (netCap.hasCapability(NetworkCapabilities.NET_CAPABILITY_SUPL)) { - type = "enableSUPL"; + type = "enableSUPL"; result = TYPE_MOBILE_SUPL; - } else if (netCap.hasCapability(NetworkCapabilities.NET_CAPABILITY_MMS)) { - type = "enableMMS"; - result = TYPE_MOBILE_MMS; + // back out this hack for mms as they no longer need this and it's causing + // device slowdowns - b/23350688 (note, supl still needs this) + //} else if (netCap.hasCapability(NetworkCapabilities.NET_CAPABILITY_MMS)) { + // type = "enableMMS"; + // result = TYPE_MOBILE_MMS; } else if (netCap.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) { type = "enableHIPRI"; result = TYPE_MOBILE_HIPRI; |