summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxiaowang <quic_xiaowang@quicinc.com>2023-07-19 17:07:15 +0800
committerxiaowang <quic_xiaowang@quicinc.com>2023-08-25 11:00:36 +0800
commitb20e149697948ed1a2cb642183d87c012dd8db3a (patch)
treebaf89c97303185b06a39260b48416995978828ba
parent37a10c6f8e4b7f92acdeb0602c0396146df35095 (diff)
[LeAudio] Enable regex dotall mode for Metadata
CRs-Fixed: 3558573 Change-Id: I55668c1602b56596091a30d4e8faa68b8c72f1c9
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothLeBroadcastMetadata.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothLeBroadcastMetadata.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothLeBroadcastMetadata.java
index a65648c38d42..d7393abdafa5 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothLeBroadcastMetadata.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothLeBroadcastMetadata.java
@@ -259,7 +259,7 @@ public class LocalBluetoothLeBroadcastMetadata {
Log.d(TAG, "Convert " + qrCodeString + "to BluetoothLeBroadcastMetadata");
}
- Pattern pattern = Pattern.compile(PATTERN_BT_BROADCAST_METADATA);
+ Pattern pattern = Pattern.compile(PATTERN_BT_BROADCAST_METADATA, Pattern.DOTALL);
Matcher match = pattern.matcher(qrCodeString);
if (match.find()) {
mSourceAddressType = Integer.parseInt(match.group(MATCH_INDEX_ADDRESS_TYPE));
@@ -319,7 +319,7 @@ public class LocalBluetoothLeBroadcastMetadata {
if (DEBUG) {
Log.d(TAG, "Convert " + subgroupString + "to BluetoothLeBroadcastSubgroup");
}
- Pattern pattern = Pattern.compile(PATTERN_BT_SUBGROUP);
+ Pattern pattern = Pattern.compile(PATTERN_BT_SUBGROUP, Pattern.DOTALL);
Matcher match = pattern.matcher(subgroupString);
if (match.find()) {
mCodecId = Integer.parseInt(match.group(MATCH_INDEX_CODEC_ID));
@@ -354,7 +354,7 @@ public class LocalBluetoothLeBroadcastMetadata {
Log.d(TAG,
"Convert " + configMetadataString + "to BluetoothLeAudioCodecConfigMetadata");
}
- Pattern pattern = Pattern.compile(PATTERN_REGEX);
+ Pattern pattern = Pattern.compile(PATTERN_REGEX, Pattern.DOTALL);
Matcher match = pattern.matcher(configMetadataString);
ArrayList<String> resultList = new ArrayList<>();
while (match.find()) {
@@ -384,7 +384,7 @@ public class LocalBluetoothLeBroadcastMetadata {
if (DEBUG) {
Log.d(TAG, "Convert " + contentMetadataString + "to BluetoothLeAudioContentMetadata");
}
- Pattern pattern = Pattern.compile(PATTERN_REGEX);
+ Pattern pattern = Pattern.compile(PATTERN_REGEX, Pattern.DOTALL);
Matcher match = pattern.matcher(contentMetadataString);
ArrayList<String> resultList = new ArrayList<>();
while (match.find()) {
@@ -425,7 +425,7 @@ public class LocalBluetoothLeBroadcastMetadata {
if (DEBUG) {
Log.d(TAG, "Convert " + channelString + "to BluetoothLeBroadcastChannel");
}
- Pattern pattern = Pattern.compile(PATTERN_BT_CHANNEL);
+ Pattern pattern = Pattern.compile(PATTERN_BT_CHANNEL, Pattern.DOTALL);
Matcher match = pattern.matcher(channelString);
Map<Integer, BluetoothLeAudioCodecConfigMetadata> channel =
new HashMap<Integer, BluetoothLeAudioCodecConfigMetadata>();