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

Commit bd6edae2 authored by Thomas Girardier's avatar Thomas Girardier Committed by Automerger Merge Worker
Browse files

Merge "Gatt: Remove blesubraterequest non-api" into main am: 69d1323c 

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



Change-Id: Ib147945d7d7860cd98e6997f61e77cf4d39f58c8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4d06b612 69d1323c

android/app/aidl/android/bluetooth/IBluetoothGatt.aidl

+0 −3
Original line number Diff line number Diff line
@@ -176,9 +176,6 @@ interface IBluetoothGatt { 
    void disconnectAll(in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN)")

    int numHwTrackFiltersAvailable(in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void leSubrateRequest(in int clientIf, in String address, in int subrateMin, in int subrateMax, in int maxLatency,

                          in int contNumber, in int supervisionTimeout, in AttributionSource attributionSource);

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

    int subrateModeRequest(in int clientIf, in BluetoothDevice device, in int subrateMode, in AttributionSource attributionSource);

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

android/app/src/com/android/bluetooth/gatt/GattService.java

+0 −66
Original line number Diff line number Diff line
@@ -846,31 +846,6 @@ public class GattService extends ProfileService { 
            return service.subrateModeRequest(clientIf, device, subrateMode);

        }



        @Override

        public void leSubrateRequest(

                int clientIf,

                String address,

                int subrateMin,

                int subrateMax,

                int maxLatency,

                int contNumber,

                int supervisionTimeout,

                AttributionSource attributionSource) {

            GattService service = getService();

            if (service == null) {

                return;

            }

            service.leSubrateRequest(

                    clientIf,

                    address,

                    subrateMin,

                    subrateMax,

                    maxLatency,

                    contNumber,

                    supervisionTimeout,

                    attributionSource);

        }



        @Override

        public void registerServer(

                ParcelUuid uuid,
@@ -2933,47 +2908,6 @@ public class GattService extends ProfileService { 
                supervisionTimeout);

    }



    @RequiresPermission(BLUETOOTH_CONNECT)

    void leSubrateRequest(

            int clientIf,

            String address,

            int subrateMin,

            int subrateMax,

            int maxLatency,

            int contNumber,

            int supervisionTimeout,

            AttributionSource attributionSource) {

        if (!Utils.checkConnectPermissionForDataDelivery(

                this, attributionSource, "GattService leSubrateRequest")) {

            return;

        }



        Log.d(

                TAG,

                "leSubrateRequest() - "

                        + "address="

                        + BluetoothUtils.toAnonymizedAddress(address)

                        + ", subrate min/max="

                        + subrateMin

                        + "/"

                        + subrateMax

                        + ", maxLatency="

                        + maxLatency

                        + ", continuation Number="

                        + contNumber

                        + ", timeout="

                        + supervisionTimeout);



        mNativeInterface.gattSubrateRequest(

                clientIf,

                address,

                subrateMin,

                subrateMax,

                maxLatency,

                contNumber,

                supervisionTimeout);

    }



    /**************************************************************************

     * Callback functions - SERVER

     *************************************************************************/

framework/java/android/bluetooth/BluetoothGatt.java

+0 −51
Original line number Diff line number Diff line
@@ -2156,57 +2156,6 @@ public final class BluetoothGatt implements BluetoothProfile { 
        }

    }



    /**

     * Request a LE subrate request.

     *

     * <p>This function will send a LE subrate request to the remote device.

     *

     * @return true, if the request is send to the Bluetooth stack.

     * @hide

     */

    @RequiresBluetoothConnectPermission

    @RequiresPermission(BLUETOOTH_CONNECT)

    public boolean bleSubrateRequest(

            int subrateMin,

            int subrateMax,

            int maxLatency,

            int contNumber,

            int supervisionTimeout) {

        if (DBG) {

            Log.d(

                    TAG,

                    "bleSubrateRequest() - subrateMin="

                            + subrateMin

                            + " subrateMax="

                            + (subrateMax)

                            + " maxLatency= "

                            + maxLatency

                            + "contNumber="

                            + contNumber

                            + " supervisionTimeout="

                            + supervisionTimeout);

        }

        if (mService == null || mClientIf == 0) {

            return false;

        }



        try {

            mService.leSubrateRequest(

                    mClientIf,

                    mDevice.getAddress(),

                    subrateMin,

                    subrateMax,

                    maxLatency,

                    contNumber,

                    supervisionTimeout,

                    mAttributionSource);

        } catch (RemoteException e) {

            Log.e(TAG, "", e);

            return false;

        }

        return true;

    }



    /**

     * @deprecated Not supported - please use {@link BluetoothManager#getConnectedDevices(int)} with

     *     {@link BluetoothProfile#GATT} as argument