Reduce/Fix system logging

Bug: 5410239
Change-Id: I2f91dfde0b701e8905a1235696591b3154693c7c

2 files changed, 26 insertions, 18 deletions

diff --git a/core/java/android/net/DhcpStateMachine.java b/core/java/android/net/DhcpStateMachine.java
index 79c9395..fc6a44a 100644
--- a/core/java/android/net/DhcpStateMachine.java
+++ b/core/java/android/net/DhcpStateMachine.java
@@ -336,17 +336,17 @@ public class DhcpStateMachine extends StateMachine {
         DhcpInfoInternal dhcpInfoInternal = new DhcpInfoInternal();
 
         if (dhcpAction == DhcpAction.START) {
-            Log.d(TAG, "DHCP request on " + mInterfaceName);
+            if (DBG) Log.d(TAG, "DHCP request on " + mInterfaceName);
             success = NetworkUtils.runDhcp(mInterfaceName, dhcpInfoInternal);
             mDhcpInfo = dhcpInfoInternal;
         } else if (dhcpAction == DhcpAction.RENEW) {
-            Log.d(TAG, "DHCP renewal on " + mInterfaceName);
+            if (DBG) Log.d(TAG, "DHCP renewal on " + mInterfaceName);
             success = NetworkUtils.runDhcpRenew(mInterfaceName, dhcpInfoInternal);
             dhcpInfoInternal.updateFromDhcpRequest(mDhcpInfo);
         }
 
         if (success) {
-            Log.d(TAG, "DHCP succeeded on " + mInterfaceName);
+            if (DBG) Log.d(TAG, "DHCP succeeded on " + mInterfaceName);
            long leaseDuration = dhcpInfoInternal.leaseDuration; //int to long conversion
 
            //Sanity check for renewal
@@ -366,7 +366,7 @@ public class DhcpStateMachine extends StateMachine {
             mController.obtainMessage(CMD_POST_DHCP_ACTION, DHCP_SUCCESS, 0, dhcpInfoInternal)
                 .sendToTarget();
         } else {
-            Log.d(TAG, "DHCP failed on " + mInterfaceName + ": " +
+            Log.e(TAG, "DHCP failed on " + mInterfaceName + ": " +
                     NetworkUtils.getDhcpError());
             NetworkUtils.stopDhcp(mInterfaceName);
             mController.obtainMessage(CMD_POST_DHCP_ACTION, DHCP_FAILURE, 0)
diff --git a/core/java/android/net/DnsPinger.java b/core/java/android/net/DnsPinger.java
index 3291e6b..11acabe 100644
--- a/core/java/android/net/DnsPinger.java
+++ b/core/java/android/net/DnsPinger.java
@@ -22,7 +22,7 @@ import android.os.Looper;
 import android.os.Message;
 import android.os.SystemClock;
 import android.provider.Settings;
-import android.util.Slog;
+import android.util.Log;
 
 import com.android.internal.util.Protocol;
 
@@ -51,7 +51,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  * @hide
  */
 public final class DnsPinger extends Handler {
-    private static final boolean V = true;
+    private static final boolean DBG = false;
 
     private static final int RECEIVE_POLL_INTERVAL_MS = 200;
     private static final int DNS_PORT = 53;
@@ -154,7 +154,7 @@ public final class DnsPinger extends Handler {
                         newActivePing.socket.setNetworkInterface(NetworkInterface.getByName(
                                 getCurrentLinkProperties().getInterfaceName()));
                     } catch (Exception e) {
-                        Slog.w(TAG,"sendDnsPing::Error binding to socket", e);
+                        loge("sendDnsPing::Error binding to socket " + e);
                     }
 
                     newActivePing.packetId = (short) sRandom.nextInt();
@@ -165,8 +165,8 @@ public final class DnsPinger extends Handler {
                     // Send the DNS query
                     DatagramPacket packet = new DatagramPacket(buf,
                             buf.length, dnsAddress, DNS_PORT);
-                    if (V) {
-                        Slog.v(TAG, "Sending a ping " + newActivePing.internalId +
+                    if (DBG) {
+                        log("Sending a ping " + newActivePing.internalId +
                                 " to " + dnsAddress.getHostAddress()
                                 + " with packetId " + newActivePing.packetId + ".");
                     }
@@ -196,15 +196,15 @@ public final class DnsPinger extends Handler {
                             curPing.result =
                                     (int) (SystemClock.elapsedRealtime() - curPing.start);
                         } else {
-                            if (V) {
-                                Slog.v(TAG, "response ID didn't match, ignoring packet");
+                            if (DBG) {
+                                log("response ID didn't match, ignoring packet");
                             }
                         }
                     } catch (SocketTimeoutException e) {
                         // A timeout here doesn't mean anything - squelsh this exception
                     } catch (Exception e) {
-                        if (V) {
-                            Slog.v(TAG, "DnsPinger.pingDns got socket exception: ", e);
+                        if (DBG) {
+                            log("DnsPinger.pingDns got socket exception: " + e);
                         }
                         curPing.result = SOCKET_EXCEPTION;
                     }
@@ -244,13 +244,13 @@ public final class DnsPinger extends Handler {
     public List<InetAddress> getDnsList() {
         LinkProperties curLinkProps = getCurrentLinkProperties();
         if (curLinkProps == null) {
-            Slog.e(TAG, "getCurLinkProperties:: LP for type" + mConnectionType + " is null!");
+            loge("getCurLinkProperties:: LP for type" + mConnectionType + " is null!");
             return mDefaultDns;
         }
 
         Collection<InetAddress> dnses = curLinkProps.getDnses();
         if (dnses == null || dnses.size() == 0) {
-            Slog.v(TAG, "getDns::LinkProps has null dns - returning default");
+            loge("getDns::LinkProps has null dns - returning default");
             return mDefaultDns;
         }
 
@@ -277,8 +277,8 @@ public final class DnsPinger extends Handler {
     }
 
     private void sendResponse(int internalId, int externalId, int responseVal) {
-        if(V) {
-            Slog.d(TAG, "Responding to packet " + internalId +
+        if(DBG) {
+            log("Responding to packet " + internalId +
                     " externalId " + externalId +
                     " and val " + responseVal);
         }
@@ -304,7 +304,7 @@ public final class DnsPinger extends Handler {
         try {
             return NetworkUtils.numericToInetAddress(dns);
         } catch (IllegalArgumentException e) {
-            Slog.w(TAG, "getDefaultDns::malformed default dns address");
+            loge("getDefaultDns::malformed default dns address");
             return null;
         }
     }
@@ -323,4 +323,12 @@ public final class DnsPinger extends Handler {
         0, 1, // QTYPE, set to 1 = A (host address)
         0, 1  // QCLASS, set to 1 = IN (internet)
     };
+
+    private void log(String s) {
+        Log.d(TAG, s);
+    }
+
+    private void loge(String s) {
+        Log.e(TAG, s);
+    }
 }