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

Commit c2fbecc3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Disable the BatteryUsageStatsStore feature" into sc-dev am: 9c8441c8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15128691

Change-Id: If46368baf62093b3ccb91566fc555e57affb08ac
parents 97ad0b9d 9c8441c8

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

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

import android.os.SystemClock;

import android.os.UidBatteryConsumer;

import android.util.Log;

import android.util.SparseArray;



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

 */

public class BatteryUsageStatsProvider {

    private static final String TAG = "BatteryUsageStatsProv";

    private final Context mContext;

    private final BatteryStats mStats;

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


        final BatteryUsageStats.Builder builder = new BatteryUsageStats.Builder(

                mStats.getCustomEnergyConsumerNames(), includePowerModels);

        if (mBatteryUsageStatsStore == null) {

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

            return builder.build();

        }



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

        for (long timestamp : timestamps) {

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

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

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

    static final String TAG = "BatteryStatsService";

    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;
@@ -784,6 +784,10 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
                    bus = getBatteryUsageStats(List.of(powerProfileQuery)).get(0);

                    break;

                case FrameworkStatsLog.BATTERY_USAGE_STATS_BEFORE_RESET:

                    if (!BATTERY_USAGE_STORE_ENABLED) {

                        return StatsManager.PULL_SKIP;

                    }



                    final long sessionStart = mBatteryUsageStatsStore

                            .getLastBatteryUsageStatsBeforeResetAtomPullTimestamp();

                    final long sessionEnd = mStats.getStartClockTime();