summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Suprabh Shukla <suprabh@google.com> 2018-08-10 14:09:44 -0700
committer android-build-merger <android-build-merger@google.com> 2018-08-10 14:09:44 -0700
commit25feb29a48df72bab3768b8764bc32cf154c8239 (patch)
tree32136b74cbcc6e1a51c9dee35945f3b83f389a25
parent6ff3b366f99944d33a7c08b30e733ca9d562fe2e (diff)
parent8cb78fcb1ef1f196b36f841bc5c04288f5b6299f (diff)
Merge "Sending BATTERY_LEVEL_CHANGED when plug type changes" into pi-dev
am: 8cb78fcb1e Change-Id: Ia52e29c61038388525f4375917b9d5763bcd1fc3
-rw-r--r--services/core/java/com/android/server/BatteryService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/BatteryService.java b/services/core/java/com/android/server/BatteryService.java
index 5c14459da566..50f15ca0739f 100644
--- a/services/core/java/com/android/server/BatteryService.java
+++ b/services/core/java/com/android/server/BatteryService.java
@@ -624,7 +624,7 @@ public final class BatteryService extends SystemService {
// them will get the new sequence number at that point. (See for example how testing
// of JobScheduler's BatteryController works.)
sendBatteryChangedIntentLocked();
- if (mLastBatteryLevel != mHealthInfo.batteryLevel) {
+ if (mLastBatteryLevel != mHealthInfo.batteryLevel || mLastPlugType != mPlugType) {
sendBatteryLevelChangedIntentLocked();
}