Skip to content
Snippets Groups Projects
Commit d88be849 authored by Dhina17's avatar Dhina17
Browse files

Merge tag 'android-security-14.0.0_r18' into fourteen

Android Security 14.0.0 Release 18 (12895206)

* tag 'android-security-14.0.0_r18' of https://android.googlesource.com/platform/packages/modules/Bluetooth:
  Fix UAF in sdp_discovery.cc
  Use encrypted link for avdtp and avctp channels

 Conflicts:
	system/stack/avct/avct_api.cc

Change-Id: If803d7e69214b512d5ed59fcd7becc7fa47191f5
parents c06923aa b23312a5
Branches fourteen
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment