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

Commit 997d5591 authored by Hemant Gupta's avatar Hemant Gupta Committed by android-build-merger
Browse files

Merge "Bluetooth: Add support for PBAP UI preference" am: 045d34ce am: cbfae42c 

am: 3a670c3c

Change-Id: Iac4dc53ca9c5e3ebdd0b68590de729e7c76d919d
parents 174f5e7d 3a670c3c

packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java

+2 −1
Original line number Diff line number Diff line
@@ -135,7 +135,8 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
        if (newProfileState == BluetoothProfile.STATE_CONNECTED) {

            if (profile instanceof MapProfile) {

                profile.setPreferred(mDevice, true);

            } else if (!mProfiles.contains(profile)) {

            }

            if (!mProfiles.contains(profile)) {

                mRemovedProfiles.remove(profile);

                mProfiles.add(profile);

                if (profile instanceof PanProfile &&

packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java

100755 → 100644
+12 −4
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.bluetooth.BluetoothHidHost; 
import android.bluetooth.BluetoothMap;

import android.bluetooth.BluetoothMapClient;

import android.bluetooth.BluetoothPan;

import android.bluetooth.BluetoothPbap;

import android.bluetooth.BluetoothPbapClient;

import android.bluetooth.BluetoothProfile;

import android.bluetooth.BluetoothUuid;
@@ -140,9 +141,11 @@ public class LocalBluetoothProfileManager { 
                    BluetoothMap.ACTION_CONNECTION_STATE_CHANGED);

        }



       //Create PBAP server profile, but do not add it to list of profiles

       // as we do not need to monitor the profile as part of profile list

        //Create PBAP server profile

        if(DEBUG) Log.d(TAG, "Adding local PBAP profile");

        mPbapProfile = new PbapServerProfile(context);

        addProfile(mPbapProfile, PbapServerProfile.NAME,

             BluetoothPbap.ACTION_CONNECTION_STATE_CHANGED);



        if (DEBUG) Log.d(TAG, "LocalBluetoothProfileManager construction complete");

    }
@@ -495,6 +498,13 @@ public class LocalBluetoothProfileManager { 
            mMapProfile.setPreferred(device, true);

        }



        if ((mPbapProfile != null) &&

            (mPbapProfile.getConnectionStatus(device) == BluetoothProfile.STATE_CONNECTED)) {

            profiles.add(mPbapProfile);

            removedProfiles.remove(mPbapProfile);

            mPbapProfile.setPreferred(device, true);

        }



        if (mMapClientProfile != null) {

            profiles.add(mMapClientProfile);

            removedProfiles.remove(mMapClientProfile);
@@ -503,8 +513,6 @@ public class LocalBluetoothProfileManager { 
        if (mUsePbapPce) {

            profiles.add(mPbapClientProfile);

            removedProfiles.remove(mPbapClientProfile);

            profiles.remove(mPbapProfile);

            removedProfiles.add(mPbapProfile);

        }



        if (DEBUG) {