android/pts: Update GAP tests results with PTS 6.0

1 files changed, 138 insertions, 131 deletions

diff --git a/android/pts-gap.txt b/android/pts-gap.txt
index c59725812..4ec290e84 100644
--- a/android/pts-gap.txt
+++ b/android/pts-gap.txt
@@ -1,7 +1,7 @@
 PTS test results for GAP
 
 PTS version: 5.3
-Tested: 05-December-2014
+Tested: 19-January-2015
 Android version: 5.0
 Kernel version: 3.18
 
@@ -46,20 +46,24 @@ TC_DISC_LIMM_BV_03_C	PASS	btmgmt connectable on
 				btmgmt discov off
 				<answer NO to non-connectable adv question>
 				btmgmt discov limited 30
+				btmgmt advertising on
 TC_DISC_LIMM_BV_04_C	PASS	btmgmt connectable on
 				btmgmt discov off
 				btmgmt power off
 				btmgmt bredr off
 				btmgmt power on
 				btmgmt discov limited 30
+				btmgmt advertising on
 TC_DISC_GENM_BV_01_C	PASS	btmgmt connectable on
 				btmgmt discov on
+				btmgmt advertising on
 				<answer NO to non-connectable adv question>
 TC_DISC_GENM_BV_02_C	PASS	btmgmt connectable on
 				btmgmt advertising on
 				btmgmt discov on
 TC_DISC_GENM_BV_03_C	PASS	btmgmt connectable on
 				btmgmt discov on
+				btmgmt advertising on
 				<answer NO to non-connectable adv question>
 TC_DISC_GENM_BV_04_C	PASS	btmgmt connectable on
 				btmgmt power off
@@ -90,12 +94,12 @@ TC_DISC_GENP_BV_05_C	PASS	btmgmt find -l
 				PTS AD flags must have bit 1 and bit 0 unset
 TC_IDLE_GIN_BV_01_C	PASS	Start discovery from IUT
 TC_IDLE_LIN_BV_01_C	PASS	hcitool scan --iac=liac
-TC_IDLE_NAMP_BV_01_C	PASS	possible to PASS using haltest following steps:
-				gattc - register client, connect to PTS, search
-				all services, get characteristic and then read
-				characteristic (name)
-TC_IDLE_NAMP_BV_02_C	PASS	PTS issue #12679
-				haltest: gatts connect
+TC_IDLE_NAMP_BV_01_C	PASS	haltest: gattc register_client
+				gattc listen 1
+				gattc search_service 1 1800
+				gattc get_characteristic 1 {1800,0,1}
+				gattc read_characteristic 1 {1800,0,1} {2a00,1}
+TC_IDLE_NAMP_BV_02_C	PASS	btmgmt advertising on
 TC_CONN_NCON_BV_01_C	PASS	btmgmt connectable off
 				btmgmt advertising on
 				<answer NO to non-connectable adv question>
@@ -126,16 +130,12 @@ TC_CONN_GCEP_BV_04_C	N/A
 TC_CONN_SCEP_BV_01_C	PASS	'gattc connect' prior to pressing OK on PTS
 TC_CONN_SCEP_BV_02_C	N/A
 TC_CONN_DCEP_BV_01_C	PASS	'gattc connect' prior to pressing OK on PTS
-TC_CONN_DCEP_BV_02_C	INC	Test Spec. Errata approved - PTS issue #12600
-				is claimed to be resolved in upcoming ETS 8400
+TC_CONN_DCEP_BV_02_C	N/A
 TC_CONN_DCEP_BV_03_C	PASS	gattc connect
 TC_CONN_DCEP_BV_04_C	N/A
-TC_CONN_CPUP_BV_01_C	PASS	gattc register_client
-				gattc listen
-TC_CONN_CPUP_BV_02_C	PASS	gattc register_client
-				gattc listen
-TC_CONN_CPUP_BV_03_C	PASS	gattc register_client
-				gattc listen
+TC_CONN_CPUP_BV_01_C	PASS	btmgmt advertising on
+TC_CONN_CPUP_BV_02_C	PASS	btmgmt advertising on
+TC_CONN_CPUP_BV_03_C	PASS	btmgmt advertising on
 TC_CONN_CPUP_BV_04_C	PASS	gattc register_client
 				gattc connect
 				gattc disconnect
@@ -148,19 +148,27 @@ TC_CONN_CPUP_BV_06_C	PASS	gattc register_client
 					0x0960
 				gattc disconnect <client_if> <pts_bdaddr>
 					<conn_id>
-TC_CONN_TERM_BV_01_C	PASS
+TC_CONN_TERM_BV_01_C	PASS	gattc register_client
+				gattc listen
+				gattc disconnect
 TC_CONN_PRDA_BV_01_C	PASS	gattc register_client
 				gattc listen
 				gattc disconnect
-TC_CONN_PRDA_BV_02_C	INC	PTS issue #12310
-				Note: PTS issues #12207 & #12310 are claimed
-				to be resolved by the ETS provided in PTS issue
-				#12312 however it does not solve the problem
-TC_BOND_NBON_BV_01_C	PASS
+TC_CONN_PRDA_BV_02_C	INC	PTS issue #12950
+				gattc register_client
+				bluetooth create_bond
+				gattc connect
+TC_BOND_NBON_BV_01_C	PASS	haltest:
+				gattc register_client
+				gattc connect
+				gatt disconnect
+				gattc connect
+				gatt disconnect
 TC_BOND_NBON_BV_02_C	PASS	haltest: gattc register_client
 				gattc connect <client_id> <address>
 				bluetooth create_bond <address>
-				bluetooth remove_bond <address>
+				gattc connect <client_id> <address>
+				bluetooth create_bond <address>
 TC_BOND_NBON_BV_03_C	PASS	haltest: gattc listen
 TC_BOND_BON_BV_01_C	PASS	PTS issue #12503
 				possible to pass without MITM:
@@ -173,9 +181,13 @@ TC_BOND_BON_BV_01_C	PASS	PTS issue #12503
 				btmgmt pairable on
 				To bond with PTS execute
 				btmgmt pair -t 0x01 -c 0x03 <PTS addr>
-TC_BOND_BON_BV_02_C	PASS
-TC_BOND_BON_BV_03_C	PASS	PTS issue #12678
-				gattc register_client
+TC_BOND_BON_BV_02_C	PASS	gattc regicter_client
+				gattc scan
+				gattc connect
+				bluetooth create_bond
+				gattc connect
+				gattc test_command 226 <addr> <uuid> 1
+TC_BOND_BON_BV_03_C	PASS	gattc register_client
 				gattc listen 1
 TC_BOND_BON_BV_04_C	PASS	haltest: gattc_register_client
 				gattc connect <client_id> <address>
@@ -187,43 +199,39 @@ TC_SEC_AUT_BV_11_C	PASS	haltest: gattc register_client
 				gatts add_service 2 <uuid> 3
 				gatts add_characteristic 2 1b <uuid> 10 68
 				gatts start_service 2 1b 1
-				gattc listen
+				gattc listen 1
 				PTS asks for handle with Insufficient auth
-				bluetooth ssp_reply <addr> <passkey>
-				gatts send_response
-TC_SEC_AUT_BV_12_C	INC	PTS issue #12657
-				haltest: gatts register_server
-				gatts add_service 2 <uuid> 3
-				gatts add_characteristic 2 <service_handle>
-								<uuid> 10 68
-				gatts start_service 2 <service_handle> 1
-				gatts connect <server_if> <addr>
+				gatts send_response 1 1 0 1d 0 0x1234
+TC_SEC_AUT_BV_12_C	PASS	haltest: gatts register_server
+				gatts add_service 1 <uuid> 3
+				gatts add_characteristic 1 1b <uuid> 10 68
+				gatts start_service 1 1b 1
+				gatts connect 1 <addr>
 				PTS asks for handle with Insufficient auth
-				bluetooth ssp_reply <addr> <passkey>
-				gatts send_response
-TC_SEC_AUT_BV_13_C	INC	PTS issue #12657
-				haltest: gatts register_server
-				gatts add_service 2 <uuid> 3
-				gatts add_characteristic 2 <service_handle>
-								<uuid> 10 68
-				gatts start_service 2 <service_handle> 1
-				gatts connect <server_if> <addr>
+				gatts send_response 1 1 0 1d 0 0x1234
+TC_SEC_AUT_BV_13_C	PASS	haltest: gatts register_server
+				gatts add_service 1 <uuid> 3
+				gatts add_characteristic 1 1b <uuid> 10 68
+				gatts start_service 1 1b 1
+				gatts connect 1 <addr>
 				PTS asks for handle with Insufficient auth
-				bluetooth ssp_reply <addr> <passkey>
-				gatts send_response
-TC_SEC_AUT_BV_14_C	INC	PTS issue #12657
-				haltest:gattc register_client
+				gatts send_response 1 1 0 1d 0 0x1234
+TC_SEC_AUT_BV_14_C	PASS	haltest: gattc register_client
 				gatts register_server
 				gatts add_service 2 <uuid> 3
 				gatts add_characteristic 2 1b <uuid> 10 68
 				gatts start_service 2 1b 1
-				gattc listen
+				gattc listen 1
 				PTS asks for handle with Insufficient auth
-				bluetooth ssp_reply <addr> <passkey>
-				gatts send_response
+				gatts send_response 1 1 0 1d 0 0x1234
 TC_SEC_AUT_BV_15_C	N/A
 TC_SEC_AUT_BV_16_C	N/A
-TC_SEC_AUT_BV_17_C	PASS
+TC_SEC_AUT_BV_17_C	PASS	haltest: gattc register_client
+				gattc connect
+				gattc search_service
+				gattc get_characteristic
+				gattc read_characteristic
+				bluetooth create_bond
 TC_SEC_AUT_BV_18_C	PASS	haltest: gattc register_client
 				gattc listen
 				gattc search_service
@@ -233,16 +241,12 @@ TC_SEC_AUT_BV_18_C	PASS	haltest: gattc register_client
 				gattc read_characteristic
 TC_SEC_AUT_BV_19_C	PASS
 TC_SEC_AUT_BV_20_C	PASS	haltest: gattc register_client
-				gattc listen <client_id> 1
-				Confirm bonding
-				gattc search_service
-				gattc get_characteristic
-				gattc read_characteristic
-				gattc listen <client_id> 0
-				Click OK on PTS popup to disconnect
-				bluetooth remove bond
-				gattc listen <client_id> 1
-				gattc read_characteristic
+				gattc listen 1 1
+				gattc search_service 2
+				gattc get_characteristic 2 {1801,1,1}
+				gattc read_characteristic 2 {1801,1,1} {2a05,1}
+				gattc read_characteristic 2 {1801,1,1} {2a05,1}
+					1
 TC_SEC_AUT_BV_21_C	PASS	haltest: gattc register_client
 				gattc connect
 				bluetooth create_bond
@@ -252,82 +256,69 @@ TC_SEC_AUT_BV_22_C	PASS	btmgmt io-cap 3
 				haltest: gattc register_client
 				gattc listen
 				gattc test_command 226 <addr> <u1> 1
-TC_SEC_AUT_BV_23_C	INC	PTS issue #12657
-				haltest: gatts register_server
-				gatts add_service 2 <uuid> 3
-				gatts add_characteristic 2 <service_handle>
-								<uuid> 10 34
-				gatts start_service 2 <service_handle> 1
-				gattc register_client
-				gattc listen
-				bluetooth ssp_reply
-				gatts send_response
-TC_SEC_AUT_BV_24_C	INC	PTS issue #12657
-				haltest: gatts register_server
+TC_SEC_AUT_BV_23_C	PASS	haltest: gattc register_client
+				gatts register_server
 				gatts add_service 2 <uuid> 3
-				gatts add_characteristic 2 <service_handle>
-								<uuid> 10 34
-				gatts start_service 2 <service_handle> 1
-				gatts connect <PTS addr>
-				bluetooth ssp_reply
+				gatts add_characteristic 2 1b <uuid> 10 34
+				gatts start_service 2 1b 1
+				gattc listen 1
+				PTS asks for handle with insufficient encryption
+				gatts send_response 3 1 0 1d 0 0x1234
+TC_SEC_AUT_BV_24_C	PASS	haltest: gatts register_server
+				gatts add_service 1 <uuid> 3
+				gatts add_characteristic 1 1b <uuid> 10 34
+				gatts start_service 1 1b 1
+				gatts connect
 				gatts disconnect
 				gatts connect
 				PTS asks for handle with insufficient encryption
-				gatts send_response
+				gatts send_response 2 1 0 1d 0 0x1234
 TC_SEC_CSIGN_BV_01_C	PASS	haltest:
 				gattc connect
 				bluetooth create_bond
 				gattc connect
 				gattc write_characteristic: <write_type> 4
 				gattc disconnect
-TC_SEC_CSIGN_BV_02_C	INC	PTS issue #12675
-				haltest:
-				gatts add_service
-				gatts add_chaaracteristic:
-						<properties> 66
-						<permissions> 129
-				gatts start_service
+TC_SEC_CSIGN_BV_02_C	PASS	haltest: gattc register_client
+				gatts register_server
+				gatts add_service 2 <uuid> 3
+				gatts add_characteristic 2 1b <uuid> 66 129
+				gatts start_service 2 1b 1
+				gattc listen 1
 				gatts disconnect
-				gattc disconnect
-TC_SEC_CSIGN_BI_01_C	INC	PTS issue #12675
-				haltest:
-				gatts add_service
-				gatts add_chaaracteristic:
-						<properties> 66
-						<permissions> 129
-				gatts start_service
+TC_SEC_CSIGN_BI_01_C	PASS	gattc register_client
+				gatts register_server
+				gatts add_service 2 <uuid> 3
+				gatts add_characteristic 2 1b <uuid> 66 129
+				gatts start_service 2 1b 1
+				gattc listen 1
 				gatts disconnect
 				gattc disconnect
-TC_SEC_CSIGN_BI_02_C	INC	PTS issue #12675
-				haltest:
-				gatts add_service
-				gatts add_chaaracteristic:
-						<properties> 66
-						<permissions> 129
-				gatts start_service
+TC_SEC_CSIGN_BI_02_C	PASS	gattc register_client
+				gatts register_server
+				gatts add_service 2 <uuid> 3
+				gatts add_characteristic 2 1b <uuid> 66 129
+				gatts start_service 2 1b 1
+				gattc listen 1
 				gatts disconnect
 				gattc disconnect
-TC_SEC_CSIGN_BI_03_C	INC	PTS issue #12675
-				haltest:
-				gatts add_service
-				gatts add_characteristic:
-						<properties> 64
-						<permissions> 128
-				gatts start_service
-				gattc listen
-				bluetooth ssp_reply
+TC_SEC_CSIGN_BI_03_C	PASS	gattc register_client
+				gatts register_server
+				gatts add_service 2 <uuid> 3
+				gatts add_characteristic 2 1b <uuid> 66 129
+				gatts start_service 2 1b 1
+				gattc listen 1
 				gatts disconnect
+				gattc disconnect
 				bluetooth remove_bond
-TC_SEC_CSIGN_BI_04_C	INC	PTS issue #12675
-				haltest:
-				gatts add_service
-				gatts add_characteristic:
-						<properties> 64
-						<permissions> 256
-				gatts start_service
-				gattc listen
-				bluetooth ssp_reply
+TC_SEC_CSIGN_BI_04_C	PASS	gattc register_client
+				gatts register_server
+				gatts add_service 2 <uuid> 3
+				gatts add_characteristic 2 1b <uuid> 64 256
+				gatts start_service 2 1b 1
+				gattc listen 1
 				gatts disconnect
+				gattc disconnect
 TC_PRIV_CONN_BV_01_C	N/A
 TC_PRIV_CONN_BV_02_C	N/A
 TC_PRIV_CONN_BV_03_C	N/A
@@ -337,12 +328,17 @@ TC_PRIV_CONN_BV_06_C	N/A
 TC_PRIV_CONN_BV_07_C	N/A
 TC_PRIV_CONN_BV_08_C	N/A
 TC_PRIV_CONN_BV_09_C	N/A
-TC_PRIV_CONN_BV_10_C	PASS	PTS issue #12312
+TC_PRIV_CONN_BV_10_C	PASS	PTS issue #12951
+				btmgmt privacy on
 				Note: currently for this test following PIXITs
 				are required to be be changed:
 				TSPX_using_public_device_address: FALSE
 				TSPX_using_random_device_address: TRUE
-TC_PRIV_CONN_BV_11_C	INC	PTS issue #12310, JIRA #BA-186
+				TSPX_bd_addr_iut: <IUT random address>
+				/sys/kernel/debug/bluetooth/hci/random_address
+				holds currently used random address
+TC_PRIV_CONN_BV_11_C	INC	PTS issue #12952
+				JIRA #BA-186
 TC_ADV_BV_01_C		N/A
 TC_ADV_BV_02_C		PASS	gattc register_client
 				gattc listen 1 1
@@ -372,26 +368,35 @@ TC_GAT_BV_05_C		N/A
 TC_GAT_BV_06_C		N/A
 TC_GAT_BV_07_C		N/A
 TC_GAT_BV_08_C		N/A
-TC_DM_NCON_BV_01_C	PASS	btmgmt connectable off
-TC_DM_CON_BV_01_C	PASS	btmgmt connectable on
-TC_DM_NBON_BV_01_C	PASS
+TC_DM_NCON_BV_01_C	PASS	bluetooth set_adapter_property
+					BT_PROPERTY_ADAPTER_SCAN_MODE
+					BT_SCAN_MODE_NONE
+				gattc register_client
+				gattc listen 1
+TC_DM_CON_BV_01_C	PASS	bluetooth set_adapter_property
+					BT_PROPERTY_ADAPTER_SCAN_MODE
+					BT_SCAN_MODE_CONNECTABLE_DISCOVERABLE
+				gattc register_client
+				gattc listen 1
+TC_DM_NBON_BV_01_C	PASS	btmgmt bondable off
 TC_DM_BON_BV_01_C	PASS	haltest:
 				create_bond and remove_bond when requested
 TC_DM_GIN_BV_01_C	PASS
 TC_DM_LIN_BV_01_C	PASS
 TC_DM_NAD_BV_01_C	PASS	Start discovery from IUT
 TC_DM_NAD_BV_02_C	PASS
-TC_DM_LEP_BV_01_C	PASS	gattc register_client
+TC_DM_LEP_BV_01_C	INC	PTS issue #12949
+				gattc register_client
 				gattc listen 1 1
 TC_DM_LEP_BV_02_C	PASS	Use basic rate PTS dongle
 				haltest:
 				bluetooth set_adapter_property
 TC_DM_LEP_BV_04_C	PASS	l2test -n <PTS bdaddr>
 TC_DM_LEP_BV_05_C	PASS	btmgmt find -b
-				l2test -n 00:1B:DC:06:06:22
-TC_DM_LEP_BV_06_C	PASS
-TC_DM_LEP_BV_07_C	PASS
-TC_DM_LEP_BV_08_C	PASS
+				l2test -n <PTS bdaddr>
+TC_DM_LEP_BV_06_C	PASS	gattc connect
+TC_DM_LEP_BV_07_C	INC	PTS issue #12949
+TC_DM_LEP_BV_08_C	INC	PTS issue #12949
 TC_DM_LEP_BV_09_C	PASS	haltest:
 				bluetooth enable
 				bluetooth set_adapter_property
@@ -402,7 +407,8 @@ TC_DM_LEP_BV_09_C	PASS	haltest:
 				gattc connect
 				l2test -n -P 31 <PTS addr>
 				disconnect
-TC_DM_LEP_BV_10_C	PASS	haltest:
+TC_DM_LEP_BV_10_C	INC	PTS issue #12949
+				haltest:
 				bluetooth enable
 				bluetooth set_adapter_property
 					BT_PROPERTY_ADAPTER_SCAN_MODE
@@ -418,4 +424,5 @@ TC_DM_LEP_BV_11_C	PASS	haltest:
 					BT_SCAN_MODE_CONNECTABLE_DISCOVERABLE
 				gattc register_client
 				gattc connect
+				gattc disconnect
 -------------------------------------------------------------------------------