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

This commit is contained in:
Brian Muramatsu
2012-09-06 17:59:36 -07:00
committed by Android (Google) Code Review

View File

@@ -261,12 +261,13 @@ public class KeyguardUpdateMonitor {
}
/**
* 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;
}
/**