Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5799f428 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

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

* commit 'e3bcde94':
  Reduce CONNECTIVITY_CHANGE bcasts
parents b774e554 e3bcde94

core/java/android/net/ConnectivityManager.java

+6 −4
Original line number Diff line number Diff line
@@ -1040,9 +1040,11 @@ public class ConnectivityManager { 
        } else if (netCap.hasCapability(NetworkCapabilities.NET_CAPABILITY_SUPL)) {

           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;