Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove bluetooth state change logging from BatteryStats" into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-05-17 02:32:46 +00:00
committed by Android (Google) Code Review
parent aee17d1881 79b75bdbc8
commit fda3c4c7d8
3 changed files with 2 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/os/BatteryStatsManager.java
View File

@@ -520,14 +520,10 @@ 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
*/
@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
public void reportBluetoothOn(int uid, int reason, @NonNull String packageName) {
try {
mBatteryStats.noteBluetoothOn(uid, reason, packageName);
} catch (RemoteException e) {
e.rethrowFromSystemServer();
}
}
/**
@@ -536,14 +532,10 @@ 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
*/
@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
public void reportBluetoothOff(int uid, int reason, @NonNull String packageName) {
try {
mBatteryStats.noteBluetoothOff(uid, reason, packageName);
} catch (RemoteException e) {
e.rethrowFromSystemServer();
}
}
/**

4
core/java/com/android/internal/app/IBatteryStats.aidl
View File

@@ -219,10 +219,6 @@ interface IBatteryStats {
@EnforcePermission("BATTERY_STATS")
long getAwakeTimePlugged();
@EnforcePermission("BLUETOOTH_CONNECT")
void noteBluetoothOn(int uid, int reason, String packageName);
@EnforcePermission("BLUETOOTH_CONNECT")
void noteBluetoothOff(int uid, int reason, String packageName);
@EnforcePermission("UPDATE_DEVICE_STATS")
void noteBleScanStarted(in WorkSource ws, boolean isUnoptimized);
@EnforcePermission("UPDATE_DEVICE_STATS")

28
services/core/java/com/android/server/am/BatteryStatsService.java
View File

@@ -2287,34 +2287,6 @@ public final class BatteryStatsService extends IBatteryStats.Stub
}
}
/**
* Bluetooth on stat logging
*/
@Override
@EnforcePermission(BLUETOOTH_CONNECT)
public void noteBluetoothOn(int uid, int reason, String packageName) {
super.noteBluetoothOn_enforcePermission();
FrameworkStatsLog.write_non_chained(FrameworkStatsLog.BLUETOOTH_ENABLED_STATE_CHANGED,
Binder.getCallingUid(), null,
FrameworkStatsLog.BLUETOOTH_ENABLED_STATE_CHANGED__STATE__ENABLED,
reason, packageName);
}
/**
* Bluetooth off stat logging
*/
@Override
@EnforcePermission(BLUETOOTH_CONNECT)
public void noteBluetoothOff(int uid, int reason, String packageName) {
super.noteBluetoothOff_enforcePermission();
FrameworkStatsLog.write_non_chained(FrameworkStatsLog.BLUETOOTH_ENABLED_STATE_CHANGED,
Binder.getCallingUid(), null,
FrameworkStatsLog.BLUETOOTH_ENABLED_STATE_CHANGED__STATE__DISABLED,
reason, packageName);
}
@Override
@EnforcePermission(UPDATE_DEVICE_STATS)
public void noteBleScanStarted(final WorkSource ws, final boolean isUnoptimized) {