Merge "Remove A2DP connect logic from settingslib" (2b614b6e) · Commits · e / os / android_frameworks_base

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

+0 −14

Original line number	Diff line number	Diff line
		@@ -133,20 +133,6 @@ public class A2dpProfile implements LocalBluetoothProfile {

		public boolean connect(BluetoothDevice device) {
		if (mService == null) return false;
		int max_connected_devices = mLocalAdapter.getMaxConnectedAudioDevices();
		if (max_connected_devices == 1) {
		// Original behavior: disconnect currently connected device
		List<BluetoothDevice> sinks = getConnectedDevices();
		if (sinks != null) {
		for (BluetoothDevice sink : sinks) {
		if (sink.equals(device)) {
		Log.w(TAG, "Connecting to device " + device + " : disconnect skipped");
		continue;
		}
		mService.disconnect(sink);
		}
		}
		}
		return mService.connect(device);
		}

+0 −4

Original line number	Diff line number	Diff line
		@@ -246,10 +246,6 @@ public class LocalBluetoothAdapter {
		return mAdapter.getRemoteDevice(address);
		}

		public int getMaxConnectedAudioDevices() {
		return mAdapter.getMaxConnectedAudioDevices();
		}

		public List<Integer> getSupportedProfiles() {
		return mAdapter.getSupportedProfiles();
		}