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

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

Merge "[API Review] Replace ResultReceiver by Executor" into tm-dev am: f53d0eb6 

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

Change-Id: I03edd346e1703d621d67133fa5db30f079cf4838
parents 159065ea f53d0eb6

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

+9 −8
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ import android.bluetooth.BluetoothStatusCodes; 
import android.bluetooth.BluetoothUuid;

import android.bluetooth.BufferConstraints;

import android.bluetooth.IBluetooth;

import android.bluetooth.IBluetoothActivityEnergyInfoListener;

import android.bluetooth.IBluetoothCallback;

import android.bluetooth.IBluetoothConnectionCallback;

import android.bluetooth.IBluetoothMetadataListener;
@@ -84,7 +85,6 @@ import android.os.ParcelUuid; 
import android.os.PowerManager;

import android.os.RemoteCallbackList;

import android.os.RemoteException;

import android.os.ResultReceiver;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.UserHandle;
@@ -217,8 +217,6 @@ public class AdapterService extends Service { 
    public static final String ACTIVITY_ATTRIBUTION_NO_ACTIVE_DEVICE_ADDRESS =

            "no_active_device_address";



    public static final String RESULT_RECEIVER_CONTROLLER_KEY = "controller_activity";



    // Report ID definition

    public enum BqrQualityReportId {

        QUALITY_REPORT_ID_MONITOR_MODE(0x01),
@@ -3600,11 +3598,14 @@ public class AdapterService extends Service { 
        }



        @Override

        public void requestActivityInfo(ResultReceiver result, AttributionSource source) {

            Bundle bundle = new Bundle();

            bundle.putParcelable(RESULT_RECEIVER_CONTROLLER_KEY,

                    reportActivityInfo(source));

            result.send(0, bundle);

        public void requestActivityInfo(IBluetoothActivityEnergyInfoListener listener,

                    AttributionSource source) {

            BluetoothActivityEnergyInfo info = reportActivityInfo(source);

            try {

                listener.onBluetoothActivityEnergyInfo(info);

            } catch (RemoteException e) {

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

            }

        }



        @Override

framework/api/system-current.txt

+5 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ package android.bluetooth { 
    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean registerBluetoothConnectionCallback(@NonNull java.util.concurrent.Executor, @NonNull android.bluetooth.BluetoothAdapter.BluetoothConnectionCallback);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED, android.Manifest.permission.MODIFY_PHONE_STATE}) public boolean removeActiveDevice(int);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean removeOnMetadataChangedListener(@NonNull android.bluetooth.BluetoothDevice, @NonNull android.bluetooth.BluetoothAdapter.OnMetadataChangedListener);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void requestControllerActivityEnergyInfo(@NonNull android.os.ResultReceiver);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void requestControllerActivityEnergyInfo(@NonNull java.util.concurrent.Executor, @NonNull android.bluetooth.BluetoothAdapter.OnBluetoothActivityEnergyInfoListener);

    method @NonNull @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public android.bluetooth.BluetoothSocket retrieveConnectedRfcommSocket(@NonNull java.util.UUID);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED, android.Manifest.permission.MODIFY_PHONE_STATE}) public boolean setActiveDevice(@NonNull android.bluetooth.BluetoothDevice, int);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_SCAN, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int setDiscoverableTimeout(@NonNull java.time.Duration);
@@ -97,6 +97,10 @@ package android.bluetooth { 
    method public void onDeviceDisconnected(@NonNull android.bluetooth.BluetoothDevice, int);

  }



  public static interface BluetoothAdapter.OnBluetoothActivityEnergyInfoListener {

    method public void onBluetoothActivityEnergyInfo(@Nullable android.bluetooth.BluetoothActivityEnergyInfo);

  }



  public static interface BluetoothAdapter.OnMetadataChangedListener {

    method public void onMetadataChanged(@NonNull android.bluetooth.BluetoothDevice, int, @Nullable byte[]);

  }

framework/java/android/bluetooth/BluetoothAdapter.java

+57 −9
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ import android.os.IBinder; 
import android.os.IpcDataCache;

import android.os.ParcelUuid;

import android.os.RemoteException;

import android.os.ResultReceiver;

import android.sysprop.BluetoothProperties;

import android.util.Log;

import android.util.Pair;
@@ -831,6 +830,55 @@ public final class BluetoothAdapter { 
        }

    };



    /**

     * Interface for Bluetooth activity energy info listener. Should be implemented by applications

     * and set when calling {@link BluetoothAdapter#requestControllerActivityEnergyInfo}.

     *

     * @hide

     */

    @SystemApi

    public interface OnBluetoothActivityEnergyInfoListener {

        /**

         * Called when Bluetooth activity energy info is available.

         * Note: this listener is triggered at most once for each call to

         * {@link #requestControllerActivityEnergyInfo}.

         *

         * @param info the latest {@link BluetoothActivityEnergyInfo}, or null if unavailable.

         */

        void onBluetoothActivityEnergyInfo(@Nullable BluetoothActivityEnergyInfo info);

    }



    private static class OnBluetoothActivityEnergyInfoProxy

            extends IBluetoothActivityEnergyInfoListener.Stub {

        private final Object mLock = new Object();

        @Nullable @GuardedBy("mLock") private Executor mExecutor;

        @Nullable @GuardedBy("mLock") private OnBluetoothActivityEnergyInfoListener mListener;



        OnBluetoothActivityEnergyInfoProxy(Executor executor,

                OnBluetoothActivityEnergyInfoListener listener) {

            mExecutor = executor;

            mListener = listener;

        }



        @Override

        public void onBluetoothActivityEnergyInfo(BluetoothActivityEnergyInfo info) {

            Executor executor;

            OnBluetoothActivityEnergyInfoListener listener;

            synchronized (mLock) {

                if (mExecutor == null || mListener == null) {

                    return;

                }

                executor = mExecutor;

                listener = mListener;

                // null out to allow garbage collection, prevent triggering listener more than once

                mExecutor = null;

                mListener = null;

            }

            Binder.clearCallingIdentity();

            executor.execute(() -> listener.onBluetoothActivityEnergyInfo(info));

        }

    }



    /**

     * Get a handle to the default local Bluetooth adapter.

     * <p>
@@ -2686,22 +2734,22 @@ public final class BluetoothAdapter { 
            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

    })

    public void requestControllerActivityEnergyInfo(@NonNull ResultReceiver result) {

        requireNonNull(result, "ResultReceiver cannot be null");

    public void requestControllerActivityEnergyInfo(

            @NonNull @CallbackExecutor Executor executor,

            @NonNull OnBluetoothActivityEnergyInfoListener listener) {

        requireNonNull(executor, "executor cannot be null");

        requireNonNull(listener, "listener cannot be null");

        try {

            mServiceLock.readLock().lock();

            if (mService != null) {

                mService.requestActivityInfo(result, mAttributionSource);

                result = null;

                mService.requestActivityInfo(

                        new OnBluetoothActivityEnergyInfoProxy(executor, listener),

                        mAttributionSource);

            }

        } catch (RemoteException e) {

            Log.e(TAG, "getControllerActivityEnergyInfoCallback: " + e);

        } finally {

            mServiceLock.readLock().unlock();

            if (result != null) {

                // Only send an immediate result if we failed.

                result.send(0, null);

            }

        }

    }

system/binder/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ filegroup { 
        "android/bluetooth/IBluetooth.aidl",

        "android/bluetooth/IBluetoothA2dp.aidl",

        "android/bluetooth/IBluetoothA2dpSink.aidl",

        "android/bluetooth/IBluetoothActivityEnergyInfoListener.aidl",

        "android/bluetooth/IBluetoothAvrcpController.aidl",

        "android/bluetooth/IBluetoothAvrcpTarget.aidl",

        "android/bluetooth/IBluetoothBattery.aidl",

system/binder/android/bluetooth/IBluetooth.aidl

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.bluetooth;



import android.app.PendingIntent;

import android.bluetooth.IBluetoothActivityEnergyInfoListener;

import android.bluetooth.IBluetoothCallback;

import android.bluetooth.IBluetoothConnectionCallback;

import android.bluetooth.IBluetoothMetadataListener;
@@ -231,7 +232,7 @@ interface IBluetooth 
     * The result code is ignored.

     */

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")

    oneway void requestActivityInfo(in ResultReceiver result, in AttributionSource attributionSource);

    oneway void requestActivityInfo(in IBluetoothActivityEnergyInfoListener listener, in AttributionSource attributionSource);



    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")

    oneway void onLeServiceUp(in AttributionSource attributionSource, in SynchronousResultReceiver receiver);