am c99e6ee2: am c9aa32e9: Merge "Fix dumpPowerState method"

* commit 'c99e6ee202ba9d895c96f034643fd39a035ea7f2': Fix dumpPowerState method
2012-06-08 18:55:56 -07:00
parent 2203fab249 c99e6ee202
commit a8e46828bf
1 changed files with 2 additions and 0 deletions
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -1157,6 +1157,8 @@ public class PowerManagerService extends IPowerManager.Stub
                        ? "SCREEN_BRIGHT_BIT " : "")
                + (((state & SCREEN_ON_BIT) != 0)
                        ? "SCREEN_ON_BIT " : "")
+                + (((state & BUTTON_BRIGHT_BIT) != 0)
+                        ? "BUTTON_BRIGHT_BIT " : "")
                + (((state & BATTERY_LOW_BIT) != 0)
                        ? "BATTERY_LOW_BIT " : "");
    }