android/pts: Update L2CAP test results

PTS 6.1 and Android 5.1

1 files changed, 10 insertions, 15 deletions

diff --git a/android/pics-l2cap.txt b/android/pics-l2cap.txt
index 984116b10..ce50c98f1 100644
--- a/android/pics-l2cap.txt
+++ b/android/pics-l2cap.txt
@@ -1,6 +1,6 @@
 L2CAP PICS for the PTS tool.
 
-PTS version: 6.0
+PTS version: 6.1
 
 * - different than PTS defaults
 # - not yet implemented/supported
@@ -99,13 +99,11 @@ TSCP_L2CAP_2_47	True		Support for LE Data Channel (C.24)
 -------------------------------------------------------------------------------
 C.1: Mandatory to support at least one of TSPC_L2CAP_2_12 OR TSPC_L2CAP_2_13 OR
 	TSPC_L2CAP_2_35 IF BR/EDR OR BR/EDR/LE AND SUM_ICS 31/7 (CSA1) OR
-	Core Spec v3.0 OR Core Spec v3.0+HS OR Core Spec v4.0 OR
-	Core Spec v4.0+HS OR Core Spec v4.1 OR Core Spec v4.1+HS OR
-	Core Spec v4.2 OR Core Spec v4.2+HS is supported, ELSE Excluded
+	Core Spec v3.0 or later is supported, ELSE Excluded
 C.2: Optional IF TSPC_L2CAP_2_12 OR TSPC_L2CAP_2_13 is claimed, ELSE Excluded.
 C.3: Optional IF TSPC_L2CAP_2_12 AND TSPC_L2CAP_2_28 is claimed, ELSE Excluded.
 C.4: IF TSPC_L2CAP_2_12 is claimed THEN either TSPC_L2CAP_2_18
-	OR TSPC_L2CAP_2_20 are Mandatory, ELSE Excluded.
+	OR TSPC_L2CAP_2_20 is Mandatory, ELSE Excluded.
 C.5: IF TSPC_L2CAP_2_13 is claimed THEN either TSPC_L2CAP_2_19
 	OR TSPC_L2CAP_2_21 are Mandatory, ELSE Excluded.
 C.6: Optional IF TSPC_L2CAP_2_12 is claimed, ELSE Excluded.
@@ -119,16 +117,12 @@ C.12: Mandatory IF Core Spec v3.0+HS OR Core Spec v4.0+HS OR
     Core Spec v4.1+HS OR Core Spec v4.2+HS is claimed, ELSE Optional.
 C.13: Mandatory IF Core Spec v3.0+HS OR Core Spec v4.0+HS OR
     Core Spec v4.1+HS OR Core Spec v4.2+HS is claimed, ELSE Optional.
-C.14: Optional IF Core Spec v3.0 OR Core Spec v3.0+HS OR Core Spec v4.0 OR
-    Core Spec v4.0+HS OR Core Spec v4.1 OR Core Spec v4.1+HS OR
-    Core Spec v4.2 OR Core Spec v4.2+HS is claimed, ELSE Excluded.
+C.14: Optional IF Core Spec v3.0 OR or later is claimed, ELSE Excluded.
 C.15: Optional IF TSPC_L2CAP_2_29 is claimed, ELSE Excluded.
-C.16: Optional IF Core Spec v3.0 OR Core Spec v3.0+HS OR Core Spec v4.0 OR
-    Core Spec v4.0+HS OR Core Spec v4.1 OR Core Spec v4.1+HS OR
-    Core Spec v4.2 OR Core Spec v4.2+HS is claimed, ELSE Excluded.
+C.16: Optional IF Core Spec v3.0 or later is claimed, ELSE Excluded.
 C.17: Mandatory IF LE OR BR/EDR/LE is claimed, ELSE Excluded.
-C.18: Optional IF TSPC_L2CAP_1_4 is claimed, ELSE Excluded.
-C.19: Mandatory IF TSPC_L2CAP_1_3 is claimed, ELSE Excluded.
+C.18: Optional IF Core Spec 4.0 OR TSPC_L2CAP_1_4 is claimed, ELSE Excluded.
+C.19: Mandatory IF Core Spec 4.0 AND TSPC_L2CAP_1_3 is claimed, ELSE Excluded.
 C.20: Mandatory IF BR/EDR OR BR/EDR/LE, is claimed, ELSE Excluded
 C.21: Optional IF BR/EDR OR BR/EDR/LE, is claimed, ELSE Excluded.
 C.22: Mandatory IF TSPC_L2CAP_2_29 is claimed, ELSE Excluded.
@@ -167,7 +161,7 @@ TSPC_L2CAP_3_14	False (*)	Negotiate and support service type ‘Best Effort'
 TSPC_L2CAP_3_15	False (*)	Negotiate and support service type ‘Guaranteed’
 					for Extended Flow Specification (C.9)
 TSPC_L2CAP_3_16	True		Support Multiple Simultaneous LE Data
-                    Channels (C.10)
+					Channels (C.10)
 -------------------------------------------------------------------------------
 C.1: Mandatory if TSPC_L2CAP_3_8 is supported, ELSE Optional.
 C.2: Optional if TSPC_L2CAP_3_8 is supported, ELSE Excluded.
@@ -179,5 +173,6 @@ C.7: Optional if TSPC_L2CAP_2_44 OR TSPC_L2CAP_2_38 is supported, ELSE Excluded.
 C.8: Mandatory if TSPC_L2CAP_2_44 OR TSPC_L2CAP_2_38 is supported,
 	ELSE Excluded.
 C.9: Optional if TSPC_L2CAP_2_44 OR TSPC_L2CAP_2_38 is supported, ELSE Excluded.
-C.10: Optional IF TSPC_L2CAP_2_47 is supported, otherwise Excluded.
+C.10: Optional IF TSPC_L2CAP_2_47 AND Core Spec 4.1 is supported,
+	otherwise Excluded.
 -------------------------------------------------------------------------------