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

Commit ac41695f authored Mar 29, 2022 by Etienne Ruffieux Committed by Automerger Merge Worker Mar 29, 2022

[API Review] BluetoothActivityenergyInfo doc + rename am: 65fc9698 am: d5c24b89

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>

parents ac3675a5 d5c24b89

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3608,7 +3608,7 @@ public class AdapterService extends Service {
	AttributionSource source) {		AttributionSource source) {
	BluetoothActivityEnergyInfo info = reportActivityInfo(source);		BluetoothActivityEnergyInfo info = reportActivityInfo(source);
	try {		try {
	listener.onBluetoothActivityEnergyInfo(info);		listener.onBluetoothActivityEnergyInfoAvailable(info);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, "onBluetoothActivityEnergyInfo: RemoteException", e);		Log.e(TAG, "onBluetoothActivityEnergyInfo: RemoteException", e);
	}		}

framework/java/android/bluetooth/BluetoothAdapter.java

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -849,7 +849,7 @@ public final class BluetoothAdapter {
	}		}

	@Override		@Override
	public void onBluetoothActivityEnergyInfo(BluetoothActivityEnergyInfo info) {		public void onBluetoothActivityEnergyInfoAvailable(BluetoothActivityEnergyInfo info) {
	Executor executor;		Executor executor;
	OnBluetoothActivityEnergyInfoListener listener;		OnBluetoothActivityEnergyInfoListener listener;
	synchronized (mLock) {		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		* 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.		* 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		* @hide
	*/		*/
	@SystemApi		@SystemApi

system/binder/android/bluetooth/IBluetoothActivityEnergyInfoListener.aidl

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -30,5 +30,5 @@ oneway interface IBluetoothActivityEnergyInfoListener
	* activity energy info.		* activity energy info.
	* @param info the Bluetooth 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