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

Merge "Prevent create bond for null MAC address" am: b0c01df940 am: 8d313940b0

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

Change-Id: I42b68e9ddfad158e2b091ca60f57781081058913
This commit is contained in:
Jakub Pawlowski
2021-07-28 18:28:35 +00:00
committed by Automerger Merge Worker
parent ae50161de8 8d313940b0
commit 982531f1dd
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/bluetooth/BluetoothDevice.java
View File

@@ -1096,6 +1096,8 @@ public final class BluetoothDevice implements Parcelable, Attributable {
/** Address is either resolvable, non-resolvable or static. */
public static final int ADDRESS_TYPE_RANDOM = 1;
private static final String NULL_MAC_ADDRESS = "00:00:00:00:00:00";
/**
* Lazy initialization. Guaranteed final after first object constructed, or
* getService() called.
@@ -1493,6 +1495,10 @@ public final class BluetoothDevice implements Parcelable, Attributable {
Log.w(TAG, "BT not enabled, createBondOutOfBand failed");
return false;
}
if (NULL_MAC_ADDRESS.equals(mAddress)) {
Log.e(TAG, "Unable to create bond, invalid address " + mAddress);
return false;
}
try {
return service.createBond(
this, transport, remoteP192Data, remoteP256Data, mAttributionSource);