Merge "Add logs and prevent addressed player update when browsing refactor is... (6414d0dd) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/audio_util/MediaPlayerList.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -419,6 +419,9 @@ public class MediaPlayerList {
		if (mMediaPlayerIds.containsValue(playerId)) {
		mAddressedPlayerId = playerId;
		sendFolderUpdate(false, true, false);
		Log.d(TAG, "setAddressedPlayer to: " + mAddressedPlayerId);
		} else {
		Log.d(TAG, "setAddressedPlayer not updated: " + mAddressedPlayerId);
		}
		return mAddressedPlayerId;
		}
		@@ -984,11 +987,13 @@ public class MediaPlayerList {

		if (Utils.isPtsTestMode()) {
		sendFolderUpdate(true, true, false);
		} else if (Flags.setAddressedPlayer()) {
		} else if (Flags.setAddressedPlayer() && Flags.browsingRefactor()) {
		// If the browsing refactor flag is not active, addressed player should always be 0.
		// If the new active player has been set by Addressed player key event
		// We don't send an addressed player update.
		if (mActivePlayerId != mAddressedPlayerId) {
		mAddressedPlayerId = mActivePlayerId;
		Log.d(TAG, "setActivePlayer AddressedPlayer changed to " + mAddressedPlayerId);
		sendFolderUpdate(false, true, false);
		}
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -902,6 +902,7 @@ void Device::HandlePlayItem(uint8_t label, std::shared_ptr<PlayItemRequest> pkt)
		void Device::HandleSetAddressedPlayer(uint8_t label, std::shared_ptr<SetAddressedPlayerRequest> pkt,
		uint16_t curr_player) {
		log::verbose("PlayerId={}", pkt->GetPlayerId());
		log::verbose("curr_player={}", curr_player);

		if (curr_player != pkt->GetPlayerId()) {
		log::verbose("Reject invalid addressed player ID");