Merge "Add wireless to KeyguardUpdateMonitor isPluggedIn" into jb-mr1-dev

Brian Muramatsu · Android (Google) Code Review · commit b75111df9bf2 · 2012-09-06T17:59:36.000-07:00
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardUpdateMonitor.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardUpdateMonitor.java
@@ -261,12 +261,13 @@ public BatteryStatus(int status, int level, int plugged, int health) {
         }
 
         /**
-         * Determine whether the device is plugged in (USB or power).
+         * Determine whether the device is plugged in (USB, power, or wireless).
          * @return true if the device is plugged in.
          */
         boolean isPluggedIn() {
             return plugged == BatteryManager.BATTERY_PLUGGED_AC
-                    || plugged == BatteryManager.BATTERY_PLUGGED_USB;
+                    || plugged == BatteryManager.BATTERY_PLUGGED_USB
+                    || plugged == BatteryManager.BATTERY_PLUGGED_WIRELESS;
         }
 
         /**

Original file line number	Diff line number	Diff line change
`@@ -261,12 +261,13 @@ public BatteryStatus(int status, int level, int plugged, int health) {`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`/**`
`264`		`- * Determine whether the device is plugged in (USB or power).`
	`264`	`+ * Determine whether the device is plugged in (USB, power, or wireless).`
`265`	`265`	`* @return true if the device is plugged in.`
`266`	`266`	`*/`
`267`	`267`	`boolean isPluggedIn() {`
`268`	`268`	`return plugged == BatteryManager.BATTERY_PLUGGED_AC`
`269`		`- \|\| plugged == BatteryManager.BATTERY_PLUGGED_USB;`
	`269`	`+ \|\| plugged == BatteryManager.BATTERY_PLUGGED_USB`
	`270`	`+ \|\| plugged == BatteryManager.BATTERY_PLUGGED_WIRELESS;`
`270`	`271`	`}`
`271`	`272`
`272`	`273`	`/**`