summaryrefslogtreecommitdiffstats
path: root/packages/SettingsLib
diff options
context:
space:
mode:
authorSanket Padawe <sanketpadawe@google.com>2015-06-01 15:55:30 -0700
committerSanket Padawe <sanketpadawe@google.com>2015-06-01 15:55:30 -0700
commit78c23767ecbb5c43420e5e015caca5c47d4bd45b (patch)
treeeb71b2e67d6e49cc9c948bda21ae58b86021e70e /packages/SettingsLib
parentcf8b3b1c56b5aaaa8552c1bc9bb88c8a1285f99f (diff)
downloadframeworks_base-78c23767ecbb5c43420e5e015caca5c47d4bd45b.zip
frameworks_base-78c23767ecbb5c43420e5e015caca5c47d4bd45b.tar.gz
frameworks_base-78c23767ecbb5c43420e5e015caca5c47d4bd45b.tar.bz2
Fix issue related selecting of "Contact sharing" in BT Settings.
Bug: 20041014 Change-Id: I84b59fdfd82c4bf25965bcb10a15fbff2dfbe721
Diffstat (limited to 'packages/SettingsLib')
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java4
1 files changed, 3 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 7534b8e..b0429ef 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
@@ -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);
+ }
}
}