Merge change 5391 into donut

* changes:
  Fix an NPE.
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index d36dce7..8df0919 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -575,7 +575,7 @@
                 //name = Integer.toString(uid);
                 if (uid == 0) {
                     name = getResources().getString(R.string.process_kernel_label);
-                } else if (name.equals("mediaserver")) {
+                } else if ("mediaserver".equals(name)) {
                     name = getResources().getString(R.string.process_mediaserver_label);
                 }
                 return;
@@ -694,4 +694,4 @@
             super.handleMessage(msg);
         }
     };
-}
\ No newline at end of file
+}