[automerger] AdapterService: Check the PIN code length before using am:... (ac0783d8) · Commits · e / os / android_packages_modules_Bluetooth

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -1709,6 +1709,11 @@ public class AdapterService extends Service {
		return false;
		}

		if (pinCode.length != len) {
		EventLog.writeEvent(0x534e4554, "139287605", -1, "PIN code length mismatch");
		return false;
		}

		byte[] addr = Utils.getBytesFromAddress(device.getAddress());
		return pinReplyNative(addr, accept, len, pinCode);
		}
		@@ -1720,6 +1725,11 @@ public class AdapterService extends Service {
		return false;
		}

		if (passkey.length != len) {
		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));