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

Commit a4e92ee5 authored by Zach Johnson's avatar Zach Johnson
Browse files

Simplify implementation of getUuids 

Move to binder stub, function is so simple usages
can be converted too.

Bug: 145171640
Test: compile
Change-Id: I898305a6a047b0b176261e4a6d624aa974557cbe
parent 89637428

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

+4 −8
Original line number Diff line number Diff line
@@ -927,7 +927,7 @@ public class AdapterService extends Service { 
     */

    private boolean connectEnabledProfiles(BluetoothDevice device) {

        ParcelUuid[] remoteDeviceUuids = getRemoteUuids(device);

        ParcelUuid[] localDeviceUuids = getUuids();

        ParcelUuid[] localDeviceUuids = mAdapterProperties.getUuids();



        if (mA2dpService != null && isSupported(localDeviceUuids, remoteDeviceUuids,

                BluetoothProfile.A2DP, device)
@@ -1169,7 +1169,7 @@ public class AdapterService extends Service { 


            enforceBluetoothPermission(service);



            return service.getUuids();

            return service.mAdapterProperties.getUuids();

        }



        @Override
@@ -2077,10 +2077,6 @@ public class AdapterService extends Service { 
        return true;

    }



    ParcelUuid[] getUuids() {

        return mAdapterProperties.getUuids();

    }



    public String getName() {

        enforceBluetoothPermission(this);
@@ -2424,7 +2420,7 @@ public class AdapterService extends Service { 


        int numProfilesConnected = 0;

        ParcelUuid[] remoteDeviceUuids = getRemoteUuids(device);

        ParcelUuid[] localDeviceUuids = getUuids();

        ParcelUuid[] localDeviceUuids = mAdapterProperties.getUuids();



        // All profile toggles disabled, so connects all supported profiles

        if (mA2dpService != null && isSupported(localDeviceUuids, remoteDeviceUuids,
@@ -2511,7 +2507,7 @@ public class AdapterService extends Service { 
        }



        ParcelUuid[] remoteDeviceUuids = getRemoteUuids(device);

        ParcelUuid[] localDeviceUuids = getUuids();

        ParcelUuid[] localDeviceUuids = mAdapterProperties.getUuids();



        if (mA2dpService != null && isSupported(localDeviceUuids, remoteDeviceUuids,

                BluetoothProfile.A2DP, device)) {