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

Commit 210aaa43 authored by William Escande's avatar William Escande
Browse files

API fixup isOffloadedTransportDiscoveryDataScanSupported 

Method does not return a boolean and should be name with getxxx instead

Fix: 271247916
Test: atest CtsBluetoothTestCases
Change-Id: Ib91da88a3019dc60885f3c749f4d60c73e14d6db
parent 5643875c

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

+8 −8
Original line number Diff line number Diff line
@@ -4599,29 +4599,29 @@ public class AdapterService extends Service { 


        @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN)

        @Override

        public void isOffloadedTransportDiscoveryDataScanSupported(

        public void getOffloadedTransportDiscoveryDataScanSupported(

                AttributionSource source, SynchronousResultReceiver receiver) {

            try {

                receiver.send(isOffloadedTransportDiscoveryDataScanSupported(source));

                receiver.send(getOffloadedTransportDiscoveryDataScanSupported(source));

            } catch (RuntimeException e) {

                receiver.propagateException(e);

            }

        }



        private int isOffloadedTransportDiscoveryDataScanSupported(

        private int getOffloadedTransportDiscoveryDataScanSupported(

                AttributionSource attributionSource) {

            AdapterService service = getService();

            if (service == null

                    || !callerIsSystemOrActiveOrManagedUser(service, TAG,

                            "isOffloadedTransportDiscoveryDataScanSupported")

                            "getOffloadedTransportDiscoveryDataScanSupported")

                    || !Utils.checkScanPermissionForDataDelivery(

                            service, attributionSource,

                            "isOffloadedTransportDiscoveryDataScanSupported")) {

                            "getOffloadedTransportDiscoveryDataScanSupported")) {

                return BluetoothStatusCodes.ERROR_MISSING_BLUETOOTH_SCAN_PERMISSION;

            }

            enforceBluetoothPrivilegedPermission(service);



            return service.isOffloadedTransportDiscoveryDataScanSupported();

            return service.getOffloadedTransportDiscoveryDataScanSupported();

        }

    }
@@ -5847,9 +5847,9 @@ public class AdapterService extends Service { 


    /**

     * Return if offloaded TDS filter is supported.

     * @return true if supported

     * @return  {@code BluetoothStatusCodes.FEATURE_SUPPORTED} if supported

     */

    public int isOffloadedTransportDiscoveryDataScanSupported() {

    public int getOffloadedTransportDiscoveryDataScanSupported() {

        if (mAdapterProperties.isOffloadedTransportDiscoveryDataScanSupported()) {

            return BluetoothStatusCodes.FEATURE_SUPPORTED;

        }

framework/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -66,13 +66,13 @@ package android.bluetooth { 
    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public long getDiscoveryEndMillis();

    method @Nullable @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public android.bluetooth.le.DistanceMeasurementManager getDistanceMeasurementManager();

    method @NonNull @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public java.util.List<android.bluetooth.BluetoothDevice> getMostRecentlyConnectedDevices();

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_SCAN, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int getOffloadedTransportDiscoveryDataScanSupported();

    method @NonNull @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public android.os.Bundle getPreferredAudioProfiles(@NonNull android.bluetooth.BluetoothDevice);

    method @NonNull @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public java.util.List<java.lang.Integer> getSupportedProfiles();

    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.os.ParcelUuid> getUuidsList();

    method public boolean isBleScanAlwaysAvailable();

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

    method public boolean isLeEnabled();

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_SCAN, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int isOffloadedTransportDiscoveryDataScanSupported();

    method @NonNull public static String nameForState(int);

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

    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);

framework/java/android/bluetooth/BluetoothAdapter.java

+6 −5
Original line number Diff line number Diff line
@@ -5781,12 +5781,13 @@ public final class BluetoothAdapter { 
            BluetoothStatusCodes.ERROR_MISSING_BLUETOOTH_SCAN_PERMISSION,

            BluetoothStatusCodes.FEATURE_NOT_SUPPORTED

    })

    public @interface IsOffloadedTransportDiscoveryDataScanSupportedReturnValues {}

    public @interface GetOffloadedTransportDiscoveryDataScanSupportedReturnValues {}



    /**

     * Check if offloaded transport discovery data scan is supported or not.

     *

     * @return true if chipset supports on-chip tds filter scan

     * @return  {@code BluetoothStatusCodes.FEATURE_SUPPORTED} if chipset supports on-chip tds

     *          filter scan

     * @hide

     */

    @SystemApi
@@ -5795,8 +5796,8 @@ public final class BluetoothAdapter { 
            android.Manifest.permission.BLUETOOTH_SCAN,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

    })

    @IsOffloadedTransportDiscoveryDataScanSupportedReturnValues

    public int isOffloadedTransportDiscoveryDataScanSupported() {

    @GetOffloadedTransportDiscoveryDataScanSupportedReturnValues

    public int getOffloadedTransportDiscoveryDataScanSupported() {

        if (!getLeAccess()) {

            return BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ENABLED;

        }
@@ -5804,7 +5805,7 @@ public final class BluetoothAdapter { 
            mServiceLock.readLock().lock();

            if (mService != null) {

                final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get();

                mService.isOffloadedTransportDiscoveryDataScanSupported(mAttributionSource, recv);

                mService.getOffloadedTransportDiscoveryDataScanSupported(mAttributionSource, recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout())

                        .getValue(BluetoothStatusCodes.ERROR_UNKNOWN);

            }

framework/java/android/bluetooth/le/ScanFilter.java

+2 −2
Original line number Diff line number Diff line
@@ -1025,7 +1025,7 @@ public final class ScanFilter implements Parcelable { 
        /**

         * Set filter information for a transport block in Transport Discovery Service advertisement

         *

         * Use {@link BluetoothAdapter#isOffloadedTransportDiscoveryDataScanSupported()} to check

         * Use {@link BluetoothAdapter#getOffloadedTransportDiscoveryDataScanSupported()} to check

         * whether transport discovery data filtering is supported on this device before calling

         * this method.

         *
@@ -1043,7 +1043,7 @@ public final class ScanFilter implements Parcelable { 
            if (bluetoothAdapter == null) {

                throw new IllegalArgumentException("BluetoothAdapter is null");

            }

            if (bluetoothAdapter.isOffloadedTransportDiscoveryDataScanSupported()

            if (bluetoothAdapter.getOffloadedTransportDiscoveryDataScanSupported()

                    != BluetoothStatusCodes.FEATURE_SUPPORTED) {

                throw new IllegalArgumentException(

                        "Transport Discovery Data filter is not supported");

system/binder/android/bluetooth/IBluetooth.aidl

+1 −1
Original line number Diff line number Diff line
@@ -301,5 +301,5 @@ interface IBluetooth 
    oneway void unregisterBluetoothQualityReportReadyCallback(in IBluetoothQualityReportReadyCallback callback, in AttributionSource attributionSource, in SynchronousResultReceiver receiver);



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

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

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

}