diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-01-05 11:31:46 -0800 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-01-05 11:31:46 -0800 |
| commit | f51adf34bbd95dd991f070459f7ea9e88069299b (patch) | |
| tree | 024a83557cdf709cbc9c880779927449be320d3b /packages/SettingsLib/src | |
| parent | a7881ec167946916c8cc5dfaae9d3cf16802179a (diff) | |
| parent | 48b716a9b40f9b108704a46c8c4e3e303531e33b (diff) | |
| download | frameworks_base-f51adf34bbd95dd991f070459f7ea9e88069299b.zip frameworks_base-f51adf34bbd95dd991f070459f7ea9e88069299b.tar.gz frameworks_base-f51adf34bbd95dd991f070459f7ea9e88069299b.tar.bz2 | |
Merge tag 'android-6.0.1_r10' into HEAD
Ticket: CYNGNOS-1404
Android 6.0.1 release 10
Diffstat (limited to 'packages/SettingsLib/src')
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java index 60bb472..f7b1cee 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java @@ -834,7 +834,12 @@ public final class CachedBluetoothDevice implements Comparable<CachedBluetoothDe // The pairing dialog now warns of phone-book access for paired devices. // No separate prompt is displayed after pairing. if (getPhonebookPermissionChoice() == CachedBluetoothDevice.ACCESS_UNKNOWN) { - setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_ALLOWED); + if (mDevice.getBluetoothClass().getDeviceClass() + == BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE) { + setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_ALLOWED); + } else { + setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_REJECTED); + } } } } |