Snap for 12260156 from 99b139bfd1e55327953bccf0893def8d1b7cf16e to 24Q4-release (777b6fd0) · Commits · e / os / android_packages_modules_Bluetooth

android/app/res/values-kn/strings_sap.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,6 +5,6 @@
		<string name="bluetooth_sap_notif_ticker" msgid="7295825445933648498">"ಬ್ಲೂಟೂತ್ ಸಿಮ್ ಆ್ಯಕ್ಸೆಸ್"</string>
		<string name="bluetooth_sap_notif_message" msgid="1004269289836361678">"ಕಡಿತಗೊಳಿಸಲು ಕ್ಲೈಂಟ್ ಅನ್ನು ವಿನಂತಿಸುವುದೇ?"</string>
		<string name="bluetooth_sap_notif_disconnecting" msgid="6041257463440623400">"ಕಡಿತಗೊಳಿಸಲು ಕ್ಲೈಂಟ್‌ಗೆ ನಿರೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ"</string>
		<string name="bluetooth_sap_notif_disconnect_button" msgid="3059012556387692616">"ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಿ"</string>
		<string name="bluetooth_sap_notif_disconnect_button" msgid="3059012556387692616">"ಡಿಸ್‌ಕನೆಕ್ಟ್ ಮಾಡಿ"</string>
		<string name="bluetooth_sap_notif_force_disconnect_button" msgid="2239425242376623998">"ಒತ್ತಾಯದ ಕಡಿತಗೊಳಿಸುವಿಕೆ"</string>
		</resources>

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,6 +5,6 @@
		<string name="bluetooth_sap_notif_ticker" msgid="7295825445933648498">"ବ୍ଲୁଟୂଥ୍‍‌ SIM ଆକ୍ସେସ୍‌"</string>
		<string name="bluetooth_sap_notif_message" msgid="1004269289836361678">"ବିଚ୍ଛିନ୍ନ କରିବା ପାଇଁ କ୍ଲାଏଣ୍ଟଙ୍କୁ ଅନୁରୋଧ କରିବେ?"</string>
		<string name="bluetooth_sap_notif_disconnecting" msgid="6041257463440623400">"ବିଚ୍ଛିନ୍ନ କରିବା ପାଇଁ କ୍ଲାଏଣ୍ଟଙ୍କ ଅପେକ୍ଷା କରାଯାଉଛି"</string>
		<string name="bluetooth_sap_notif_disconnect_button" msgid="3059012556387692616">"ବିଚ୍ଛିନ୍ନ କରନ୍ତୁ"</string>
		<string name="bluetooth_sap_notif_disconnect_button" msgid="3059012556387692616">"ଡିସକନେକ୍ଟ କରନ୍ତୁ"</string>
		<string name="bluetooth_sap_notif_force_disconnect_button" msgid="2239425242376623998">"ବିଚ୍ଛିନ୍ନ କରିବା ପାଇଁ ବାଧ୍ୟ କରନ୍ତୁ"</string>
		</resources>

+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);
		}
		}

+21 −16

Original line number	Diff line number	Diff line
		@@ -3363,12 +3363,16 @@ public class BassClientService extends ProfileService {
		return isReceivingExternalBroadcast;
		}

		/** Get the active broadcast sink devices receiving broadcast stream */
		public List<BluetoothDevice> getActiveBroadcastSinks() {
		/** Get sink devices synced to the broadcasts */
		public List<BluetoothDevice> getSyncedBroadcastSinks() {
		List<BluetoothDevice> activeSinks = new ArrayList<>();

		for (BluetoothDevice device : getConnectedDevices()) {
		// Check if any device's source in active sync state
		if (leaudioBigDependsOnAudioState()) {
		if (!getAllSources(device).isEmpty()) {
		activeSinks.add(device);
		}
		} else {
		if (getAllSources(device).stream()
		.anyMatch(
		receiveState ->
		@@ -3384,6 +3388,7 @@ public class BassClientService extends ProfileService {
		activeSinks.add(device);
		}
		}
		}
		return activeSinks;
		}

+5 −3

Original line number	Diff line number	Diff line
		@@ -19,6 +19,8 @@ package com.android.bluetooth.bass_client;
		import static android.Manifest.permission.BLUETOOTH_CONNECT;
		import static android.Manifest.permission.BLUETOOTH_PRIVILEGED;

		import static com.android.bluetooth.flags.Flags.leaudioBigDependsOnAudioState;

		import android.annotation.Nullable;
		import android.annotation.SuppressLint;
		import android.bluetooth.BluetoothAdapter;
		@@ -785,11 +787,11 @@ public class BassClientStateMachine extends StateMachine {

		private void checkAndUpdateBroadcastCode(BluetoothLeBroadcastReceiveState recvState) {
		log("checkAndUpdateBroadcastCode");
		// non colocated case, Broadcast PIN should have been updated from lyaer
		// If there is pending one process it Now
		// Whenever receive state indicated code requested, assistant should set the broadcast code
		// Valid code will be checked later in convertRecvStateToSetBroadcastCodeByteArray
		if (recvState.getBigEncryptionState()
		== BluetoothLeBroadcastReceiveState.BIG_ENCRYPTION_STATE_CODE_REQUIRED
		&& mSetBroadcastCodePending) {
		&& (leaudioBigDependsOnAudioState() \|\| mSetBroadcastCodePending)) {
		log("Update the Broadcast now");
		if (mSetBroadcastPINMetadata != null) {
		setCurrentBroadcastMetadata(recvState.getSourceId(), mSetBroadcastPINMetadata);