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

[API Review] Replace ResultReceiver by Executor am: 8d4a9f8d72 am: 2d0b69cd5e

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

Change-Id: I04cdaaf291637eea9ed857c7e6c3c17da9b81275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Etienne Ruffieux
2022-03-29 21:11:24 +00:00
committed by Automerger Merge Worker
parent 9d9976b68f 2d0b69cd5e
commit 34d2b99779
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -556,8 +556,18 @@ class BatteryExternalStatsWorker implements BatteryStatsImpl.ExternalStatsSync {
// We were asked to fetch Bluetooth data. // We were asked to fetch Bluetooth data.
final BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); final BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
if (adapter != null) { if (adapter != null) {
bluetoothReceiver = new SynchronousResultReceiver("bluetooth"); SynchronousResultReceiver resultReceiver =
adapter.requestControllerActivityEnergyInfo(bluetoothReceiver); new SynchronousResultReceiver("bluetooth");
adapter.requestControllerActivityEnergyInfo(
Runnable::run,
info -> {
Bundle bundle = new Bundle();
bundle.putParcelable(BatteryStats.RESULT_RECEIVER_CONTROLLER_KEY,
info);
resultReceiver.send(0, bundle);
}
);
bluetoothReceiver = resultReceiver;
} }
} }

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

@@ -1618,7 +1618,14 @@ public class StatsPullAtomService extends SystemService {
if (adapter != null) { if (adapter != null) {
SynchronousResultReceiver bluetoothReceiver = SynchronousResultReceiver bluetoothReceiver =
new SynchronousResultReceiver("bluetooth"); new SynchronousResultReceiver("bluetooth");
adapter.requestControllerActivityEnergyInfo(bluetoothReceiver); adapter.requestControllerActivityEnergyInfo(
Runnable::run,
info -> {
Bundle bundle = new Bundle();
bundle.putParcelable(BatteryStats.RESULT_RECEIVER_CONTROLLER_KEY, info);
bluetoothReceiver.send(0, bundle);
}
);
return awaitControllerInfo(bluetoothReceiver); return awaitControllerInfo(bluetoothReceiver);
} else { } else {
Slog.e(TAG, "Failed to get bluetooth adapter!"); Slog.e(TAG, "Failed to get bluetooth adapter!");