From 4b8a7bcaa53995a4714efad9d84a48e19dff1947 Mon Sep 17 00:00:00 2001
From: Dmitri Plotnikov <dplotnikov@google.com>
Date: Thu, 7 Oct 2021 19:56:10 -0700
Subject: [PATCH] Use a simpler constructor

The constructor with two arguments is changing

Bug: 195306545
Test: make RunSettingsRoboTests
Change-Id: I56288bb5b3eb9d71ae49128ccbc72fd57abb48d1
---
 src/com/android/settings/fuelgauge/BatteryInfo.java           | 3 +--
 .../android/settings/fuelgauge/BatteryUsageStatsLoader.java   | 3 +--
 src/com/android/settings/fuelgauge/BatteryUtils.java          | 4 +---
 src/com/android/settings/fuelgauge/DebugEstimatesLoader.java  | 3 +--
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/com/android/settings/fuelgauge/BatteryInfo.java b/src/com/android/settings/fuelgauge/BatteryInfo.java
index 2fb50652640..efb58a5666c 100644
--- a/src/com/android/settings/fuelgauge/BatteryInfo.java
+++ b/src/com/android/settings/fuelgauge/BatteryInfo.java
@@ -163,8 +163,7 @@ public class BatteryInfo {
                     } catch (RuntimeException e) {
                         Log.e(TAG, "getBatteryInfo() from getBatteryUsageStats()", e);
                         // Use default BatteryUsageStats.
-                        stats = new BatteryUsageStats.Builder(
-                                new String[0], /* includePowerModels */ false).build();
+                        stats = new BatteryUsageStats.Builder(new String[0]).build();
                     }
                 }
                 final BatteryInfo batteryInfo =
diff --git a/src/com/android/settings/fuelgauge/BatteryUsageStatsLoader.java b/src/com/android/settings/fuelgauge/BatteryUsageStatsLoader.java
index 2e3200d5835..65f2ddbb5be 100644
--- a/src/com/android/settings/fuelgauge/BatteryUsageStatsLoader.java
+++ b/src/com/android/settings/fuelgauge/BatteryUsageStatsLoader.java
@@ -49,8 +49,7 @@ public class BatteryUsageStatsLoader extends AsyncLoaderCompat<BatteryUsageStats
         } catch (RuntimeException e) {
             Log.e(TAG, "loadInBackground() for getBatteryUsageStats()", e);
             // Use default BatteryUsageStats.
-            return new BatteryUsageStats.Builder(
-                    new String[0], /* includePowerModels */ false).build();
+            return new BatteryUsageStats.Builder(new String[0]).build();
         }
     }
 
diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java
index 627a5f11f9c..67ffa7d4520 100644
--- a/src/com/android/settings/fuelgauge/BatteryUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryUtils.java
@@ -375,9 +375,7 @@ public class BatteryUtils {
         } catch (RuntimeException e) {
             Log.e(TAG, "getBatteryInfo() error from getBatteryUsageStats()", e);
             // Use default BatteryUsageStats.
-            batteryUsageStats =
-                    new BatteryUsageStats.Builder(new String[0], /* includePowerModels */ false)
-                            .build();
+            batteryUsageStats = new BatteryUsageStats.Builder(new String[0]).build();
         }
 
         final long startTime = System.currentTimeMillis();
diff --git a/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java b/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java
index c890ea9a77f..e7c93dc0c7c 100644
--- a/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java
+++ b/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java
@@ -68,8 +68,7 @@ public class DebugEstimatesLoader extends AsyncLoaderCompat<List<BatteryInfo>> {
         } catch (RuntimeException e) {
             Log.e(TAG, "getBatteryInfo() from getBatteryUsageStats()", e);
             // Use default BatteryUsageStats.
-            batteryUsageStats = new BatteryUsageStats.Builder(
-                    new String[0], /* includePowerModels */ false).build();
+            batteryUsageStats = new BatteryUsageStats.Builder(new String[0]).build();
         }
         BatteryInfo oldinfo = BatteryInfo.getBatteryInfoOld(getContext(), batteryBroadcast,
                 batteryUsageStats, elapsedRealtimeUs, false);