diff options
Diffstat (limited to 'src/com/android/settings')
-rw-r--r-- | src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java | 13 | ||||
-rw-r--r-- | src/com/android/settings/fuelgauge/BatteryUtils.java | 8 |
2 files changed, 14 insertions, 7 deletions
diff --git a/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java b/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java index b99519b64b..bc166c3f8b 100644 --- a/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java +++ b/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java @@ -41,9 +41,12 @@ public class BatteryStatsHelperLoader extends AsyncLoader<BatteryStatsHelper> { @Override public BatteryStatsHelper loadInBackground() { - final BatteryStatsHelper statsHelper = new BatteryStatsHelper(getContext(), true); + Context context = getContext(); + final BatteryStatsHelper statsHelper = new BatteryStatsHelper(context, + true /* collectBatteryBroadcast */); - initBatteryStatsHelper(statsHelper); + BatteryUtils.getInstance(context).initBatteryStatsHelper(statsHelper, mBundle, + mUserManager); return statsHelper; } @@ -52,9 +55,5 @@ public class BatteryStatsHelperLoader extends AsyncLoader<BatteryStatsHelper> { } - @VisibleForTesting - void initBatteryStatsHelper(BatteryStatsHelper statsHelper) { - statsHelper.create(mBundle); - statsHelper.refreshStats(BatteryStats.STATS_SINCE_CHARGED, mUserManager.getUserProfiles()); - } + } diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java index b8646f770b..52886b4565 100644 --- a/src/com/android/settings/fuelgauge/BatteryUtils.java +++ b/src/com/android/settings/fuelgauge/BatteryUtils.java @@ -18,7 +18,9 @@ package com.android.settings.fuelgauge; import android.content.Context; import android.content.pm.PackageManager; import android.os.BatteryStats; +import android.os.Bundle; import android.os.SystemClock; +import android.os.UserManager; import android.support.annotation.IntDef; import android.support.annotation.Nullable; import android.support.annotation.StringRes; @@ -327,6 +329,12 @@ public class BatteryUtils { return timeMs * 1000; } + public void initBatteryStatsHelper(BatteryStatsHelper statsHelper, Bundle bundle, + UserManager userManager) { + statsHelper.create(bundle); + statsHelper.refreshStats(BatteryStats.STATS_SINCE_CHARGED, userManager.getUserProfiles()); + } + private boolean isDataCorrupted() { return mPackageManager == null; } |