Merge "Remove the old AVRCP code" am: af3ef2ce71 am: 9b4775300c (8ae71cb1) · Commits · e / os / android_packages_modules_Bluetooth

android/app/jni/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,6 @@ cc_library_shared {
		"com_android_bluetooth_hfpclient.cpp",
		"com_android_bluetooth_a2dp.cpp",
		"com_android_bluetooth_a2dp_sink.cpp",
		"com_android_bluetooth_avrcp.cpp",
		"com_android_bluetooth_avrcp_controller.cpp",
		"com_android_bluetooth_avrcp_target.cpp",
		"com_android_bluetooth_hid_host.cpp",

android/app/jni/com_android_bluetooth_avrcp.cpp

deleted100644 → 0

+0 −1529

File deleted.

Preview size limit exceeded, changes collapsed.

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+0 −6

Original line number	Diff line number	Diff line
		@@ -1306,12 +1306,6 @@ jint JNI_OnLoad(JavaVM* jvm, void* reserved) {
		return JNI_ERR;
		}

		status = android::register_com_android_bluetooth_avrcp(e);
		if (status < 0) {
		ALOGE("jni avrcp target registration failure: %d", status);
		return JNI_ERR;
		}

		status = android::register_com_android_bluetooth_avrcp_target(e);
		if (status < 0) {
		ALOGE("jni new avrcp target registration failure: %d", status);

android/app/src/com/android/bluetooth/a2dp/A2dpService.java

+10 −34

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@ import androidx.annotation.VisibleForTesting;

		import com.android.bluetooth.BluetoothMetricsProto;
		import com.android.bluetooth.Utils;
		import com.android.bluetooth.avrcp.Avrcp;
		import com.android.bluetooth.avrcp.AvrcpTargetService;
		import com.android.bluetooth.btservice.AdapterService;
		import com.android.bluetooth.btservice.MetricsLogger;
		@@ -64,7 +63,6 @@ public class A2dpService extends ProfileService {
		private BluetoothAdapter mAdapter;
		private AdapterService mAdapterService;
		private HandlerThread mStateMachinesThread;
		private Avrcp mAvrcp;

		@VisibleForTesting
		A2dpNativeInterface mA2dpNativeInterface;
		@@ -119,28 +117,25 @@ public class A2dpService extends ProfileService {
		mMaxConnectedAudioDevices = mAdapterService.getMaxConnectedAudioDevices();
		Log.i(TAG, "Max connected audio devices set to " + mMaxConnectedAudioDevices);

		// Step 3: Setup AVRCP
		mAvrcp = Avrcp.make(this);

		// Step 4: Start handler thread for state machines
		// Step 3: Start handler thread for state machines
		mStateMachines.clear();
		mStateMachinesThread = new HandlerThread("A2dpService.StateMachines");
		mStateMachinesThread.start();

		// Step 5: Setup codec config
		// Step 4: Setup codec config
		mA2dpCodecConfig = new A2dpCodecConfig(this, mA2dpNativeInterface);

		// Step 6: Initialize native interface
		// Step 5: Initialize native interface
		mA2dpNativeInterface.init(mMaxConnectedAudioDevices,
		mA2dpCodecConfig.codecConfigPriorities());

		// Step 7: Check if A2DP is in offload mode
		// Step 6: Check if A2DP is in offload mode
		mA2dpOffloadEnabled = mAdapterService.isA2dpOffloadEnabled();
		if (DBG) {
		Log.d(TAG, "A2DP offload flag set to " + mA2dpOffloadEnabled);
		}

		// Step 8: Setup broadcast receivers
		// Step 7: Setup broadcast receivers
		IntentFilter filter = new IntentFilter();
		filter.addAction(BluetoothDevice.ACTION_BOND_STATE_CHANGED);
		mBondStateChangedReceiver = new BondStateChangedReceiver();
		@@ -150,10 +145,10 @@ public class A2dpService extends ProfileService {
		mConnectionStateChangedReceiver = new ConnectionStateChangedReceiver();
		registerReceiver(mConnectionStateChangedReceiver, filter);

		// Step 9: Mark service as started
		// Step 8: Mark service as started
		setA2dpService(this);

		// Step 10: Clear active device
		// Step 9: Clear active device
		setActiveDevice(null);

		return true;
		@@ -202,11 +197,6 @@ public class A2dpService extends ProfileService {
		mStateMachinesThread.quitSafely();
		mStateMachinesThread = null;

		// Step 3: Cleanup AVRCP
		mAvrcp.doQuit();
		mAvrcp.cleanup();
		mAvrcp = null;

		// Step 2: Reset maximum number of connected audio devices
		mMaxConnectedAudioDevices = 1;

		@@ -581,11 +571,12 @@ public class A2dpService extends ProfileService {
		return priority;
		}

		/* Absolute volume implementation */
		public boolean isAvrcpAbsoluteVolumeSupported() {
		return mAvrcp.isAbsoluteVolumeSupported();
		// TODO (apanicke): Add a hook here for the AvrcpTargetService.
		return false;
		}


		public void setAvrcpAbsoluteVolume(int volume) {
		// TODO (apanicke): Instead of using A2DP as a middleman for volume changes, add a binder
		// service to the new AVRCP Profile and have the audio manager use that instead.
		@@ -593,18 +584,6 @@ public class A2dpService extends ProfileService {
		AvrcpTargetService.get().sendVolumeChanged(volume);
		return;
		}

		mAvrcp.setAbsoluteVolume(volume);
		}

		public void setAvrcpAudioState(int state) {
		mAvrcp.setA2dpAudioState(state);
		}

		public void resetAvrcpBlacklist(BluetoothDevice device) {
		if (mAvrcp != null) {
		mAvrcp.resetBlackList(device.getAddress());
		}
		}

		boolean isA2dpPlaying(BluetoothDevice device) {
		@@ -1208,8 +1187,5 @@ public class A2dpService extends ProfileService {
		for (A2dpStateMachine sm : mStateMachines.values()) {
		sm.dump(sb);
		}
		if (mAvrcp != null) {
		mAvrcp.dump(sb);
		}
		}
		}

android/app/src/com/android/bluetooth/a2dp/A2dpStateMachine.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -131,7 +131,6 @@ final class A2dpStateMachine extends StateMachine {
		// Stop if auido is still playing
		log("doQuit: stopped playing " + mDevice);
		mIsPlaying = false;
		mA2dpService.setAvrcpAudioState(BluetoothA2dp.STATE_NOT_PLAYING);
		broadcastAudioState(BluetoothA2dp.STATE_NOT_PLAYING,
		BluetoothA2dp.STATE_PLAYING);
		}
		@@ -159,7 +158,6 @@ final class A2dpStateMachine extends StateMachine {
		if (mIsPlaying) {
		Log.i(TAG, "Disconnected: stopped playing: " + mDevice);
		mIsPlaying = false;
		mA2dpService.setAvrcpAudioState(BluetoothA2dp.STATE_NOT_PLAYING);
		broadcastAudioState(BluetoothA2dp.STATE_NOT_PLAYING,
		BluetoothA2dp.STATE_PLAYING);
		}
		@@ -560,7 +558,6 @@ final class A2dpStateMachine extends StateMachine {
		if (!mIsPlaying) {
		Log.i(TAG, "Connected: started playing: " + mDevice);
		mIsPlaying = true;
		mA2dpService.setAvrcpAudioState(BluetoothA2dp.STATE_PLAYING);
		broadcastAudioState(BluetoothA2dp.STATE_PLAYING,
		BluetoothA2dp.STATE_NOT_PLAYING);
		}
		@@ -572,7 +569,6 @@ final class A2dpStateMachine extends StateMachine {
		if (mIsPlaying) {
		Log.i(TAG, "Connected: stopped playing: " + mDevice);
		mIsPlaying = false;
		mA2dpService.setAvrcpAudioState(BluetoothA2dp.STATE_NOT_PLAYING);
		broadcastAudioState(BluetoothA2dp.STATE_NOT_PLAYING,
		BluetoothA2dp.STATE_PLAYING);
		}