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

Commit 81d7cece authored by Roshan Pius's avatar Roshan Pius
Browse files

Partial Revert of ag/10161061 

Making battery stats final broke telephony unit tests (old mockito does
not allow mocking final objects).

Bug: 148282682
Test: Compiles
Change-Id: Id65ba702aa551c7c23bbd6efa527ef2b930478f5
parent 6a1100c6

api/system-current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -8411,7 +8411,7 @@ package android.os { 
    method @NonNull public android.os.BatterySaverPolicyConfig.Builder setLocationMode(int);

    method @NonNull public android.os.BatterySaverPolicyConfig.Builder setLocationMode(int);

  }

  }

















  public final class BatteryStatsManager {







  public 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.CellularBatteryStats getCellularBatteryStats();











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







    method @NonNull @RequiresPermission(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 reportFullWifiLockAcquiredFromSource(@NonNull android.os.WorkSource);

























core/java/android/os/BatteryStatsManager.java



+1
−1




























Original line number
Original line
Diff line number
Diff line








@@ -42,7 +42,7 @@ import java.lang.annotation.RetentionPolicy;









 */







 */











@SystemApi







@SystemApi











@SystemService(Context.BATTERY_STATS_SERVICE)







@SystemService(Context.BATTERY_STATS_SERVICE)











public final class BatteryStatsManager {







public class BatteryStatsManager {











    /**







    /**











     * Wifi states.







     * Wifi states.











     *







     *