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

Commit 97903a77 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "BatteryStatsManager: Address API council feedback" into rvc-dev am: 03a65f1a 

Change-Id: I450b5a6a346f8092ba0e084b2054d918337876a0
parents 332cbdeb 03a65f1a

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -8132,8 +8132,8 @@ package android.os { 
    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportFullWifiLockReleasedFromSource(@NonNull android.os.WorkSource);

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportWifiBatchedScanStartedFromSource(@NonNull android.os.WorkSource, @IntRange(from=0) int);

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportWifiBatchedScanStoppedFromSource(@NonNull android.os.WorkSource);

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportWifiMulticastDisabled(int);

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportWifiMulticastEnabled(int);

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportWifiMulticastDisabled(@NonNull android.os.WorkSource);

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportWifiMulticastEnabled(@NonNull android.os.WorkSource);

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportWifiOff();

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportWifiOn();

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportWifiRssiChanged(@IntRange(from=0xffffff81, to=0) int);

core/java/android/os/BatteryStatsManager.java

+8 −6
Original line number Diff line number Diff line
@@ -350,12 +350,13 @@ public final class BatteryStatsManager { 
    /**

     * Indicates that an app has acquired the wifi multicast lock.

     *

     * @param uid UID of the app that acquired the wifi lock (to be used for battery blaming).

     * @param ws Worksource with the uid of the app that acquired the wifi lock (to be used for

     *           battery blaming).

     */

    @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS)

    public void reportWifiMulticastEnabled(int uid) {

    public void reportWifiMulticastEnabled(@NonNull WorkSource ws) {

        try {

            mBatteryStats.noteWifiMulticastEnabled(uid);

            mBatteryStats.noteWifiMulticastEnabled(ws.getAttributionUid());

        } catch (RemoteException e) {

            e.rethrowFromSystemServer();

        }
@@ -364,12 +365,13 @@ public final class BatteryStatsManager { 
    /**

     * Indicates that an app has released the wifi multicast lock.

     *

     * @param uid UID of the app that released the wifi lock (to be used for battery blaming).

     * @param ws Worksource with the uid of the app that released the wifi lock (to be used for

     *           battery blaming).

     */

    @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS)

    public void reportWifiMulticastDisabled(int uid) {

    public void reportWifiMulticastDisabled(@NonNull WorkSource ws) {

        try {

            mBatteryStats.noteWifiMulticastDisabled(uid);

            mBatteryStats.noteWifiMulticastDisabled(ws.getAttributionUid());

        } catch (RemoteException e) {

            e.rethrowFromSystemServer();

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ public final class WifiBatteryStats implements Parcelable { 
     * Returns the number of bytes transmitted over wifi within

     * {@link #getLoggingDurationMillis()}.

     *

     * @return Number of packets received.

     * @return Number of bytes transmitted.

     */

    public long getNumBytesTx() {

        return mNumBytesTx;
@@ -225,7 +225,7 @@ public final class WifiBatteryStats implements Parcelable { 
     * Returns the number of packets received over wifi within

     * {@link #getLoggingDurationMillis()}.

     *

     * @return Number of bytes transmitted.

     * @return Number of packets received.

     */

    public long getNumPacketsRx() {

        return mNumPacketsRx;