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

Commit f3ff040b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[API Review] BluetoothActivityenergyInfo doc + rename" into tm-dev am: 53c034b8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/17258755

Change-Id: I40bafe07582f4be7f9202889d49418ddd5bcffbf
parents fdb5c6b3 53c034b8

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+1 −1
Original line number Diff line number Diff line
@@ -3602,7 +3602,7 @@ public class AdapterService extends Service { 
                    AttributionSource source) {

            BluetoothActivityEnergyInfo info = reportActivityInfo(source);

            try {

                listener.onBluetoothActivityEnergyInfo(info);

                listener.onBluetoothActivityEnergyInfoAvailable(info);

            } catch (RemoteException e) {

                Log.e(TAG, "onBluetoothActivityEnergyInfo: RemoteException", e);

            }

framework/java/android/bluetooth/BluetoothAdapter.java

+4 −2
Original line number Diff line number Diff line
@@ -871,7 +871,7 @@ public final class BluetoothAdapter { 
        }



        @Override

        public void onBluetoothActivityEnergyInfo(BluetoothActivityEnergyInfo info) {

        public void onBluetoothActivityEnergyInfoAvailable(BluetoothActivityEnergyInfo info) {

            Executor executor;

            OnBluetoothActivityEnergyInfoListener listener;

            synchronized (mLock) {
@@ -2733,7 +2733,9 @@ public final class BluetoothAdapter { 
     * A null value for the activity info object may be sent if the bluetooth service is

     * unreachable or the device does not support reporting such information.

     *

     * @param result The callback to which to send the activity info.

     * @param executor the executor that the listener will be invoked on

     * @param listener the listener that will receive the {@link BluetoothActivityEnergyInfo}

     *                 object when it becomes available

     * @hide

     */

    @SystemApi

system/binder/android/bluetooth/IBluetoothActivityEnergyInfoListener.aidl

+1 −1
Original line number Diff line number Diff line
@@ -30,5 +30,5 @@ oneway interface IBluetoothActivityEnergyInfoListener 
     * activity energy info.

     * @param info the Bluetooth activity energy info

     */

    void onBluetoothActivityEnergyInfo(in BluetoothActivityEnergyInfo info);

    void onBluetoothActivityEnergyInfoAvailable(in BluetoothActivityEnergyInfo info);

}
 
 No newline at end of file