Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36271e08 authored by Cheney Ni's avatar Cheney Ni Committed by android-build-merger
Browse files

AdapterService: Check the PIN code length before using am: 1feb4d24 

am: 9346908a

Change-Id: Ic1f8a10bc0284773d10f2c02883fe638b340d1af
parents 9c1740ab 9346908a

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+12 −0
Original line number Diff line number Diff line
@@ -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,