summaryrefslogtreecommitdiffstats
path: root/packages/SettingsLib/src
diff options
context:
space:
mode:
authorPrem Kumar <premk@google.com>2015-08-04 00:41:46 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-04 00:41:46 +0000
commit04e2cf6bc5167583d686c2a118ec2b50a7b88547 (patch)
treec04d2bc460bdb993c964a6c321f324eeb2e2c789 /packages/SettingsLib/src
parent911bd0d3a587a9a58e2bc1cf59615b039ea0e5b2 (diff)
parent9debd5106e14ecb5f31413b0c5991a5f723c7cfc (diff)
downloadframeworks_base-04e2cf6bc5167583d686c2a118ec2b50a7b88547.zip
frameworks_base-04e2cf6bc5167583d686c2a118ec2b50a7b88547.tar.gz
frameworks_base-04e2cf6bc5167583d686c2a118ec2b50a7b88547.tar.bz2
Merge "Make default selection for contact sharing to "Checked"." into mnc-dev
Diffstat (limited to 'packages/SettingsLib/src')
-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 249eaa5..b0429ef 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_REJECTED);
+ setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_ALLOWED);
}
}
}