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

BatteryStatsManager: Address API council feedback

Browse Source 
Bug: 144925883
Test: Compiles
Change-Id: Ibdc61769965a97222fdd968084eca71b997e8feb
This commit is contained in:
Roshan Pius
2020-03-05 10:34:24 -08:00
parent d1bbc14732
commit cdf5744a77
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/system-current.txt
View File

@@ -8143,8 +8143,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);

14
core/java/android/os/BatteryStatsManager.java
View File

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

4
core/java/android/os/connectivity/WifiBatteryStats.java
View File

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