diff options
| -rw-r--r-- | core/api/system-current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/os/BatteryStatsManager.java | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index c496fddad819..c18a9e3d2b35 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -6808,14 +6808,14 @@ package android.os { 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 reportFullWifiLockReleasedFromSource(@NonNull android.os.WorkSource); - method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportMobileRadioPowerState(boolean, int) throws java.lang.RuntimeException; + method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportMobileRadioPowerState(boolean, int); 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(@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 reportWifiRadioPowerState(boolean, int) throws java.lang.RuntimeException; + method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportWifiRadioPowerState(boolean, int); method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportWifiRssiChanged(@IntRange(from=0xffffff81, to=0) int); method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportWifiScanStartedFromSource(@NonNull android.os.WorkSource); method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportWifiScanStoppedFromSource(@NonNull android.os.WorkSource); diff --git a/core/java/android/os/BatteryStatsManager.java b/core/java/android/os/BatteryStatsManager.java index 3f4a21878687..f5172cf0fb69 100644 --- a/core/java/android/os/BatteryStatsManager.java +++ b/core/java/android/os/BatteryStatsManager.java @@ -386,10 +386,9 @@ public final class BatteryStatsManager { * @param uid Uid of this event. For the active state it represents the uid that was responsible * for waking the radio, or -1 if the system was responsible for waking the radio. * For inactive state, the UID should always be -1. - * @throws RuntimeException if there are binder remote-invocation errors. */ @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) - public void reportMobileRadioPowerState(boolean isActive, int uid) throws RuntimeException { + public void reportMobileRadioPowerState(boolean isActive, int uid) { try { mBatteryStats.noteMobileRadioPowerState(getDataConnectionPowerState(isActive), SystemClock.elapsedRealtimeNanos(), uid); @@ -405,10 +404,9 @@ public final class BatteryStatsManager { * @param uid Uid of this event. For the active state it represents the uid that was responsible * for waking the radio, or -1 if the system was responsible for waking the radio. * For inactive state, the UID should always be -1. - * @throws RuntimeException if there are binder remote-invocation errors. */ @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) - public void reportWifiRadioPowerState(boolean isActive, int uid) throws RuntimeException { + public void reportWifiRadioPowerState(boolean isActive, int uid) { try { mBatteryStats.noteWifiRadioPowerState(getDataConnectionPowerState(isActive), SystemClock.elapsedRealtimeNanos(), uid); |