Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b8a7bca authored by Dmitri Plotnikov's avatar Dmitri Plotnikov
Browse files

Use a simpler constructor 

The constructor with two arguments is changing

Bug: 195306545
Test: make RunSettingsRoboTests
Change-Id: I56288bb5b3eb9d71ae49128ccbc72fd57abb48d1
parent 9632cd70

src/com/android/settings/fuelgauge/BatteryInfo.java

+1 −2
Original line number Diff line number Diff line
@@ -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 =

src/com/android/settings/fuelgauge/BatteryUsageStatsLoader.java

+1 −2
Original line number Diff line number Diff line
@@ -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();

        }

    }

src/com/android/settings/fuelgauge/BatteryUtils.java

+1 −3
Original line number Diff line number Diff line
@@ -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();

src/com/android/settings/fuelgauge/DebugEstimatesLoader.java

+1 −2
Original line number Diff line number Diff line
@@ -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);