Merge "Fix issue related selecting of "Contact sharing" in BT Settings." into mnc-dev (405e895c) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -807,9 +807,11 @@ public final class CachedBluetoothDevice implements Comparable<CachedBluetoothDe
		if (BluetoothUuid.containsAnyUuid(uuids, PbapServerProfile.PBAB_CLIENT_UUIDS)) {
		// 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_ALLOWED);
		}
		}
		}

		public int getMaxConnectionState() {
		int maxState = BluetoothProfile.STATE_DISCONNECTED;