Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ic7de5a1c2949d17459bed2daf0dbadf42aad4b7f
This commit is contained in:
TreeHugger Robot
2021-06-29 00:29:58 +00:00
committed by Automerger Merge Worker
parent cca1f5f332 9c8441c8af
commit 3d7b4a9670
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/com/android/internal/os/BatteryUsageStatsProvider.java
View File

@@ -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()) {

6
services/core/java/com/android/server/am/BatteryStatsService.java
View File

@@ -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();