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

diff --git a/services/java/com/android/server/BootReceiver.java b/services/java/com/android/server/BootReceiver.java
index 5c1af7e..eeb91fa 100644
--- a/services/java/com/android/server/BootReceiver.java
+++ b/services/java/com/android/server/BootReceiver.java
@@ -28,7 +28,7 @@
 import android.os.RecoverySystem;
 import android.os.SystemProperties;
 import android.provider.Settings;
-import android.util.Log;
+import android.util.Slog;
 
 import java.io.File;
 import java.io.IOException;
@@ -53,13 +53,13 @@
         try {
             logBootEvents(context);
         } catch (Exception e) {
-            Log.e(TAG, "Can't log boot events", e);
+            Slog.e(TAG, "Can't log boot events", e);
         }
 
         try {
             RecoverySystem.handleAftermath();
         } catch (Exception e) {
-            Log.e(TAG, "Can't handle recovery aftermath", e);
+            Slog.e(TAG, "Can't handle recovery aftermath", e);
         }
 
         try {
@@ -70,7 +70,7 @@
                 context.startService(loadavg);
             }
         } catch (Exception e) {
-            Log.e(TAG, "Can't start load average service", e);
+            Slog.e(TAG, "Can't start load average service", e);
         }
     }
 
@@ -122,7 +122,7 @@
                     String filename = new File(TOMBSTONE_DIR, path).getPath();
                     addFileToDropBox(db, prefs, props, filename, LOG_SIZE, "SYSTEM_TOMBSTONE");
                 } catch (IOException e) {
-                    Log.e(TAG, "Can't log tombstone", e);
+                    Slog.e(TAG, "Can't log tombstone", e);
                 }
             }
         };
@@ -133,7 +133,7 @@
     private static void addFileToDropBox(
             DropBoxManager db, SharedPreferences prefs,
             String headers, String filename, int maxSize, String tag) throws IOException {
-        if (!db.isTagEnabled(tag)) return;  // Logging disabled
+        if (!db.isTagEnabled(tag)) return;  // Slog.ing disabled
 
         File file = new File(filename);
         long fileTime = file.lastModified();
@@ -146,6 +146,6 @@
         StringBuilder report = new StringBuilder(headers).append("\n");
         report.append(FileUtils.readTextFile(file, maxSize, "[[TRUNCATED]]\n"));
         db.addText(tag, report.toString());
-        Log.i(TAG, "Logging " + filename + " to DropBox (" + tag + ")");
+        Slog.i(TAG, "Slog.ing " + filename + " to DropBox (" + tag + ")");
     }
 }