diff options
| author | 2020-01-24 18:13:18 +0000 | |
|---|---|---|
| committer | 2020-01-24 18:13:18 +0000 | |
| commit | 48ed89faa9ee60dd43030528d0be2af94fa855e5 (patch) | |
| tree | 6557608a782273ee8890e5fd2dc3a17bd05e1380 | |
| parent | 5ca875eabbbbd28f1276dac0fc081c6614012d89 (diff) | |
| parent | 81d7cece57540d61ea16d2d33f253b474d60a963 (diff) | |
Merge "Partial Revert of ag/10161061"
| -rwxr-xr-x | api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/os/BatteryStatsManager.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index b4825bfe3695..9cc7f08a655b 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -8411,7 +8411,7 @@ package android.os { 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.WifiBatteryStats getWifiBatteryStats(); method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportFullWifiLockAcquiredFromSource(@NonNull android.os.WorkSource); diff --git a/core/java/android/os/BatteryStatsManager.java b/core/java/android/os/BatteryStatsManager.java index f2e16b46422f..152141edb52d 100644 --- a/core/java/android/os/BatteryStatsManager.java +++ b/core/java/android/os/BatteryStatsManager.java @@ -42,7 +42,7 @@ import java.lang.annotation.RetentionPolicy; */ @SystemApi @SystemService(Context.BATTERY_STATS_SERVICE) -public final class BatteryStatsManager { +public class BatteryStatsManager { /** * Wifi states. * |