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

Added error method to interface Bluetooth stats

Browse Source 
Bug: 223344084
Test: atest BluetoothAdapterTest
Tag: #feature
Change-Id: Ie38afa6db3636a8264038be30e9bf025a7a9f09a
This commit is contained in:
Etienne Ruffieux
2022-03-23 16:10:53 +00:00
parent 8d4a9f8d72
commit bc0501e2a1
2 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
services/core/java/com/android/server/am/BatteryExternalStatsWorker.java
View File

@@ -560,11 +560,24 @@ class BatteryExternalStatsWorker implements BatteryStatsImpl.ExternalStatsSync {
new SynchronousResultReceiver("bluetooth");
adapter.requestControllerActivityEnergyInfo(
Runnable::run,
info -> {
Bundle bundle = new Bundle();
bundle.putParcelable(BatteryStats.RESULT_RECEIVER_CONTROLLER_KEY,
info);
resultReceiver.send(0, bundle);
new BluetoothAdapter.OnBluetoothActivityEnergyInfoCallback() {
@Override
public void onBluetoothActivityEnergyInfoAvailable(
BluetoothActivityEnergyInfo info) {
Bundle bundle = new Bundle();
bundle.putParcelable(
BatteryStats.RESULT_RECEIVER_CONTROLLER_KEY, info);
resultReceiver.send(0, bundle);
}
@Override
public void onBluetoothActivityEnergyInfoError(int errorCode) {
Slog.w(TAG, "error reading Bluetooth stats: " + errorCode);
Bundle bundle = new Bundle();
bundle.putParcelable(
BatteryStats.RESULT_RECEIVER_CONTROLLER_KEY, null);
resultReceiver.send(0, bundle);
}
}
);
bluetoothReceiver = resultReceiver;

22
services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
View File

@@ -1620,10 +1620,24 @@ public class StatsPullAtomService extends SystemService {
new SynchronousResultReceiver("bluetooth");
adapter.requestControllerActivityEnergyInfo(
Runnable::run,
info -> {
Bundle bundle = new Bundle();
bundle.putParcelable(BatteryStats.RESULT_RECEIVER_CONTROLLER_KEY, info);
bluetoothReceiver.send(0, bundle);
new BluetoothAdapter.OnBluetoothActivityEnergyInfoCallback() {
@Override
public void onBluetoothActivityEnergyInfoAvailable(
BluetoothActivityEnergyInfo info) {
Bundle bundle = new Bundle();
bundle.putParcelable(
BatteryStats.RESULT_RECEIVER_CONTROLLER_KEY, info);
bluetoothReceiver.send(0, bundle);
}
@Override
public void onBluetoothActivityEnergyInfoError(int errorCode) {
Slog.w(TAG, "error reading Bluetooth stats: " + errorCode);
Bundle bundle = new Bundle();
bundle.putParcelable(
BatteryStats.RESULT_RECEIVER_CONTROLLER_KEY, null);
bluetoothReceiver.send(0, bundle);
}
}
);
return awaitControllerInfo(bluetoothReceiver);