diff options
author | Adrian Roos <roosa@google.com> | 2015-07-23 19:21:24 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-23 19:21:24 +0000 |
commit | 2237c32fe1dfcd13056970ff987ee92326aee5c1 (patch) | |
tree | 2d39ff502e08342f83aaf28f6df9432feb76cdf8 /packages/Keyguard | |
parent | a201140bb42c77adaf8714f05d7c2341690e4445 (diff) | |
parent | 58adc7ad48990f2ffa0d4858bd6910dd9eb6aabc (diff) | |
download | frameworks_base-2237c32fe1dfcd13056970ff987ee92326aee5c1.zip frameworks_base-2237c32fe1dfcd13056970ff987ee92326aee5c1.tar.gz frameworks_base-2237c32fe1dfcd13056970ff987ee92326aee5c1.tar.bz2 |
am 58adc7ad: Merge "Send BATTERY_CHANGED if maxChargingCurrent changes" into mnc-dr-dev
* commit '58adc7ad48990f2ffa0d4858bd6910dd9eb6aabc':
Send BATTERY_CHANGED if maxChargingCurrent changes
Diffstat (limited to 'packages/Keyguard')
-rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java index d4de56d..e7d55b4 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -1232,6 +1232,12 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { if (!nowPluggedIn && current.isBatteryLow() && current.level != old.level) { return true; } + + // change in charging current while plugged in + if (nowPluggedIn && current.maxChargingCurrent != old.maxChargingCurrent) { + return true; + } + return false; } |