commit 8a9b22056b13477f59df934928c00c58b5871c95
author Joe Onorato <joeo@android.com> Fri Feb 26 18:56:32 2010 -0800
committer Joe Onorato <joeo@android.com> Mon Mar 01 13:06:50 2010 -0800
tree ba3f00f16d2f0b744de34b49da37f4df2da7e95e
parent 0ec40173b6875cf5ab0b95fb0b2e480f18bfcfbf

Switch the services library to using the new Slog

services/java/com/android/server/NetworkManagementService.java

diff --git a/services/java/com/android/server/NetworkManagementService.java b/services/java/com/android/server/NetworkManagementService.java
index 7c555e2..6d121c3 100644
--- a/services/java/com/android/server/NetworkManagementService.java
+++ b/services/java/com/android/server/NetworkManagementService.java
@@ -30,7 +30,7 @@
 import android.os.Handler;
 import android.os.SystemProperties;
 import android.text.TextUtils;
-import android.util.Log;
+import android.util.Slog;
 import java.util.ArrayList;
 import java.util.StringTokenizer;
 import android.provider.Settings;
@@ -99,12 +99,12 @@
     }
 
     public void registerObserver(INetworkManagementEventObserver obs) {
-        Log.d(TAG, "Registering observer");
+        Slog.d(TAG, "Registering observer");
         mObservers.add(obs);
     }
 
     public void unregisterObserver(INetworkManagementEventObserver obs) {
-        Log.d(TAG, "Unregistering observer");
+        Slog.d(TAG, "Unregistering observer");
         mObservers.remove(mObservers.indexOf(obs));
     }
 
@@ -116,7 +116,7 @@
             try {
                 obs.interfaceLinkStatusChanged(iface, link);
             } catch (Exception ex) {
-                Log.w(TAG, "Observer notifier failed", ex);
+                Slog.w(TAG, "Observer notifier failed", ex);
             }
         }
     }
@@ -129,7 +129,7 @@
             try {
                 obs.interfaceAdded(iface);
             } catch (Exception ex) {
-                Log.w(TAG, "Observer notifier failed", ex);
+                Slog.w(TAG, "Observer notifier failed", ex);
             }
         }
     }
@@ -142,7 +142,7 @@
             try {
                 obs.interfaceRemoved(iface);
             } catch (Exception ex) {
-                Log.w(TAG, "Observer notifier failed", ex);
+                Slog.w(TAG, "Observer notifier failed", ex);
             }
         }
     }
@@ -224,7 +224,7 @@
 
     public InterfaceConfiguration getInterfaceConfig(String iface) throws IllegalStateException {
         String rsp = mConnector.doCommand("interface getcfg " + iface).get(0);
-        Log.d(TAG, String.format("rsp <%s>", rsp));
+        Slog.d(TAG, String.format("rsp <%s>", rsp));
 
         // Rsp: 213 xx:xx:xx:xx:xx:xx yyy.yyy.yyy.yyy zzz.zzz.zzz.zzz [flag1 flag2 flag3]
         StringTokenizer st = new StringTokenizer(rsp);
@@ -246,18 +246,18 @@
         try {
             cfg.ipAddr = stringToIpAddr(st.nextToken(" "));
         } catch (UnknownHostException uhe) {
-            Log.e(TAG, "Failed to parse ipaddr", uhe);
+            Slog.e(TAG, "Failed to parse ipaddr", uhe);
             cfg.ipAddr = 0;
         }
 
         try {
             cfg.netmask = stringToIpAddr(st.nextToken(" "));
         } catch (UnknownHostException uhe) {
-            Log.e(TAG, "Failed to parse netmask", uhe);
+            Slog.e(TAG, "Failed to parse netmask", uhe);
             cfg.netmask = 0;
         }
         cfg.interfaceFlags = st.nextToken("]").trim() +"]";
-        Log.d(TAG, String.format("flags <%s>", cfg.interfaceFlags));
+        Slog.d(TAG, String.format("flags <%s>", cfg.interfaceFlags));
         return cfg;
     }
 
@@ -275,7 +275,7 @@
             throw new SecurityException("Requires SHUTDOWN permission");
         }
 
-        Log.d(TAG, "Shutting down");
+        Slog.d(TAG, "Shutting down");
     }
 
     public boolean getIpForwardingEnabled() throws IllegalStateException{