am c8f42fb6: Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread (471de1f5) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/BluetoothDeviceProfileState.java

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -129,10 +129,6 @@ public final class BluetoothDeviceProfileState extends HierarchicalStateMachine
	newState == BluetoothA2dp.STATE_DISCONNECTED) {		newState == BluetoothA2dp.STATE_DISCONNECTED) {
	sendMessage(TRANSITION_TO_STABLE);		sendMessage(TRANSITION_TO_STABLE);
	}		}
	} else if (action.equals(BluetoothDevice.ACTION_ACL_CONNECTED)) {
	Message msg = new Message();
	msg.what = AUTO_CONNECT_PROFILES;
	sendMessageDelayed(msg, AUTO_CONNECT_DELAY);
	} else if (action.equals(BluetoothDevice.ACTION_ACL_DISCONNECTED)) {		} else if (action.equals(BluetoothDevice.ACTION_ACL_DISCONNECTED)) {
	// This is technically not needed, but we can get stuck sometimes.		// This is technically not needed, but we can get stuck sometimes.
	// For example, if incoming A2DP fails, we are not informed by Bluez		// For example, if incoming A2DP fails, we are not informed by Bluez