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

Commit 9c8441c8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Disable the BatteryUsageStatsStore feature" into sc-dev

parents 0a0f6b35 483702e0

core/java/com/android/internal/os/BatteryUsageStatsProvider.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ import android.os.BatteryUsageStats; 
import android.os.BatteryUsageStatsQuery;

import android.os.BatteryUsageStatsQuery;

import android.os.SystemClock;

import android.os.SystemClock;

import android.os.UidBatteryConsumer;

import android.os.UidBatteryConsumer;

import android.util.Log;

import android.util.SparseArray;

import android.util.SparseArray;





import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;
@@ -36,6 +37,7 @@ import java.util.Map; 
 * usage data attributed to subsystems and UIDs.

 * usage data attributed to subsystems and UIDs.

 */

 */

public class BatteryUsageStatsProvider {

public class BatteryUsageStatsProvider {

    private static final String TAG = "BatteryUsageStatsProv";

    private final Context mContext;

    private final Context mContext;

    private final BatteryStats mStats;

    private final BatteryStats mStats;

    private final BatteryUsageStatsStore mBatteryUsageStatsStore;

    private final BatteryUsageStatsStore mBatteryUsageStatsStore;
@@ -234,6 +236,11 @@ public class BatteryUsageStatsProvider { 




        final BatteryUsageStats.Builder builder = new BatteryUsageStats.Builder(

        final BatteryUsageStats.Builder builder = new BatteryUsageStats.Builder(

                mStats.getCustomEnergyConsumerNames(), includePowerModels);

                mStats.getCustomEnergyConsumerNames(), includePowerModels);

        if (mBatteryUsageStatsStore == null) {

            Log.e(TAG, "BatteryUsageStatsStore is unavailable");

            return builder.build();

        }



        final long[] timestamps = mBatteryUsageStatsStore.listBatteryUsageStatsTimestamps();

        final long[] timestamps = mBatteryUsageStatsStore.listBatteryUsageStatsTimestamps();

        for (long timestamp : timestamps) {

        for (long timestamp : timestamps) {

            if (timestamp > query.getFromTimestamp() && timestamp <= query.getToTimestamp()) {

            if (timestamp > query.getFromTimestamp() && timestamp <= query.getToTimestamp()) {

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

+5 −1
Original line number Original line Diff line number Diff line
@@ -126,7 +126,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
        Watchdog.Monitor {

        Watchdog.Monitor {

    static final String TAG = "BatteryStatsService";

    static final String TAG = "BatteryStatsService";

    static final boolean DBG = false;

    static final boolean DBG = false;

    private static final boolean BATTERY_USAGE_STORE_ENABLED = true;

    private static final boolean BATTERY_USAGE_STORE_ENABLED = false;





    private static IBatteryStats sService;

    private static IBatteryStats sService;
@@ -784,6 +784,10 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
                    bus = getBatteryUsageStats(List.of(powerProfileQuery)).get(0);

                    bus = getBatteryUsageStats(List.of(powerProfileQuery)).get(0);

                    break;

                    break;

                case FrameworkStatsLog.BATTERY_USAGE_STATS_BEFORE_RESET:

                case FrameworkStatsLog.BATTERY_USAGE_STATS_BEFORE_RESET:

                    if (!BATTERY_USAGE_STORE_ENABLED) {

                        return StatsManager.PULL_SKIP;

                    }



                    final long sessionStart = mBatteryUsageStatsStore

                    final long sessionStart = mBatteryUsageStatsStore

                            .getLastBatteryUsageStatsBeforeResetAtomPullTimestamp();

                            .getLastBatteryUsageStatsBeforeResetAtomPullTimestamp();

                    final long sessionEnd = mStats.getStartClockTime();

                    final long sessionEnd = mStats.getStartClockTime();