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

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

Android Security 14.0.0 Release 17 (12787469)

* tag 'android-security-14.0.0_r17' of https://android.googlesource.com/platform/packages/modules/Bluetooth:
  Reset permissions for not bonded device
  RESTRICT AUTOMERGE backport "opp: validate that content uri belongs to current user"
  Resolve incomplete fix for SMP authentication bypass

 Conflicts:
	android/app/src/com/android/bluetooth/btservice/BondStateMachine.java
	android/app/src/com/android/bluetooth/opp/BluetoothOppSendFileInfo.java
	system/stack/smp/smp_act.cc

Change-Id: I504b54da1bb173098da08c815c18dbe3f491d90d
parents 7017de93 cf167f63
No related branches found
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