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

Commit bc0501e2 authored by Etienne Ruffieux's avatar Etienne Ruffieux
Browse files

Added error method to interface Bluetooth stats 

Bug: 223344084
Test: atest BluetoothAdapterTest
Tag: #feature
Change-Id: Ie38afa6db3636a8264038be30e9bf025a7a9f09a
parent 8d4a9f8d

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

+18 −5
Original line number Diff line number Diff line
@@ -560,12 +560,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
@@ -1620,11 +1620,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 {