Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[LE Audio] Add try catch for bluetooth device address fail" am: 573367c9b2 am: 1a57d03f98

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2495855

Change-Id: I017d1582be70e98565d685aa6ce04d247434183b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Betty Chang
2023-03-20 10:29:38 +00:00
committed by Automerger Merge Worker
parent 46a35810c6 1a57d03f98
commit b9787615af
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothLeBroadcastMetadata.java
View File

@@ -261,19 +261,21 @@ public class LocalBluetoothLeBroadcastMetadata {
Pattern pattern = Pattern.compile(PATTERN_BT_BROADCAST_METADATA); Pattern pattern = Pattern.compile(PATTERN_BT_BROADCAST_METADATA);
Matcher match = pattern.matcher(qrCodeString); Matcher match = pattern.matcher(qrCodeString);
if (match.find()) { if (match.find()) {
mSourceAddressType = Integer.parseInt(match.group(MATCH_INDEX_ADDRESS_TYPE)); try {
mSourceDevice = BluetoothAdapter.getDefaultAdapter().getRemoteDevice( mSourceAddressType = Integer.parseInt(match.group(MATCH_INDEX_ADDRESS_TYPE));
mSourceDevice = BluetoothAdapter.getDefaultAdapter().getRemoteDevice(
match.group(MATCH_INDEX_DEVICE)); match.group(MATCH_INDEX_DEVICE));
mSourceAdvertisingSid = Integer.parseInt(match.group(MATCH_INDEX_ADVERTISING_SID)); mSourceAdvertisingSid = Integer.parseInt(
mBroadcastId = Integer.parseInt(match.group(MATCH_INDEX_BROADCAST_ID)); match.group(MATCH_INDEX_ADVERTISING_SID));
mPaSyncInterval = Integer.parseInt(match.group(MATCH_INDEX_SYNC_INTERVAL)); mBroadcastId = Integer.parseInt(match.group(MATCH_INDEX_BROADCAST_ID));
mIsEncrypted = Boolean.valueOf(match.group(MATCH_INDEX_IS_ENCRYPTED)); mPaSyncInterval = Integer.parseInt(match.group(MATCH_INDEX_SYNC_INTERVAL));
mBroadcastCode = match.group(MATCH_INDEX_BROADCAST_CODE).getBytes(); mIsEncrypted = Boolean.valueOf(match.group(MATCH_INDEX_IS_ENCRYPTED));
mPresentationDelayMicros = mBroadcastCode = match.group(MATCH_INDEX_BROADCAST_CODE).getBytes();
Integer.parseInt(match.group(MATCH_INDEX_PRESENTATION_DELAY)); mPresentationDelayMicros =
Integer.parseInt(match.group(MATCH_INDEX_PRESENTATION_DELAY));
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "Converted qrCodeString result: " Log.d(TAG, "Converted qrCodeString result: "
+ " ,Type = " + mSourceAddressType + " ,Type = " + mSourceAddressType
+ " ,Device = " + mSourceDevice + " ,Device = " + mSourceDevice
+ " ,AdSid = " + mSourceAdvertisingSid + " ,AdSid = " + mSourceAdvertisingSid
@@ -282,11 +284,11 @@ public class LocalBluetoothLeBroadcastMetadata {
+ " ,encrypted = " + mIsEncrypted + " ,encrypted = " + mIsEncrypted
+ " ,BroadcastCode = " + Arrays.toString(mBroadcastCode) + " ,BroadcastCode = " + Arrays.toString(mBroadcastCode)
+ " ,delay = " + mPresentationDelayMicros); + " ,delay = " + mPresentationDelayMicros);
} }
mSubgroup = convertToSubgroup(match.group(MATCH_INDEX_SUBGROUPS)); mSubgroup = convertToSubgroup(match.group(MATCH_INDEX_SUBGROUPS));
return new BluetoothLeBroadcastMetadata.Builder() return new BluetoothLeBroadcastMetadata.Builder()
.setSourceDevice(mSourceDevice, mSourceAddressType) .setSourceDevice(mSourceDevice, mSourceAddressType)
.setSourceAdvertisingSid(mSourceAdvertisingSid) .setSourceAdvertisingSid(mSourceAdvertisingSid)
.setBroadcastId(mBroadcastId) .setBroadcastId(mBroadcastId)
@@ -296,10 +298,13 @@ public class LocalBluetoothLeBroadcastMetadata {
.setPresentationDelayMicros(mPresentationDelayMicros) .setPresentationDelayMicros(mPresentationDelayMicros)
.addSubgroup(mSubgroup) .addSubgroup(mSubgroup)
.build(); .build();
} catch (IllegalArgumentException e) {
Log.d(TAG, "IllegalArgumentException when convert : " + e);
return null;
}
} else { } else {
if (DEBUG) { if (DEBUG) {
Log.d(TAG, Log.d(TAG, "The match fail, can not convert it to BluetoothLeBroadcastMetadata.");
"The match fail, can not convert it to BluetoothLeBroadcastMetadata.");
} }
return null; return null;
} }