Merge "floss: Don't call delete stored link key" (37e126dd) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/btm/btm_devctl.cc

+6 −0

Original line number	Diff line number	Diff line
		@@ -689,6 +689,11 @@ tBTM_STATUS BTM_EnableTestMode(void) {
		******************************************************************************/
		tBTM_STATUS BTM_DeleteStoredLinkKey(const RawAddress* bd_addr,
		tBTM_CMPL_CB* p_cb) {
		/* Read and Write STORED link key stems from a legacy use-case and is no
		* longer expected to be used. Disable explicitly for Floss and queue overall
		* deletion from Fluoride.
		*/
		#if !defined(TARGET_FLOSS)
		/* Check if the previous command is completed */
		if (btm_cb.devcb.p_stored_link_key_cmpl_cb) return (BTM_BUSY);

		@@ -706,6 +711,7 @@ tBTM_STATUS BTM_DeleteStoredLinkKey(const RawAddress* bd_addr,
		} else {
		btsnd_hcic_delete_stored_key(*bd_addr, delete_all_flag);
		}
		#endif

		return (BTM_SUCCESS);
		}