am 04e2cf6: Merge "Make default selection for contact sharing to "Checked"." into mnc-dev

Prem Kumar · Android Git Automerger · commit 482ba3438379 · 2015-08-04T01:00:47.000Z
* commit '04e2cf6bc5167583d686c2a118ec2b50a7b88547':
  Make default selection for contact sharing to "Checked".
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
@@ -808,7 +808,7 @@ private void processPhonebookAccess() {
             // 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);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -808,7 +808,7 @@ private void processPhonebookAccess() {`
`808`	`808`	`// The pairing dialog now warns of phone-book access for paired devices.`
`809`	`809`	`// No separate prompt is displayed after pairing.`
`810`	`810`	`if (getPhonebookPermissionChoice() == CachedBluetoothDevice.ACCESS_UNKNOWN) {`
`811`		`- setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_REJECTED);`
	`811`	`+ setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_ALLOWED);`
`812`	`812`	`}`
`813`	`813`	`}`
`814`	`814`	`}`