am ca15c039: am 405e895c: Merge "Fix issue related selecting of "Contact sharing" in BT Settings." into mnc-dev

* commit 'ca15c039d064edceb1b9194f30533fc9e679040e':
  Fix issue related selecting of "Contact sharing" in BT Settings.
This commit is contained in:
Sanket Padawe
2015-06-02 14:23:48 +00:00
committed by Android Git Automerger

View File

@@ -807,7 +807,9 @@ public final class CachedBluetoothDevice implements Comparable<CachedBluetoothDe
if (BluetoothUuid.containsAnyUuid(uuids, PbapServerProfile.PBAB_CLIENT_UUIDS)) {
// The pairing dialog now warns of phone-book access for paired devices.
// No separate prompt is displayed after pairing.
setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_ALLOWED);
if (getPhonebookPermissionChoice() == CachedBluetoothDevice.ACCESS_UNKNOWN) {
setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_ALLOWED);
}
}
}