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

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

Merge "Fix concurrency in BATTERY_USAGE_STATS_* statsd atom generation" into... 

Merge "Fix concurrency in BATTERY_USAGE_STATS_* statsd atom generation" into tm-qpr-dev am: 0995b708

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



Change-Id: Iab116c59445266e921a0a115e0a84e1e58693979
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cc300399 0995b708

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

+3 −0
Original line number Diff line number Diff line
@@ -798,6 +798,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
                case FrameworkStatsLog.BATTERY_USAGE_STATS_SINCE_RESET:

                    final BatteryUsageStatsQuery querySinceReset =

                            new BatteryUsageStatsQuery.Builder()

                                    .setMaxStatsAgeMs(0)

                                    .includeProcessStateData()

                                    .includeVirtualUids()

                                    .build();
@@ -806,6 +807,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
                case FrameworkStatsLog.BATTERY_USAGE_STATS_SINCE_RESET_USING_POWER_PROFILE_MODEL:

                    final BatteryUsageStatsQuery queryPowerProfile =

                            new BatteryUsageStatsQuery.Builder()

                                    .setMaxStatsAgeMs(0)

                                    .includeProcessStateData()

                                    .includeVirtualUids()

                                    .powerProfileModeledOnly()
@@ -822,6 +824,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
                    final long sessionEnd = mStats.getStartClockTime();

                    final BatteryUsageStatsQuery queryBeforeReset =

                            new BatteryUsageStatsQuery.Builder()

                                    .setMaxStatsAgeMs(0)

                                    .includeProcessStateData()

                                    .includeVirtualUids()

                                    .aggregateSnapshots(sessionStart, sessionEnd)

services/tests/servicestests/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ 
    <uses-permission android:name="android.permission.MODIFY_AUDIO_ROUTING" />

    <uses-permission android:name="android.permission.PACKAGE_VERIFICATION_AGENT" />

    <uses-permission android:name="android.permission.OBSERVE_ROLE_HOLDERS" />

    <uses-permission android:name="android.permission.BATTERY_STATS" />



    <queries>

        <package android:name="com.android.servicestests.apps.suspendtestapp" />

services/tests/servicestests/src/com/android/server/power/stats/BatteryStatsManagerTest.java

0 → 100644
+68 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server.power.stats;



import static androidx.test.InstrumentationRegistry.getContext;



import static org.junit.Assert.fail;



import android.os.BatteryConsumer;

import android.os.BatteryStatsManager;

import android.os.BatteryUsageStats;

import android.os.BatteryUsageStatsQuery;

import android.os.UidBatteryConsumer;



import org.junit.Test;



/**

 * Test BatteryStatsManager and CellularBatteryStats to ensure that valid data is being reported

 * and that invalid data is not reported.

 */

public class BatteryStatsManagerTest {



    @Test

    public void testBatteryUsageStatsDataConsistency() {

        BatteryStatsManager bsm = getContext().getSystemService(BatteryStatsManager.class);

        BatteryUsageStats stats = bsm.getBatteryUsageStats(

                new BatteryUsageStatsQuery.Builder().setMaxStatsAgeMs(

                        0).includeProcessStateData().build());

        final int[] components =

                {BatteryConsumer.POWER_COMPONENT_CPU,

                        BatteryConsumer.POWER_COMPONENT_MOBILE_RADIO,

                        BatteryConsumer.POWER_COMPONENT_WIFI,

                        BatteryConsumer.POWER_COMPONENT_BLUETOOTH};

        final int[] states =

                {BatteryConsumer.PROCESS_STATE_FOREGROUND,

                        BatteryConsumer.PROCESS_STATE_BACKGROUND,

                        BatteryConsumer.PROCESS_STATE_FOREGROUND_SERVICE,

                        BatteryConsumer.PROCESS_STATE_CACHED};

        for (UidBatteryConsumer ubc : stats.getUidBatteryConsumers()) {

            for (int component : components) {

                double consumedPower = ubc.getConsumedPower(ubc.getKey(component));

                double sumStates = 0;

                for (int state : states) {

                    sumStates += ubc.getConsumedPower(ubc.getKey(component, state));

                }

                if (sumStates > consumedPower + 0.1) {

                    fail("Sum of states exceeds total. UID = " + ubc.getUid() + " "

                            + BatteryConsumer.powerComponentIdToString(component)

                            + " total = " + consumedPower + " states = " + sumStates);

                }

            }

        }

    }

}