diff options
| author | Prem Kumar <premk@google.com> | 2015-08-04 01:18:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-04 01:18:12 +0000 |
| commit | fca292a7ac5fc7a57ead3a6d38dc2b113e59da76 (patch) | |
| tree | 9dc1fb2084465577d1b1893117191c79bd9d2871 /packages/SettingsLib | |
| parent | 025432e1dcf45e13c138622d365a87be517bb628 (diff) | |
| parent | 54c7ddbccd71c387c75deb36777b4aede8f226a1 (diff) | |
| download | frameworks_base-fca292a7ac5fc7a57ead3a6d38dc2b113e59da76.zip frameworks_base-fca292a7ac5fc7a57ead3a6d38dc2b113e59da76.tar.gz frameworks_base-fca292a7ac5fc7a57ead3a6d38dc2b113e59da76.tar.bz2 | |
am 54c7ddbc: am 482ba343: am 04e2cf6b: Merge "Make default selection for contact sharing to "Checked"." into mnc-dev
* commit '54c7ddbccd71c387c75deb36777b4aede8f226a1':
Make default selection for contact sharing to "Checked".
Diffstat (limited to 'packages/SettingsLib')
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java | 2 |
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); } } } |