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

Commit 6f3b2c5b authored by Ganesh Ganapathi Batta's avatar Ganesh Ganapathi Batta
Browse files

Set profile priorities only after SDP completion 

Set the profile priorities only after SDP completion.
Perform lookup and set profile priorities to ON, only for
profiles supported by bonded BT device.
CR BLTH02405767

Change-Id: I83fe6e772993b7c41c6a86f504d2b09ea38b2356

Conflicts:
	src/com/android/bluetooth/btservice/AdapterService.java
parent cb7fc581

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

100755 → 100644
+56 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.app.Service; 
import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothProfile;

import android.bluetooth.BluetoothUuid;

import android.bluetooth.IBluetooth;

import android.bluetooth.IBluetoothCallback;

import android.bluetooth.IBluetoothManager;
@@ -161,6 +162,47 @@ public class AdapterService extends Service { 
        mHandler.sendMessage(m);

    }



    public void initProfilePriorities(BluetoothDevice device, ParcelUuid[] mUuids) {

        if(mUuids == null) return;

        Message m = mHandler.obtainMessage(MESSAGE_PROFILE_INIT_PRIORITIES);

        m.obj = device;

        m.arg1 = mUuids.length;

        Bundle b = new Bundle(1);

        for(int i=0; i<mUuids.length; i++) {

            b.putParcelable("uuids" + i, mUuids[i]);

        }

        m.setData(b);

        mHandler.sendMessage(m);

    }



    private void processInitProfilePriorities (BluetoothDevice device, ParcelUuid[] uuids){

        HidService hidService = HidService.getHidService();

        A2dpService a2dpService = A2dpService.getA2dpService();

        HeadsetService headsetService = HeadsetService.getHeadsetService();



        // Set profile priorities only for the profiles discovered on the remote device.

        // This avoids needless auto-connect attempts to profiles non-existent on the remote device

        if ((hidService != null) &&

            (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.Hid)) &&

            (hidService.getPriority(device) == BluetoothProfile.PRIORITY_UNDEFINED)){

            hidService.setPriority(device,BluetoothProfile.PRIORITY_ON);

        }



        if ((a2dpService != null) &&

            (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.AudioSink) ||

                    (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.AdvAudioDist)) &&

            (a2dpService.getPriority(device) == BluetoothProfile.PRIORITY_UNDEFINED))){

            a2dpService.setPriority(device,BluetoothProfile.PRIORITY_ON);

        }



        if ((headsetService != null) &&

            ((BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.HSP) ||

                    BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.Handsfree)) &&

            (headsetService.getPriority(device) == BluetoothProfile.PRIORITY_UNDEFINED))){

            headsetService.setPriority(device,BluetoothProfile.PRIORITY_ON);

        }

    }



    private void processProfileStateChanged(BluetoothDevice device, int profileId, int newState, int prevState) {

        if (((profileId == BluetoothProfile.A2DP) ||(profileId == BluetoothProfile.HEADSET)) &&

             (newState == BluetoothProfile.STATE_CONNECTED)){
@@ -396,6 +438,7 @@ public class AdapterService extends Service { 
    private static final int MESSAGE_PROFILE_SERVICE_STATE_CHANGED =1;

    private static final int MESSAGE_PROFILE_CONNECTION_STATE_CHANGED=20;

    private static final int MESSAGE_CONNECT_OTHER_PROFILES = 30;

    private static final int MESSAGE_PROFILE_INIT_PRIORITIES=40;

    private static final int CONNECT_OTHER_PROFILES_TIMEOUT= 6000;



    private final Handler mHandler = new Handler() {
@@ -414,6 +457,16 @@ public class AdapterService extends Service { 
                    processProfileStateChanged((BluetoothDevice) msg.obj, msg.arg1,msg.arg2, msg.getData().getInt("prevState",BluetoothAdapter.ERROR));

                }

                    break;

                case MESSAGE_PROFILE_INIT_PRIORITIES: {

                    if (DBG) debugLog( "MESSAGE_PROFILE_INIT_PRIORITIES");

                    ParcelUuid[] mUuids = new ParcelUuid[msg.arg1];

                    for(int i=0; i<mUuids.length; i++) {

                        mUuids[i] = msg.getData().getParcelable("uuids" + i);

                    }

                    processInitProfilePriorities((BluetoothDevice) msg.obj,

                            mUuids);

                }

                    break;

                case MESSAGE_CONNECT_OTHER_PROFILES: {

                    if (DBG) debugLog( "MESSAGE_CONNECT_OTHER_PROFILES");

                    processConnectOtherProfiles((BluetoothDevice) msg.obj,msg.arg1);
@@ -1130,6 +1183,7 @@ public class AdapterService extends Service { 
        }

        HeadsetService  hsService = HeadsetService.getHeadsetService();

        A2dpService a2dpService = A2dpService.getA2dpService();



        // if any of the profile service is  null, second profile connection not required

        if ((hsService == null) ||(a2dpService == null )){

            return;

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

+4 −1
Original line number Diff line number Diff line
@@ -191,8 +191,11 @@ final class BondStateMachine extends StateMachine { 
                        }

                        else if (newState == BluetoothDevice.BOND_BONDED)

                        {

                           // Do not set profile priority

                           // Profile priority should be set after SDP completion



                           // Restore the profile priorty settings

                           setProfilePriorty(dev);

                           //setProfilePriorty(dev);

                        }

                    }

                    else if(!mDevices.contains(dev))

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

+1 −0
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ final class RemoteDevices { 
        Intent intent = new Intent(BluetoothDevice.ACTION_UUID);

        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);

        intent.putExtra(BluetoothDevice.EXTRA_UUID, prop == null? null: prop.mUuids);

        mAdapterService.initProfilePriorities(device, prop.mUuids);

        mAdapterService.sendBroadcast(intent, AdapterService.BLUETOOTH_ADMIN_PERM);



        //Remove the outstanding UUID request