diff options
| author | mosimchah <mosimchah@gmail.com> | 2019-11-22 08:52:12 -0500 |
|---|---|---|
| committer | mosimchah <mosimchah@gmail.com> | 2019-11-22 08:52:12 -0500 |
| commit | 58de0c81d4bc550dc9308a8c1163ac2bb66db77c (patch) | |
| tree | 3053a4d906d8d4f0c2869a6ebea509cb95d515db | |
| parent | 79944c5f4dffd018d6b86c1fc6505f60bf789368 (diff) | |
| parent | fbdb52d5087cb88f4a5d54e59a48a02620ebf2dc (diff) | |
Merge tag 'android-9.0.0_r50' of https://android.googlesource.com/platform/packages/apps/Bluetooth into HEADp9.0
Android 9.0.0 release 50
* tag 'android-9.0.0_r50' of https://android.googlesource.com/platform/packages/apps/Bluetooth:
DO NOT MERGE: AdapterService: Check the PIN code length before using
DO NOT MERGE Separate SDP procedure from bonding state (2/2)
Revert "DO NOT MERGE Separate SDP procedure from bonding state (2/2)"
DO NOT MERGE Separate SDP procedure from bonding state (2/2)
Revert "DO NOT MERGE Separate SDP procedure from bonding state (2/2)"
DO NOT MERGE Separate SDP procedure from bonding state (2/2)
Change-Id: I833ce5c3497c373ebf444db21a3552568e5bf713
| -rw-r--r-- | src/com/android/bluetooth/btservice/AdapterService.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/com/android/bluetooth/btservice/AdapterService.java b/src/com/android/bluetooth/btservice/AdapterService.java index 9d8cde98..8a4c8567 100644 --- a/src/com/android/bluetooth/btservice/AdapterService.java +++ b/src/com/android/bluetooth/btservice/AdapterService.java @@ -1989,6 +1989,12 @@ public class AdapterService extends Service { return false; } + if (pinCode.length != len) { + android.util.EventLog.writeEvent(0x534e4554, "139287605", -1, + "PIN code length mismatch"); + return false; + } + byte[] addr = Utils.getBytesFromAddress(device.getAddress()); return pinReplyNative(addr, accept, len, pinCode); } @@ -2000,6 +2006,12 @@ public class AdapterService extends Service { return false; } + if (passkey.length != len) { + android.util.EventLog.writeEvent(0x534e4554, "139287605", -1, + "Passkey length mismatch"); + return false; + } + byte[] addr = Utils.getBytesFromAddress(device.getAddress()); return sspReplyNative(addr, AbstractionLayer.BT_SSP_VARIANT_PASSKEY_ENTRY, accept, Utils.byteArrayToInt(passkey)); |