From 82f30d2a41fe8283f377c16d6684b013ae2a4fae Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Wed, 22 Jul 2015 10:12:05 -0400 Subject: [PATCH] Fix battery detail issues with "Android OS" Bug: 22638215 Change-Id: Ia5bab7eb3bfb964e7f914e8c8f392f4fea66eb29 --- src/com/android/settings/fuelgauge/PowerUsageDetail.java | 8 +++++--- src/com/android/settings/fuelgauge/PowerUsageSummary.java | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java index 9e7fa48735d..6d4e398dea6 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java @@ -163,7 +163,9 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi printWriter.flush(); args.putString(PowerUsageDetail.EXTRA_REPORT_CHECKIN_DETAILS, result.toString()); - userId = UserHandle.getUserId(uid.getUid()); + if (uid.getUid() != 0) { + userId = UserHandle.getUserId(uid.getUid()); + } } } break; @@ -438,11 +440,11 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi } }); } else { - removePreference(KEY_HIGH_POWER); + mControlsParent.removePreference(findPreference(KEY_HIGH_POWER)); } } else { removePreference(KEY_TWO_BUTTONS); - removePreference(KEY_HIGH_POWER); + mControlsParent.removePreference(findPreference(KEY_HIGH_POWER)); } refreshStats(); diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java index 1475034d75c..9e3029db968 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java +++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java @@ -346,6 +346,8 @@ public class PowerUsageSummary extends PowerUsageBase { } stats.add(new BatterySipper(DrainType.APP, new FakeUid(Process.FIRST_APPLICATION_UID), use)); + stats.add(new BatterySipper(DrainType.APP, + new FakeUid(0), use)); // Simulate dex2oat process. BatterySipper sipper = new BatterySipper(DrainType.APP,