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

Commit ab2d54ca authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Automerger Merge Worker
Browse files

Merge changes from topic "api-review-result-receiver" am: b7de2357 am: 9fd8b341 am: e238a492 

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



Change-Id: I74c4b4dea4bc9c100f267550b06870acc44e1299
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9ab5b436 e238a492

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

+18 −5
Original line number Diff line number Diff line
@@ -565,12 +565,25 @@ class BatteryExternalStatsWorker implements BatteryStatsImpl.ExternalStatsSync { 
                        new SynchronousResultReceiver("bluetooth");

                adapter.requestControllerActivityEnergyInfo(

                        Runnable::run,

                        info -> {

                        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,

                                    info);

                                bundle.putParcelable(

                                        BatteryStats.RESULT_RECEIVER_CONTROLLER_KEY, null);

                                resultReceiver.send(0, bundle);

                            }

                        }

                );

                bluetoothReceiver = resultReceiver;

            }

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

+18 −4
Original line number Diff line number Diff line
@@ -1635,11 +1635,25 @@ public class StatsPullAtomService extends SystemService { 
                    new SynchronousResultReceiver("bluetooth");

            adapter.requestControllerActivityEnergyInfo(

                    Runnable::run,

                    info -> {

                    new BluetoothAdapter.OnBluetoothActivityEnergyInfoCallback() {

                        @Override

                        public void onBluetoothActivityEnergyInfoAvailable(

                                BluetoothActivityEnergyInfo info) {

                            Bundle bundle = new Bundle();

                        bundle.putParcelable(BatteryStats.RESULT_RECEIVER_CONTROLLER_KEY, info);

                            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);

        } else {