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

Commit 087c6742 authored Oct 13, 2023 by Hui Peng Committed by Automerger Merge Worker Oct 13, 2023

Merge "[Invisalign2] remove undefined p_encrypt_cback in tBTA_DM_CB" into main...

Merge "[Invisalign2] remove undefined p_encrypt_cback in tBTA_DM_CB" into main am: a0316f9e am: 8d1fa366 am: 0dedbbe8

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2787474

Change-Id: I585bd2c5f4dd540ca639acc9f293bf27d1705bef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 6d944b57 0dedbbe8

system/bta/dm/bta_dm_int.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -378,7 +378,6 @@ typedef struct {

		#endif

		tBTA_DM_ENCRYPT_CBACK* p_encrypt_cback;
		alarm_t* switch_delay_timer;
		} tBTA_DM_CB;