summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYashdev Singh <yashdevs@codeaurora.org>2015-09-23 20:25:12 -0700
committerLinux Build Service Account <lnxbuild@localhost>2015-10-06 03:28:57 -0600
commitc96a60e262093e2ae4e4f31349c1864ce83a5bfb (patch)
treecd661c78213723504355efef2061f6804fe0317c
parent3614116d468d077641b0374997c45978d3c738a9 (diff)
downloadframeworks_base-c96a60e262093e2ae4e4f31349c1864ce83a5bfb.zip
frameworks_base-c96a60e262093e2ae4e4f31349c1864ce83a5bfb.tar.gz
frameworks_base-c96a60e262093e2ae4e4f31349c1864ce83a5bfb.tar.bz2
Revert "Reduce CONNECTIVITY_CHANGE bcasts"
This reverts commit cfa1c51af1e70e499410453861e28622066ebf86. Change-Id: If52afc1c231a45d6e418bfc8165d639413673a6f
-rw-r--r--core/java/android/net/ConnectivityManager.java10
1 files changed, 4 insertions, 6 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index ddfca9e..15016c2 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -1049,13 +1049,11 @@ 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;
- // 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_MMS)) {
+ type = "enableMMS";
+ result = TYPE_MOBILE_MMS;
} else if (netCap.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) {
type = "enableHIPRI";
result = TYPE_MOBILE_HIPRI;