Merge "Changed PBAP's default permission from allow to UNKNOWN." into lmp-dev

This commit is contained in:
PauloftheWest
2014-08-13 17:12:35 +00:00
committed by Android (Google) Code Review

View File

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