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

Commit 72014858 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov
Browse files

Re-enable WifiBatteryStats and CellularBatteryStats 

These APIs were inadvertently affected by the introduction
of WifiPowerStatsCollector and MobileRadioPowerStatsCollector

Bug: 347609115
Test: atest PowerStatsTests; atest PowerStatsTestsRavenwood
Flag: com.android.server.power.optimization.streamlined_connectivity_battery_stats
Change-Id: Ide1c8fe1f138f8b25be4c25a602c4f985a9dbfc3
parent 083bbcfe

core/api/system-current.txt

+3 −2
Original line number Diff line number Diff line
@@ -11399,8 +11399,9 @@ package android.os.connectivity { 
    method public long getNumPacketsTx();

    method public long getRxTimeMillis();

    method public long getSleepTimeMillis();

    method @NonNull public long getTimeInRatMicros(int);

    method @NonNull public long getTimeInRxSignalStrengthLevelMicros(@IntRange(from=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN, to=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_GREAT) int);

    method public long getTimeInRatMicros(int);

    method public long getTimeInRxSignalStrengthLevelMicros(@IntRange(from=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN, to=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_GREAT) int);

    method @FlaggedApi("com.android.server.power.optimization.streamlined_connectivity_battery_stats") public long getTxTimeMillis(@IntRange(from=android.telephony.ModemActivityInfo.TX_POWER_LEVEL_0, to=android.telephony.ModemActivityInfo.TX_POWER_LEVEL_4) int);

    method public void writeToParcel(@NonNull android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.os.connectivity.CellularBatteryStats> CREATOR;

  }

core/api/test-current.txt

+12 −0
Original line number Diff line number Diff line
@@ -2608,6 +2608,18 @@ package android.os { 


}



package android.os.connectivity {



  public final class CellularBatteryStats implements android.os.Parcelable {

    ctor @FlaggedApi("com.android.server.power.optimization.streamlined_connectivity_battery_stats") public CellularBatteryStats(long, long, long, long, long, long, long, long, long, long, @NonNull long[], @NonNull long[], @NonNull long[], long);

  }



  public final class WifiBatteryStats implements android.os.Parcelable {

    ctor @FlaggedApi("com.android.server.power.optimization.streamlined_connectivity_battery_stats") public WifiBatteryStats(long, long, long, long, long, long, long, long, long, long, long, long, long, @NonNull long[], @NonNull long[], @NonNull long[], long);

  }



}



package android.os.health {



  public class HealthKeys {

core/java/android/os/connectivity/CellularBatteryStats.java

+14 −8
Original line number Diff line number Diff line
@@ -15,11 +15,13 @@ 
 */

package android.os.connectivity;



import android.annotation.FlaggedApi;

import android.annotation.IntRange;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.os.BatteryStats;

import android.os.Parcel;

import android.os.Parcelable;
@@ -35,6 +37,7 @@ import java.util.Objects; 
 *

 * @hide

 */

@android.ravenwood.annotation.RavenwoodKeepWholeClass

@SystemApi

public final class CellularBatteryStats implements Parcelable {
@@ -83,11 +86,17 @@ public final class CellularBatteryStats implements Parcelable { 
                }

            };



    /** @hide **/

    /**

     * This constructor should only be used in tests.

     * @hide

     */

    @FlaggedApi(

            com.android.server.power.optimization.Flags.FLAG_STREAMLINED_CONNECTIVITY_BATTERY_STATS)

    @TestApi

    public CellularBatteryStats(long loggingDurationMs, long kernelActiveTimeMs, long numPacketsTx,

            long numBytesTx, long numPacketsRx, long numBytesRx, long sleepTimeMs, long idleTimeMs,

            long rxTimeMs, Long energyConsumedMaMs, long[] timeInRatMs,

            long[] timeInRxSignalStrengthLevelMs, long[] txTimeMs,

            long rxTimeMs, long energyConsumedMaMs, @NonNull long[] timeInRatMs,

            @NonNull long[] timeInRxSignalStrengthLevelMs, @NonNull long[] txTimeMs,

            long monitoredRailChargeConsumedMaMs) {



        mLoggingDurationMs = loggingDurationMs;
@@ -270,7 +279,6 @@ public final class CellularBatteryStats implements Parcelable { 
     * @return The amount of time the phone spends in the {@code networkType} network type. The

     * unit is in microseconds.

     */

    @NonNull

    @SuppressLint("MethodNameUnits")

    public long getTimeInRatMicros(@NetworkType int networkType) {

        if (networkType >= mTimeInRatMs.length) {
@@ -289,7 +297,6 @@ public final class CellularBatteryStats implements Parcelable { 
     * @return Amount of time phone spends in specific cellular rx signal strength levels

     * in microseconds. The index is signal strength bin.

     */

    @NonNull

    @SuppressLint("MethodNameUnits")

    public long getTimeInRxSignalStrengthLevelMicros(

            @IntRange(from = CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN,
@@ -315,10 +322,9 @@ public final class CellularBatteryStats implements Parcelable { 
     * <li> index 3 = 15dBm < tx_power < 20dBm. </li>

     * <li> index 4 = tx_power > 20dBm. </li>

     * </ul>

     *

     * @hide

     */

    @NonNull

    @FlaggedApi(

            com.android.server.power.optimization.Flags.FLAG_STREAMLINED_CONNECTIVITY_BATTERY_STATS)

    public long getTxTimeMillis(

            @IntRange(from = ModemActivityInfo.TX_POWER_LEVEL_0,

                    to = ModemActivityInfo.TX_POWER_LEVEL_4) int level) {

core/java/android/os/connectivity/WifiBatteryStats.java

+10 −1
Original line number Diff line number Diff line
@@ -19,9 +19,11 @@ import static android.os.BatteryStats.NUM_WIFI_SIGNAL_STRENGTH_BINS; 
import static android.os.BatteryStatsManager.NUM_WIFI_STATES;

import static android.os.BatteryStatsManager.NUM_WIFI_SUPPL_STATES;



import android.annotation.FlaggedApi;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.os.Parcel;

import android.os.Parcelable;
@@ -34,6 +36,7 @@ import java.util.Objects; 
 * @hide

 */

@SystemApi

@android.ravenwood.annotation.RavenwoodKeepWholeClass

public final class WifiBatteryStats implements Parcelable {

    private final long mLoggingDurationMillis;

    private final long mKernelActiveTimeMillis;
@@ -150,7 +153,13 @@ public final class WifiBatteryStats implements Parcelable { 
                mMonitoredRailChargeConsumedMaMillis);

    }



    /** @hide **/

    /**

     * This constructor should only be used in tests.

     * @hide

     */

    @FlaggedApi(

            com.android.server.power.optimization.Flags.FLAG_STREAMLINED_CONNECTIVITY_BATTERY_STATS)

    @TestApi

    public WifiBatteryStats(long loggingDurationMillis, long kernelActiveTimeMillis,

            long numPacketsTx, long numBytesTx, long numPacketsRx, long numBytesRx,

            long sleepTimeMillis, long scanTimeMillis, long idleTimeMillis, long rxTimeMillis,

ravenwood/texts/ravenwood-annotation-allowed-classes.txt

+2 −0
Original line number Diff line number Diff line
@@ -274,7 +274,9 @@ android.telephony.CellSignalStrength 
android.telephony.ModemActivityInfo

android.telephony.ServiceState



android.os.connectivity.CellularBatteryStats

android.os.connectivity.WifiActivityEnergyInfo

android.os.connectivity.WifiBatteryStats



com.android.server.LocalServices