summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Prem Kumar <premk@google.com> 2015-08-04 01:09:20 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-08-04 01:09:20 +0000
commit54c7ddbccd71c387c75deb36777b4aede8f226a1 (patch)
tree5b8ae2d76460ff94e813c7d703947451ae272e7f
parent26e11906781234e5a95bf536f1049c58c244a924 (diff)
parent482ba34383796d87e4832ace98b0bb1934c8ef72 (diff)
am 482ba343: am 04e2cf6b: Merge "Make default selection for contact sharing to "Checked"." into mnc-dev
* commit '482ba34383796d87e4832ace98b0bb1934c8ef72': Make default selection for contact sharing to "Checked".
-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 249eaa5d44d3..b0429ef43cf9 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);
}
}
}