Merge "[API Review] Replace ResultReceiver by Executor" into tm-dev (581d4fb9) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/BatteryExternalStatsWorker.java

+12 −2

Original line number	Diff line number	Diff line
		@@ -561,8 +561,18 @@ class BatteryExternalStatsWorker implements BatteryStatsImpl.ExternalStatsSync {
		// We were asked to fetch Bluetooth data.
		final BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
		if (adapter != null) {
		bluetoothReceiver = new SynchronousResultReceiver("bluetooth");
		adapter.requestControllerActivityEnergyInfo(bluetoothReceiver);
		SynchronousResultReceiver resultReceiver =
		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;
		}
		}

+8 −1

Original line number	Diff line number	Diff line
		@@ -1633,7 +1633,14 @@ public class StatsPullAtomService extends SystemService {
		if (adapter != null) {
		SynchronousResultReceiver bluetoothReceiver =
		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);
		} else {
		Slog.e(TAG, "Failed to get bluetooth adapter!");