diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-09-20 02:19:53 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-09-20 02:19:53 +0000 |
| commit | 110482eb083e137dd4ee10fbb11043fc57cd67bc (patch) | |
| tree | 8dcdc6fb3484ccbb6f6a93ce6d843449124943a2 | |
| parent | d42f066472c524d488611d19ddd3e606af915178 (diff) | |
| parent | 683a4b5bf75cacfaaa8e4501fadd48ef0f7e5e19 (diff) | |
| download | Bluetooth-android10-c2f2-release.tar.gz | |
Merge cherrypicks of [9426564, 9426565, 9426566, 9426567, 9425837, 9426546, 9426547, 9426663, 9425933, 9425934, 9425935, 9426621, 9426622, 9426548, 9426599, 9426920, 9426921, 9426922, 9426923, 9426924, 9426925, 9425775, 9425838, 9426623, 9426664, 9426665, 9426666, 9426667, 9426668, 9426669, 9426568, 9426569] into qt-c2f2-releaseandroid-10.0.0_r14android-10.0.0_r13android10-c2f2-s2-releaseandroid10-c2f2-release
Change-Id: Idf8d4148ba9a48169d53e1ff2ac892147447cd8c
| -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 508eacf68..53cf72385 100644 --- a/src/com/android/bluetooth/btservice/AdapterService.java +++ b/src/com/android/bluetooth/btservice/AdapterService.java @@ -2233,6 +2233,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; + } + StatsLog.write(StatsLog.BLUETOOTH_BOND_STATE_CHANGED, obfuscateAddress(device), 0, device.getType(), BluetoothDevice.BOND_BONDING, @@ -2249,6 +2255,12 @@ public class AdapterService extends Service { return false; } + if (passkey.length != len) { + android.util.EventLog.writeEvent(0x534e4554, "139287605", -1, + "Passkey length mismatch"); + return false; + } + StatsLog.write(StatsLog.BLUETOOTH_BOND_STATE_CHANGED, obfuscateAddress(device), 0, device.getType(), BluetoothDevice.BOND_BONDING, |