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

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

Merge \"PBAP: Allow wearable handsfree device for PBAP Access\" into nyc-mr1-dev 

am: 7f44cdd3

Change-Id: I59c9d97c69c7652e9292beeec20f265bf7a6a41e
parents 2194bf52 7f44cdd3

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

+3 −1
Original line number Diff line number Diff line
@@ -809,7 +809,9 @@ public final class CachedBluetoothDevice implements Comparable<CachedBluetoothDe 
            // No separate prompt is displayed after pairing.

            if (getPhonebookPermissionChoice() == CachedBluetoothDevice.ACCESS_UNKNOWN) {

                if (mDevice.getBluetoothClass().getDeviceClass()

                        == BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE) {

                        == BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE ||

                    mDevice.getBluetoothClass().getDeviceClass()

                        == BluetoothClass.Device.AUDIO_VIDEO_WEARABLE_HEADSET) {

                    setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_ALLOWED);

                } else {

                    setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_REJECTED);