@@ -18,7 +18,7 @@ package com.android.policy.statusbar.phone;
 
 import android.os.Handler;
 import android.os.Message;
-import android.util.Log;
+import android.util.Slog;
 
 import com.android.internal.statusbar.IStatusBar;
 import com.android.internal.statusbar.StatusBarIcon;
@@ -72,7 +72,7 @@ class CommandQueue extends IStatusBar.Stub {
     private final class H extends Handler {
         public void handleMessage(Message msg) {
             int what = msg.what & MSG_MASK;
-            switch (msg.what) {
+            switch (what) {
                 case MSG_ICON: {
                     int index = msg.what & INDEX_MASK;
                     int viewIndex = mList.getViewIndex(index);

@@ -20,12 +20,12 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.BroadcastReceiver;
 import android.os.SystemService;
-import android.util.Log;
+import android.util.Slog;
 
 public class BrickReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
-        Log.w("BrickReceiver", "!!! BRICKING DEVICE !!!");
+        Slog.w("BrickReceiver", "!!! BRICKING DEVICE !!!");
         SystemService.start("brick");
     }
 }

@@ -21,7 +21,7 @@ import android.content.BroadcastReceiver;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
-import android.util.Log;
+import android.util.Slog;
 import com.android.internal.app.ShutdownThread;
 
 public class ShutdownActivity extends Activity {
@@ -34,7 +34,7 @@ public class ShutdownActivity extends Activity {
         super.onCreate(savedInstanceState);
 
         mConfirm = getIntent().getBooleanExtra(Intent.EXTRA_KEY_CONFIRM, false);
-        Log.i(TAG, "onCreate(): confirm=" + mConfirm);
+        Slog.i(TAG, "onCreate(): confirm=" + mConfirm);
 
         Handler h = new Handler();
         h.post(new Runnable() {

@@ -26,7 +26,7 @@ import android.content.Context;
 import android.os.ParcelFileDescriptor;
 import android.os.ServiceManager;
 import android.os.SystemService;
-import android.util.Log;
+import android.util.Slog;
 
 import java.io.File;
 import java.io.IOException;
@@ -77,7 +77,7 @@ public class SystemBackupAgent extends BackupHelperAgent {
         } catch (IOException ex) {
             // If there was a failure, delete everything for the wallpaper, this is too aggresive,
             // but this is hopefully a rare failure.
-            Log.d(TAG, "restore failed", ex);
+            Slog.d(TAG, "restore failed", ex);
             (new File(WALLPAPER_IMAGE)).delete();
             (new File(WALLPAPER_INFO)).delete();
         }

@@ -29,7 +29,7 @@ import android.os.RemoteException;
 import android.os.IBinder;
 import android.os.Binder;
 import android.os.SystemClock;
-import android.util.Log;
+import android.util.Slog;
 
 import java.util.LinkedList;
 import java.util.ListIterator;
@@ -155,7 +155,7 @@ public class VibratorService extends IVibratorService.Stub {
                 for (int i=0; i<N; i++) {
                     s += " " + pattern[i];
                 }
-                Log.i(TAG, "vibrating with pattern: " + s);
+                Slog.i(TAG, "vibrating with pattern: " + s);
             }
 
             // we're running in the server so we can't fail