diff options
| author | Kevin F. Haggerty <haggertk@lineageos.org> | 2019-11-11 19:43:39 -0700 |
|---|---|---|
| committer | Kevin F. Haggerty <haggertk@lineageos.org> | 2019-11-11 19:43:39 -0700 |
| commit | 8f28ffffd5becb7385c46c61a14343299601a493 (patch) | |
| tree | d65f24cc3df0b42c3d6cd2672663984109ab6420 /src | |
| parent | f8ee395dc5ed28a9e865e805e8620302c57180cc (diff) | |
| parent | fbdb52d5087cb88f4a5d54e59a48a02620ebf2dc (diff) | |
| download | android_packages_apps_Bluetooth-8f28ffffd5becb7385c46c61a14343299601a493.tar.gz android_packages_apps_Bluetooth-8f28ffffd5becb7385c46c61a14343299601a493.tar.bz2 android_packages_apps_Bluetooth-8f28ffffd5becb7385c46c61a14343299601a493.zip | |
Merge tag 'android-9.0.0_r50' into staging/lineage-16.0_merge-android-9.0.0_r50
Android 9.0.0 release 50
* tag 'android-9.0.0_r50':
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: I1cdde0924e8027271d2c262c6207444a8dcdf2c8
Diffstat (limited to 'src')
| -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 9d8cde986..8a4c8567b 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)); |