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

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

am 8e285f2f: Merge "Cut down some logs." into mnc-dr-dev 

* commit '8e285f2f':
  Cut down some logs.
parents ebff4c1d 8e285f2f

core/java/android/net/ConnectivityManager.java

+2 −1
Original line number Diff line number Diff line
@@ -2259,6 +2259,7 @@ public class ConnectivityManager { 
        private final AtomicInteger mRefCount;

        private static final String TAG = "ConnectivityManager.CallbackHandler";

        private final ConnectivityManager mCm;

        private static final boolean DBG = false;



        CallbackHandler(Looper looper, HashMap<NetworkRequest, NetworkCallback>callbackMap,

                AtomicInteger refCount, ConnectivityManager cm) {
@@ -2270,7 +2271,7 @@ public class ConnectivityManager { 


        @Override

        public void handleMessage(Message message) {

            Log.d(TAG, "CM callback handler got msg " + message.what);

            if (DBG) Log.d(TAG, "CM callback handler got msg " + message.what);

            NetworkRequest request = (NetworkRequest) getObject(message, NetworkRequest.class);

            Network network = (Network) getObject(message, Network.class);

            switch (message.what) {

services/core/java/com/android/server/ConnectivityService.java

+2 −2
Original line number Diff line number Diff line
@@ -511,7 +511,6 @@ public class ConnectivityService extends IConnectivityManager.Stub 


            ArrayList<NetworkAgentInfo> list = mTypeLists[type];

            if (list.contains(nai)) {

                loge("Attempting to register duplicate agent for type " + type + ": " + nai);

                return;

            }
@@ -4280,7 +4279,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        boolean keep = newNetwork.isVPN();

        boolean isNewDefault = false;

        NetworkAgentInfo oldDefaultNetwork = null;

        if (DBG) log("rematching " + newNetwork.name());

        if (VDBG) log("rematching " + newNetwork.name());

        // Find and migrate to this Network any NetworkRequests for

        // which this network is now the best.

        ArrayList<NetworkAgentInfo> affectedNetworks = new ArrayList<NetworkAgentInfo>();
@@ -4317,6 +4316,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                }

                if (currentNetwork == null ||

                        currentNetwork.getCurrentScore() < newNetwork.getCurrentScore()) {

                    if (DBG) log("rematch for " + newNetwork.name());

                    if (currentNetwork != null) {

                        if (DBG) log("   accepting network in place of " + currentNetwork.name());

                        currentNetwork.networkRequests.remove(nri.request.requestId);