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

Commit 10e1ee3d authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Android (Google) Code Review
Browse files

Merge "Change required permission declaration for BatteryStatsManager.get*BatteryStats"

parents 0e591495 56c88487

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -8081,8 +8081,8 @@ package android.os { 
  }















  public final class BatteryStatsManager {













    method @NonNull @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public android.os.connectivity.CellularBatteryStats getCellularBatteryStats();













    method @NonNull @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public android.os.connectivity.WifiBatteryStats getWifiBatteryStats();













    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.BATTERY_STATS, android.Manifest.permission.UPDATE_DEVICE_STATS}) public android.os.connectivity.CellularBatteryStats getCellularBatteryStats();













    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.BATTERY_STATS, android.Manifest.permission.UPDATE_DEVICE_STATS}) public android.os.connectivity.WifiBatteryStats getWifiBatteryStats();















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















    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 reportMobileRadioPowerState(boolean, int);

























core/java/android/os/BatteryStatsManager.java



+6
−2




























Original line number
Diff line number
Diff line








@@ -322,7 +322,9 @@ public final class BatteryStatsManager {













     *















     * @return Instance of {@link CellularBatteryStats}.















     */













    @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS)













    @RequiresPermission(anyOf = {













            android.Manifest.permission.BATTERY_STATS,













            android.Manifest.permission.UPDATE_DEVICE_STATS})















    public @NonNull CellularBatteryStats getCellularBatteryStats() {















        try {















            return mBatteryStats.getCellularBatteryStats();









@@ -337,7 +339,9 @@ public final class BatteryStatsManager {













     *















     * @return Instance of {@link WifiBatteryStats}.















     */













    @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS)













    @RequiresPermission(anyOf = {













            android.Manifest.permission.BATTERY_STATS,













            android.Manifest.permission.UPDATE_DEVICE_STATS})















    public @NonNull WifiBatteryStats getWifiBatteryStats() {















        try {















            return mBatteryStats.getWifiBatteryStats();