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

Commit 8d4a9f8d authored by Etienne Ruffieux's avatar Etienne Ruffieux
Browse files

[API Review] Replace ResultReceiver by Executor 

Bug: 223344084
Test: build
Tag: #feature
Merged-In: I5c6fc4780b41406dc41c26050a10768b7a2114df
Change-Id: I5c6fc4780b41406dc41c26050a10768b7a2114df
parent b344dfae

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

+12 −2
Original line number Diff line number Diff line
@@ -556,8 +556,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;

            }

        }

services/core/java/com/android/server/stats/pull/StatsPullAtomService.java

+8 −1
Original line number Diff line number Diff line
@@ -1618,7 +1618,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!");