[API Review] BluetoothActivityenergyInfo doc + rename am: 65fc969887 am: d5c24b89f9

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

Change-Id: I8d0d82c0db5e5ac3c0e99d97bc323eb2276bfbea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3 files changed, 6 insertions, 4 deletions

diff --git a/android/app/src/com/android/bluetooth/btservice/AdapterService.java b/android/app/src/com/android/bluetooth/btservice/AdapterService.java
index 9bf8929a51..bc833c6f8b 100644
--- a/android/app/src/com/android/bluetooth/btservice/AdapterService.java
+++ b/android/app/src/com/android/bluetooth/btservice/AdapterService.java
@@ -3608,7 +3608,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);
             }
diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java
index cccc7d43f5..9036e3e2d8 100644
--- a/framework/java/android/bluetooth/BluetoothAdapter.java
+++ b/framework/java/android/bluetooth/BluetoothAdapter.java
@@ -849,7 +849,7 @@ public final class BluetoothAdapter {
         }
 
         @Override
-        public void onBluetoothActivityEnergyInfo(BluetoothActivityEnergyInfo info) {
+        public void onBluetoothActivityEnergyInfoAvailable(BluetoothActivityEnergyInfo info) {
             Executor executor;
             OnBluetoothActivityEnergyInfoListener listener;
             synchronized (mLock) {
@@ -2737,7 +2737,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
diff --git a/system/binder/android/bluetooth/IBluetoothActivityEnergyInfoListener.aidl b/system/binder/android/bluetooth/IBluetoothActivityEnergyInfoListener.aidl
index 24ae14adb9..4ecaab9713 100644
--- a/system/binder/android/bluetooth/IBluetoothActivityEnergyInfoListener.aidl
+++ b/system/binder/android/bluetooth/IBluetoothActivityEnergyInfoListener.aidl
@@ -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