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

Commit 6fdf8c22 authored by Hemant Gupta's avatar Hemant Gupta Committed by android-build-merger
Browse files

Merge "Bluetooth: PBAP not disconnected on disabling contact sharing" am: 84bb2293 am: ff985c6b 

am: 0c75671a

Change-Id: Icc7d90a0e440d3d8f462d61821c602b26f79dbb7
parents 3df19f92 0c75671a

src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java

+2 −5
Original line number Original line Diff line number Diff line
@@ -149,15 +149,12 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll 
     */

     */

    private void disableProfile(LocalBluetoothProfile profile, BluetoothDevice device,

    private void disableProfile(LocalBluetoothProfile profile, BluetoothDevice device,

            SwitchPreference profilePref) {

            SwitchPreference profilePref) {

        if (profile instanceof PbapServerProfile) {

            mCachedDevice.setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_REJECTED);

            // We don't need to do the additional steps below for this profile.

            return;

        }

        mCachedDevice.disconnect(profile);

        mCachedDevice.disconnect(profile);

        profile.setPreferred(device, false);

        profile.setPreferred(device, false);

        if (profile instanceof MapProfile) {

        if (profile instanceof MapProfile) {

            mCachedDevice.setMessagePermissionChoice(BluetoothDevice.ACCESS_REJECTED);

            mCachedDevice.setMessagePermissionChoice(BluetoothDevice.ACCESS_REJECTED);

        } else if (profile instanceof PbapServerProfile) {

            mCachedDevice.setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_REJECTED);

        }

        }

    }

    }