diff options
| author | Adrian Roos <roosa@google.com> | 2015-07-23 19:48:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-23 19:48:51 +0000 |
| commit | 2f1220c419492825fd0d1b47f77b36d10afea6a7 (patch) | |
| tree | 4ff63ad6f0331f04214019171bcd04e9d3cba19c /packages/Keyguard | |
| parent | fd7db2095c9a0247e0d859e1437b6181af45eec7 (diff) | |
| parent | 2237c32fe1dfcd13056970ff987ee92326aee5c1 (diff) | |
| download | frameworks_base-2f1220c419492825fd0d1b47f77b36d10afea6a7.zip frameworks_base-2f1220c419492825fd0d1b47f77b36d10afea6a7.tar.gz frameworks_base-2f1220c419492825fd0d1b47f77b36d10afea6a7.tar.bz2 | |
am 2237c32f: am 58adc7ad: Merge "Send BATTERY_CHANGED if maxChargingCurrent changes" into mnc-dr-dev
* commit '2237c32fe1dfcd13056970ff987ee92326aee5c1':
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; } |