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

Commit 0624af52 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Fix broken docs in BatteryStatsManager" into main am: 008a35fd am:... 

Merge "Fix broken docs in BatteryStatsManager" into main am: 008a35fd am: 198cf86c am: bc8b18a2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2769662



Change-Id: Id6c89fcc3f98d810a8cc53278dd62d3d11aef035
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6c784f04 bc8b18a2

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -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);

core/java/android/os/BatteryStatsManager.java

+4 −2
Original line number Diff line number Diff line
@@ -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) {

    }