Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brian Muramatsu
2012-09-06 17:59:36 -07:00
committed by Android (Google) Code Review
parent bf4d55cb65 a92a01bb0b
commit b75111df9b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
policy/src/com/android/internal/policy/impl/keyguard/KeyguardUpdateMonitor.java
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. * @return true if the device is plugged in.
*/ */
boolean isPluggedIn() { boolean isPluggedIn() {
return plugged == BatteryManager.BATTERY_PLUGGED_AC return plugged == BatteryManager.BATTERY_PLUGGED_AC
|| plugged == BatteryManager.BATTERY_PLUGGED_USB; || plugged == BatteryManager.BATTERY_PLUGGED_USB
|| plugged == BatteryManager.BATTERY_PLUGGED_WIRELESS;
} }
/** /**