Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2016-06-29 23:59:08 +00:00
committed by Android (Google) Code Review
parent bc8e0052fd b8d267a4ed
commit 7f44cdd34e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
View File

@@ -809,7 +809,9 @@ public final class CachedBluetoothDevice implements Comparable<CachedBluetoothDe
// No separate prompt is displayed after pairing. // No separate prompt is displayed after pairing.
if (getPhonebookPermissionChoice() == CachedBluetoothDevice.ACCESS_UNKNOWN) { if (getPhonebookPermissionChoice() == CachedBluetoothDevice.ACCESS_UNKNOWN) {
if (mDevice.getBluetoothClass().getDeviceClass() 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); setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_ALLOWED);
} else { } else {
setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_REJECTED); setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_REJECTED);