Merge "Fix dumpPowerState method"

Dianne Hackborn · android code review · commit c9aa32e93f39 · 2012-06-08T18:33:48.000-07:00
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java
@@ -1103,6 +1103,8 @@ private static String dumpPowerState(int state) {
                         ? "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 " : "");
     }

Original file line number	Diff line number	Diff line change
`@@ -1103,6 +1103,8 @@ private static String dumpPowerState(int state) {`
`1103`	`1103`	`? "SCREEN_BRIGHT_BIT " : "")`
`1104`	`1104`	`+ (((state & SCREEN_ON_BIT) != 0)`
`1105`	`1105`	`? "SCREEN_ON_BIT " : "")`
	`1106`	`+ + (((state & BUTTON_BRIGHT_BIT) != 0)`
	`1107`	`+ ? "BUTTON_BRIGHT_BIT " : "")`
`1106`	`1108`	`+ (((state & BATTERY_LOW_BIT) != 0)`
`1107`	`1109`	`? "BATTERY_LOW_BIT " : "");`
`1108`	`1110`	`}`