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/HeadsetObserver.java

diff --git a/services/java/com/android/server/HeadsetObserver.java b/services/java/com/android/server/HeadsetObserver.java
index 9d69564..6f0a91d 100644
--- a/services/java/com/android/server/HeadsetObserver.java
+++ b/services/java/com/android/server/HeadsetObserver.java
@@ -24,7 +24,7 @@
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
 import android.os.UEventObserver;
-import android.util.Log;
+import android.util.Slog;
 import android.media.AudioManager;
 
 import java.io.FileReader;
@@ -66,12 +66,12 @@
 
     @Override
     public void onUEvent(UEventObserver.UEvent event) {
-        if (LOG) Log.v(TAG, "Headset UEVENT: " + event.toString());
+        if (LOG) Slog.v(TAG, "Headset UEVENT: " + event.toString());
 
         try {
             update(event.get("SWITCH_NAME"), Integer.parseInt(event.get("SWITCH_STATE")));
         } catch (NumberFormatException e) {
-            Log.e(TAG, "Could not parse switch state from event " + event);
+            Slog.e(TAG, "Could not parse switch state from event " + event);
         }
     }
 
@@ -91,9 +91,9 @@
             newName = new String(buffer, 0, len).trim();
 
         } catch (FileNotFoundException e) {
-            Log.w(TAG, "This kernel does not have wired headset support");
+            Slog.w(TAG, "This kernel does not have wired headset support");
         } catch (Exception e) {
-            Log.e(TAG, "" , e);
+            Slog.e(TAG, "" , e);
         }
 
         update(newName, newState);
@@ -167,7 +167,7 @@
             intent.putExtra("name", headsetName);
             intent.putExtra("microphone", microphone);
 
-            if (LOG) Log.v(TAG, "Intent.ACTION_HEADSET_PLUG: state: "+state+" name: "+headsetName+" mic: "+microphone);
+            if (LOG) Slog.v(TAG, "Intent.ACTION_HEADSET_PLUG: state: "+state+" name: "+headsetName+" mic: "+microphone);
             // TODO: Should we require a permission?
             ActivityManagerNative.broadcastStickyIntent(intent, null);
         }