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

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

Browse Source 
* commit 'b75111df9bf22496bacb7a6f9d9412e4a7b6827f':
  Add wireless to KeyguardUpdateMonitor isPluggedIn
This commit is contained in:
Brian Muramatsu
2012-09-06 18:02:45 -07:00
committed by Android Git Automerger
parent e307c795eb b75111df9b
commit 01f8f7e3b3
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.
*/
boolean isPluggedIn() {
return plugged == BatteryManager.BATTERY_PLUGGED_AC
|| plugged == BatteryManager.BATTERY_PLUGGED_USB;
|| plugged == BatteryManager.BATTERY_PLUGGED_USB
|| plugged == BatteryManager.BATTERY_PLUGGED_WIRELESS;
}
/**