Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c26340e7 authored Dec 22, 2022 by Jakub Pawłowski Committed by Automerger Merge Worker Dec 22, 2022

Merge "le_audio: Set proper frame for XX_1 BAP configurations" am: f23c2816 am: eaa50b27

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2334002

Change-Id: I022e16e65a531c5aa0c789a12a3b9a0f12306cdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents ccbe6e3e eaa50b27

system/bta/le_audio/audio_set_configurations.json

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -4815,7 +4815,7 @@
	"type": 2,		"type": 2,
	"compound_value": {		"compound_value": {
	"value": [		"value": [
	1		0
	]		]
	}		}
	},		},
	@@ -5087,7 +5087,7 @@
	"type": 2,		"type": 2,
	"compound_value": {		"compound_value": {
	"value": [		"value": [
	1		0
	]		]
	}		}
	},		},
	@@ -5359,7 +5359,7 @@
	"type": 2,		"type": 2,
	"compound_value": {		"compound_value": {
	"value": [		"value": [
	1		0
	]		]
	}		}
	},		},
	@@ -5631,7 +5631,7 @@
	"type": 2,		"type": 2,
	"compound_value": {		"compound_value": {
	"value": [		"value": [
	1		0
	]		]
	}		}
	},		},
	@@ -5699,7 +5699,7 @@
	"type": 2,		"type": 2,
	"compound_value": {		"compound_value": {
	"value": [		"value": [
	1		0
	]		]
	}		}
	},		},
	@@ -5767,7 +5767,7 @@
	"type": 2,		"type": 2,
	"compound_value": {		"compound_value": {
	"value": [		"value": [
	1		0
	]		]
	}		}
	},		},
	@@ -5835,7 +5835,7 @@
	"type": 2,		"type": 2,
	"compound_value": {		"compound_value": {
	"value": [		"value": [
	1		0
	]		]
	}		}
	},		},

system/bta/le_audio/devices_test.cc

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -223,8 +223,9 @@ bool IsLc3SettingSupported(LeAudioContextType context_type, Lc3SettingId id) {
	case LeAudioContextType::EMERGENCYALARM:		case LeAudioContextType::EMERGENCYALARM:
	case LeAudioContextType::UNSPECIFIED:		case LeAudioContextType::UNSPECIFIED:
	if (id == Lc3SettingId::LC3_16_1 \|\| id == Lc3SettingId::LC3_16_2 \|\|		if (id == Lc3SettingId::LC3_16_1 \|\| id == Lc3SettingId::LC3_16_2 \|\|
	id == Lc3SettingId::LC3_48_4 \|\| id == Lc3SettingId::LC3_48_2 \|\|		id == Lc3SettingId::LC3_48_4 \|\| id == Lc3SettingId::LC3_48_1 \|\|
	id == Lc3SettingId::LC3_VND_1 \|\| id == Lc3SettingId::LC3_24_2)		id == Lc3SettingId::LC3_48_2 \|\| id == Lc3SettingId::LC3_VND_1 \|\|
			id == Lc3SettingId::LC3_24_2)
	return true;		return true;

	break;		break;