Merge "legacy: Remove unused enum for btm_api_types::EIR_services" (ff91b739) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/include/btm_api_types.h

+1 −75

Original line number	Diff line number	Diff line
		@@ -78,81 +78,7 @@ typedef void(tBTM_VSC_CMPL_CB)(tBTM_VSC_CMPL* p1);
		/* BTM service definitions
		* Used for storing EIR data to bit mask
		*/
		enum {
		BTM_EIR_UUID_SERVCLASS_SERVICE_DISCOVERY_SERVER,
		/* BTM_EIR_UUID_SERVCLASS_BROWSE_GROUP_DESCRIPTOR, */
		/* BTM_EIR_UUID_SERVCLASS_PUBLIC_BROWSE_GROUP, */
		BTM_EIR_UUID_SERVCLASS_SERIAL_PORT,
		BTM_EIR_UUID_SERVCLASS_LAN_ACCESS_USING_PPP,
		BTM_EIR_UUID_SERVCLASS_DIALUP_NETWORKING,
		BTM_EIR_UUID_SERVCLASS_IRMC_SYNC,
		BTM_EIR_UUID_SERVCLASS_OBEX_OBJECT_PUSH,
		BTM_EIR_UUID_SERVCLASS_OBEX_FILE_TRANSFER,
		BTM_EIR_UUID_SERVCLASS_IRMC_SYNC_COMMAND,
		BTM_EIR_UUID_SERVCLASS_HEADSET,
		BTM_EIR_UUID_SERVCLASS_CORDLESS_TELEPHONY,
		BTM_EIR_UUID_SERVCLASS_AUDIO_SOURCE,
		BTM_EIR_UUID_SERVCLASS_AUDIO_SINK,
		BTM_EIR_UUID_SERVCLASS_AV_REM_CTRL_TARGET,
		/* BTM_EIR_UUID_SERVCLASS_ADV_AUDIO_DISTRIBUTION, */
		BTM_EIR_UUID_SERVCLASS_AV_REMOTE_CONTROL,
		/* BTM_EIR_UUID_SERVCLASS_VIDEO_CONFERENCING, */
		BTM_EIR_UUID_SERVCLASS_INTERCOM,
		BTM_EIR_UUID_SERVCLASS_FAX,
		BTM_EIR_UUID_SERVCLASS_HEADSET_AUDIO_GATEWAY,
		/* BTM_EIR_UUID_SERVCLASS_WAP, */
		/* BTM_EIR_UUID_SERVCLASS_WAP_CLIENT, */
		BTM_EIR_UUID_SERVCLASS_PANU,
		BTM_EIR_UUID_SERVCLASS_NAP,
		BTM_EIR_UUID_SERVCLASS_GN,
		BTM_EIR_UUID_SERVCLASS_DIRECT_PRINTING,
		/* BTM_EIR_UUID_SERVCLASS_REFERENCE_PRINTING, */
		BTM_EIR_UUID_SERVCLASS_IMAGING,
		BTM_EIR_UUID_SERVCLASS_IMAGING_RESPONDER,
		BTM_EIR_UUID_SERVCLASS_IMAGING_AUTO_ARCHIVE,
		BTM_EIR_UUID_SERVCLASS_IMAGING_REF_OBJECTS,
		BTM_EIR_UUID_SERVCLASS_HF_HANDSFREE,
		BTM_EIR_UUID_SERVCLASS_AG_HANDSFREE,
		BTM_EIR_UUID_SERVCLASS_DIR_PRT_REF_OBJ_SERVICE,
		/* BTM_EIR_UUID_SERVCLASS_REFLECTED_UI, */
		BTM_EIR_UUID_SERVCLASS_BASIC_PRINTING,
		BTM_EIR_UUID_SERVCLASS_PRINTING_STATUS,
		BTM_EIR_UUID_SERVCLASS_HUMAN_INTERFACE,
		BTM_EIR_UUID_SERVCLASS_CABLE_REPLACEMENT,
		BTM_EIR_UUID_SERVCLASS_HCRP_PRINT,
		BTM_EIR_UUID_SERVCLASS_HCRP_SCAN,
		/* BTM_EIR_UUID_SERVCLASS_COMMON_ISDN_ACCESS, */
		/* BTM_EIR_UUID_SERVCLASS_VIDEO_CONFERENCING_GW, */
		/* BTM_EIR_UUID_SERVCLASS_UDI_MT, */
		/* BTM_EIR_UUID_SERVCLASS_UDI_TA, */
		/* BTM_EIR_UUID_SERVCLASS_VCP, */
		BTM_EIR_UUID_SERVCLASS_SAP,
		BTM_EIR_UUID_SERVCLASS_PBAP_PCE,
		BTM_EIR_UUID_SERVCLASS_PBAP_PSE,
		/* BTM_EIR_UUID_SERVCLASS_TE_PHONE_ACCESS, */
		/* BTM_EIR_UUID_SERVCLASS_ME_PHONE_ACCESS, */
		BTM_EIR_UUID_SERVCLASS_PHONE_ACCESS,
		BTM_EIR_UUID_SERVCLASS_HEADSET_HS,
		BTM_EIR_UUID_SERVCLASS_PNP_INFORMATION,
		/* BTM_EIR_UUID_SERVCLASS_GENERIC_NETWORKING, */
		/* BTM_EIR_UUID_SERVCLASS_GENERIC_FILETRANSFER, */
		/* BTM_EIR_UUID_SERVCLASS_GENERIC_AUDIO, */
		/* BTM_EIR_UUID_SERVCLASS_GENERIC_TELEPHONY, */
		/* BTM_EIR_UUID_SERVCLASS_UPNP_SERVICE, */
		/* BTM_EIR_UUID_SERVCLASS_UPNP_IP_SERVICE, */
		/* BTM_EIR_UUID_SERVCLASS_ESDP_UPNP_IP_PAN, */
		/* BTM_EIR_UUID_SERVCLASS_ESDP_UPNP_IP_LAP, */
		/* BTM_EIR_UUID_SERVCLASS_ESDP_UPNP_IP_L2CAP, */
		BTM_EIR_UUID_SERVCLASS_VIDEO_SOURCE,
		BTM_EIR_UUID_SERVCLASS_VIDEO_SINK,
		/* BTM_EIR_UUID_SERVCLASS_VIDEO_DISTRIBUTION */
		/* BTM_EIR_UUID_SERVCLASS_HDP_PROFILE */
		BTM_EIR_UUID_SERVCLASS_MESSAGE_ACCESS,
		BTM_EIR_UUID_SERVCLASS_MESSAGE_NOTIFICATION,
		BTM_EIR_UUID_SERVCLASS_HDP_SOURCE,
		BTM_EIR_UUID_SERVCLASS_HDP_SINK,
		BTM_EIR_MAX_SERVICES
		};
		#define BTM_EIR_MAX_SERVICES 46

		/* search result in EIR of inquiry database */
		#define BTM_EIR_FOUND 0

system/stack/test/btm/stack_btm_test.cc

+2 −0

Original line number	Diff line number	Diff line
		@@ -218,6 +218,8 @@ TEST(ScoTest, make_sco_packet) {
		osi_free(p);
		}

		TEST(BtmTest, BTM_EIR_MAX_SERVICES) { ASSERT_EQ(46, BTM_EIR_MAX_SERVICES); }

		} // namespace

		void btm_sec_rmt_name_request_complete(const RawAddress* p_bd_addr,