commit 00ecd3a2d92da6daa9648fde0352601f60d8c5f4
author Damien Bargiacchi <drb@google.com> Tue Oct 25 01:40:22 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 25 01:40:22 2016 +0000
tree be0f64afea5f9ebe003aaf1513615b66d34f9440
parent fda0f1762d25659acad7369c561fa9c5c59c24b9
parent c7c0cb753804e81f370ddaf59871196290e48962

Always show the battery percentage unless it is unknown am: 3f0250c3cc am: 44437259dd
am: 2f65bf3e37

Change-Id: Ie053342c9c4a02a1d8a40dc7295ae63fbb825323

healthd/healthd_mode_charger.cpp

diff --git a/healthd/healthd_mode_charger.cpp b/healthd/healthd_mode_charger.cpp
index 243cbea..ec3de34 100644
--- a/healthd/healthd_mode_charger.cpp
+++ b/healthd/healthd_mode_charger.cpp
@@ -341,14 +341,19 @@
 
 static void draw_percent(const animation& anim)
 {
-    if (anim.cur_level <= 0 || anim.cur_status != BATTERY_STATUS_CHARGING) return;
+    int cur_level = anim.cur_level;
+    if (anim.cur_status == BATTERY_STATUS_FULL) {
+        cur_level = 100;
+    }
+
+    if (cur_level <= 0) return;
 
     const animation::text_field& field = anim.text_percent;
     if (field.font == nullptr || field.font->char_width == 0 || field.font->char_height == 0) {
         return;
     }
 
-    std::string str = base::StringPrintf("%d%%", anim.cur_level);
+    std::string str = base::StringPrintf("%d%%", cur_level);
 
     int x, y;
     determine_xy(field, str.size(), &x, &y);