am 95ff67d5: am fa575c5c: am d8e08e55: Merge "Changed PBAP\'s default permission from allow to UNKNOWN." into lmp-dev

* commit '95ff67d500df1a9f9204c590bc3529dcf9f126a2':
  Changed PBAP's default permission from allow to UNKNOWN.
This commit is contained in:
PauloftheWest
2014-08-13 17:26:27 +00:00
committed by Android Git Automerger

View File

@@ -539,7 +539,7 @@ final class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> {
if (bondState == BluetoothDevice.BOND_NONE) {
mProfiles.clear();
mConnectAfterPairing = false; // cancel auto-connect
setPhonebookPermissionChoice(ACCESS_ALLOWED);
setPhonebookPermissionChoice(ACCESS_UNKNOWN);
setMessagePermissionChoice(ACCESS_UNKNOWN);
mPhonebookRejectedTimes = 0;
savePhonebookRejectTimes();