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

Skip to content
Unverified Commit 53b9f2c0 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-security-14.0.0_r13' of...

Merge tag 'android-security-14.0.0_r13' of https://android.googlesource.com/platform/packages/modules/Bluetooth into HEAD

Android Security 14.0.0 Release 13 (12199513)

* tag 'android-security-14.0.0_r13' of https://android.googlesource.com/platform/packages/modules/Bluetooth:
  RESTRICT AUTOMERGE Disallow unexpected incoming HID connections

 Conflicts:
	android/app/jni/com_android_bluetooth_hid_host.cpp
	android/app/src/com/android/bluetooth/hid/HidHostService.java
	system/btif/include/btif_hh.h
	system/btif/src/btif_hh.cc
	system/btif/src/btif_profile_storage.cc

Change-Id: I07002325d4b72357c240e2fd813b03455a464001
parents 3054a65b f0e837cf
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment