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

Commit 735008fc authored by Zaiyue Xue's avatar Zaiyue Xue Committed by Android (Google) Code Review
Browse files

Merge "Change experimental namespace from battery_stats to backstage_power." into main

parents bea6f32e 350765d7

services/core/java/com/android/server/am/BatteryStatsService.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -191,6 +191,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
                    .replaceWith("?");

                    .replaceWith("?");

    private static final int MAX_LOW_POWER_STATS_SIZE = 32768;

    private static final int MAX_LOW_POWER_STATS_SIZE = 32768;

    private static final int POWER_STATS_QUERY_TIMEOUT_MILLIS = 2000;

    private static final int POWER_STATS_QUERY_TIMEOUT_MILLIS = 2000;

    private static final String DEVICE_CONFIG_NAMESPACE = "backstage_power";

    private static final String MIN_CONSUMED_POWER_THRESHOLD_KEY = "min_consumed_power_threshold";

    private static final String MIN_CONSUMED_POWER_THRESHOLD_KEY = "min_consumed_power_threshold";

    private static final String EMPTY = "Empty";

    private static final String EMPTY = "Empty";
@@ -906,7 +907,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
                case FrameworkStatsLog.BATTERY_USAGE_STATS_SINCE_RESET:

                case FrameworkStatsLog.BATTERY_USAGE_STATS_SINCE_RESET:

                    @SuppressLint("MissingPermission")

                    @SuppressLint("MissingPermission")

                    final double minConsumedPowerThreshold =

                    final double minConsumedPowerThreshold =

                            DeviceConfig.getFloat(DeviceConfig.NAMESPACE_BATTERY_STATS,

                            DeviceConfig.getFloat(DEVICE_CONFIG_NAMESPACE,

                                    MIN_CONSUMED_POWER_THRESHOLD_KEY, 0);

                                    MIN_CONSUMED_POWER_THRESHOLD_KEY, 0);

                    final BatteryUsageStatsQuery querySinceReset =

                    final BatteryUsageStatsQuery querySinceReset =

                            new BatteryUsageStatsQuery.Builder()

                            new BatteryUsageStatsQuery.Builder()