summaryrefslogtreecommitdiffstats
path: root/packages/SettingsLib
diff options
context:
space:
mode:
authorSanket Padawe <sanketpadawe@google.com>2015-06-19 01:13:09 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-19 01:13:09 +0000
commit460a2925945009c5e44b053c7cddadcacc9ae9e9 (patch)
tree772e1f07e5025c4b7406b2d00f639265de6c270d /packages/SettingsLib
parent1594edcea1e8862827410f2542d19c5edb403cbe (diff)
parent30a79ec19064220847f5cdc0e58f83bd4a948930 (diff)
downloadframeworks_base-460a2925945009c5e44b053c7cddadcacc9ae9e9.zip
frameworks_base-460a2925945009c5e44b053c7cddadcacc9ae9e9.tar.gz
frameworks_base-460a2925945009c5e44b053c7cddadcacc9ae9e9.tar.bz2
am 30a79ec1: Merge "Set default PBAP checkbox state to false (checkbox unselected)." into mnc-dev
* commit '30a79ec19064220847f5cdc0e58f83bd4a948930': Set default PBAP checkbox state to false (checkbox unselected).
Diffstat (limited to 'packages/SettingsLib')
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java2
1 files changed, 1 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 b0429ef..249eaa5 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
@@ -808,7 +808,7 @@ 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);
+ setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_REJECTED);
}
}
}