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

Commit 0c75671a 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

Change-Id: I9c2c99a0f3999c550195b4ed7eed5a31caea9d2a
parents 6136194c ff985c6b

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

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

    private void disableProfile(LocalBluetoothProfile profile, BluetoothDevice device,

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

        profile.setPreferred(device, false);

        if (profile instanceof MapProfile) {

            mCachedDevice.setMessagePermissionChoice(BluetoothDevice.ACCESS_REJECTED);

        } else if (profile instanceof PbapServerProfile) {

            mCachedDevice.setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_REJECTED);

        }

    }