Merge "Fix crash in BatteryUtils"

2018-12-19 02:04:29 +00:00
parent 03653641a2 2def5ccb6c
commit 0ade53c9b5
2 changed files with 26 additions and 6 deletions
--- a/src/com/android/settings/fuelgauge/BatteryUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryUtils.java
@@ -449,12 +449,14 @@ public class BatteryUtils {
        final BatteryStats stats = statsHelper.getStats();
        BatteryInfo batteryInfo;

-        final Estimate estimate;
+        Estimate estimate = null;
        // Get enhanced prediction if available
        if (mPowerUsageFeatureProvider != null &&
                mPowerUsageFeatureProvider.isEnhancedBatteryPredictionEnabled(mContext)) {
            estimate = mPowerUsageFeatureProvider.getEnhancedBatteryPrediction(mContext);
-        } else {
+        }
+
+        if (estimate == null) {
            estimate = new Estimate(
                    PowerUtil.convertUsToMs(stats.computeBatteryTimeRemaining(elapsedRealtimeUs)),
                    false /* isBasedOnUsage */,