diff options
| author | 2023-10-11 15:45:06 +0000 | |
|---|---|---|
| committer | 2023-10-11 15:45:06 +0000 | |
| commit | 008a35fdfeba18a54a14b40fc18fe511d3f8cba5 (patch) | |
| tree | fb99638cada6e152448d111c78cd9e2d208d3939 | |
| parent | cd1e48e97fcdd44c4209168cd302c7c90ace8452 (diff) | |
| parent | 3871e4c8a6676a9c7bd306e3538afbd953df115e (diff) | |
Merge "Fix broken docs in BatteryStatsManager" into main
| -rw-r--r-- | core/api/system-current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/os/BatteryStatsManager.java | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 4c69b0e9b107..147a37022b58 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -10383,8 +10383,8 @@ package android.os { method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportBleScanResults(@NonNull android.os.WorkSource, int); method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportBleScanStarted(@NonNull android.os.WorkSource, boolean); method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportBleScanStopped(@NonNull android.os.WorkSource, boolean); - method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void reportBluetoothOff(int, int, @NonNull String); - method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void reportBluetoothOn(int, int, @NonNull String); + method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void reportBluetoothOff(int, int, @NonNull String); + method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void reportBluetoothOn(int, int, @NonNull String); 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); diff --git a/core/java/android/os/BatteryStatsManager.java b/core/java/android/os/BatteryStatsManager.java index 955fad3d1a48..3abe9a0e38f5 100644 --- a/core/java/android/os/BatteryStatsManager.java +++ b/core/java/android/os/BatteryStatsManager.java @@ -520,8 +520,9 @@ public final class BatteryStatsManager { * @param uid calling package uid * @param reason why Bluetooth has been turned on * @param packageName package responsible for this change - * @Deprecated Bluetooth self report its state and no longer call this + * @deprecated Bluetooth self report its state and no longer call this */ + @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void reportBluetoothOn(int uid, int reason, @NonNull String packageName) { } @@ -532,8 +533,9 @@ public final class BatteryStatsManager { * @param uid calling package uid * @param reason why Bluetooth has been turned on * @param packageName package responsible for this change - * @Deprecated Bluetooth self report its state and no longer call this + * @deprecated Bluetooth self report its state and no longer call this */ + @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void reportBluetoothOff(int uid, int reason, @NonNull String packageName) { } |