Commit Graph

3702 Commits

Author SHA1 Message Date
Bookatz
bc64102b1f Merge "CTS secondary_user: CtsNetApi23TestCases" am: 32dbf1f7e4
am: 07e89e4601

Change-Id: I3d604eb604130f41a4a0ce5b6c63de75b679d589
2019-10-25 01:46:26 -07:00
Bookatz
62c2bd3167 Merge "CTS secondary_user: CtsNativeNetDnsTestCases" am: dcc0677c72
am: d277b9c3c4

Change-Id: I7486ea42408b12cd244c84f89d416804515b5cb5
2019-10-25 01:46:18 -07:00
Bookatz
07e89e4601 Merge "CTS secondary_user: CtsNetApi23TestCases"
am: 32dbf1f7e4

Change-Id: I546f02bd4cdf2419805704d9272771a4161011ea
2019-10-25 01:34:06 -07:00
Bookatz
d277b9c3c4 Merge "CTS secondary_user: CtsNativeNetDnsTestCases"
am: dcc0677c72

Change-Id: I45d6ee5cbf37c7556a48fe7aae841e496ae0c3a0
2019-10-25 01:34:00 -07:00
Treehugger Robot
32dbf1f7e4 Merge "CTS secondary_user: CtsNetApi23TestCases" 2019-10-25 08:16:47 +00:00
Treehugger Robot
dcc0677c72 Merge "CTS secondary_user: CtsNativeNetDnsTestCases" 2019-10-25 08:16:47 +00:00
Bookatz
306cf25378 CTS secondary_user: CtsNetApi23TestCases
Marks this CTS test module as supporting secondary_user, meaning that
the tests are eligible to be run from a regular Android user other
than the system user (i.e. other than user 0).

Note that 'user' here refers to the concept of users in Android
Multiuser; it is NOT the same as a uid.

Bug: 141773058
Test: module passed with secondary_user params
 (--enable-optional-parameterization --module-parameter secondary_user)

Change-Id: I306953dbe90f1c4772c3bc26d6f73279c1ac525a
2019-10-24 09:59:43 -07:00
Bookatz
42919c7b96 CTS secondary_user: CtsNativeNetDnsTestCases
Marks this CTS test module as supporting secondary_user, meaning that
the tests are eligible to be run from a regular Android user other
than the system user (i.e. other than user 0).

Note that 'user' here refers to the concept of users in Android
Multiuser; it is NOT the same as a uid.

Bug: 141773058
Test: module passed with secondary_user params
 (--enable-optional-parameterization --module-parameter secondary_user)

Change-Id: I8d9a9b56d5f392548032c5e50730d6c5528f8f91
2019-10-24 09:59:09 -07:00
Junyu Lai
d2b77dc01c Merge "Set keepalive socket timeout to default value" am: 4c8baa10f9
am: 8d03ba0e98

Change-Id: I5461398bd72c5c649aca862c3613f3ce29161820
2019-10-24 02:47:27 -07:00
Junyu Lai
8d03ba0e98 Merge "Set keepalive socket timeout to default value"
am: 4c8baa10f9

Change-Id: I60e888f24a7de7dba0a09cd4cec2d13d5b47bb91
2019-10-24 02:41:33 -07:00
junyulai
18c1592a6c Set keepalive socket timeout to default value
Fix: 142978377
Test: 1. atest android.net.cts.ConnectivityManagerTest\
         #testSocketKeepaliveLimitWifi --generate-new-metrics 10
      2. atest android.net.cts.ConnectivityManagerTest
      3. manual simulate connection timeout by changing test
         address

Change-Id: Idb786e38e87be253e0af11a9ffebf984bf23ead0
2019-10-24 15:42:36 +08:00
Xin Li
32b3b7aaca DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master
am: 8da12ce4c8

Change-Id: I7226c0d98df63d089b2e27e1a2073d361e45180f
2019-10-15 10:10:17 -07:00
Xin Li
8da12ce4c8 DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master
Bug: 141248619
Change-Id: I3a745ac766327f5efd2f79a1daa6b4b8890b1a42
2019-10-14 22:53:02 +00:00
Jeffrey Vander Stoep
90190f2e14 Merge "getConnectionOwnerUid: add test for b/141603906" am: e8a8d9a26f
am: ab361a6fbd

Change-Id: I6a3ed1539640c02dd7f8bff1f26235285b9ab8c3
2019-10-08 03:33:23 -07:00
Jeffrey Vander Stoep
ab361a6fbd Merge "getConnectionOwnerUid: add test for b/141603906"
am: e8a8d9a26f

Change-Id: Ifbd37612218efb8b664d22698c64f6fdadbfafb8
2019-10-08 03:27:58 -07:00
Jeff Vander Stoep
c9068f1b87 getConnectionOwnerUid: add test for b/141603906
Test: on Marlin and Blueline run
    cts-tradefed run cts -m CtsHostsideNetworkTests \
    -t com.android.cts.net.HostsideVpnTests#testB141603906
Bug: 141603906
Change-Id: I759bc2295b2060e4575d61718c551d201a6455be
2019-10-08 10:41:45 +02:00
Xin Li
f920179eaa [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: b7fab0094c -s ours
am skip reason: change_id I4d60d2ad06007842be6af1f2ab844917f18cc629 with SHA1 55329386a3 is in history

Change-Id: I7ca35263e49c8736ecb056d097b11c137e2cdcde
2019-09-11 13:54:09 -07:00
Xin Li
cc92930e29 [automerger skipped] Mark stage branch as merged in qt-dev. am: 5775b852a7 -s ours
am: 1c04d967aa -s ours
am skip reason: change_id Ibcbd7833bec952d69841abbea827affc202941b6 with SHA1 ca767c6852 is in history

Change-Id: I3930fccbb3b38c91c3f23e4a8d5a9c9bf56d7464
2019-09-08 18:35:49 -07:00
Xin Li
b7fab0094c Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
Bug: 135460123
Change-Id: If5168b08718d9eece2a9d2b07738c5438151a53b
Merged-In: I4d60d2ad06007842be6af1f2ab844917f18cc629
2019-09-08 13:14:43 -07:00
Xin Li
1c04d967aa [automerger skipped] Mark stage branch as merged in qt-dev.
am: 5775b852a7 -s ours
am skip reason: change_id Ibcbd7833bec952d69841abbea827affc202941b6 with SHA1 ca767c6852 is in history

Change-Id: If270b3f6f9e197d0987ba457ad280042ff50f9ab
2019-09-06 14:55:34 -07:00
Xin Li
5775b852a7 Mark stage branch as merged in qt-dev.
Bug: 139373164
Merged-In: Ibcbd7833bec952d69841abbea827affc202941b6
Change-Id: I9b94f32253ac60194120f1299e6ae213d063977c
2019-09-06 13:41:14 -07:00
Xin Li
22d49c0644 Prepare for Android 10 Test Suite R2. 2019-09-06 10:33:42 -07:00
Xin Li
d00be03300 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 409c0dd705 -s ours
am: e89f62e446

Change-Id: I408d0d9bdb1c13599e8e6ef3c5d319bb7157c653
2019-09-05 11:46:49 -07:00
Xin Li
e89f62e446 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"
am: 409c0dd705 -s ours
am skip reason: subject contains skip directive

Change-Id: I85a7864b8decff98e61982550d187229ee5ee7e4
2019-09-05 11:22:49 -07:00
Xin Li
409c0dd705 Merge "DO NOT MERGE - Merge Android 10 into master" 2019-09-05 16:53:35 +00:00
Xin Li
ada8c2f0b5 DO NOT MERGE - Merge Android 10 into master
Bug: 139893257
Change-Id: Ifd3b99660fd3d2bf4b00dad4d30a7bdbfa35f0fc
2019-09-04 13:32:52 -07:00
Android Build Merger (Role)
1d25609428 Merge "[automerger skipped] Merge "Add test for WifiInfo#getFrequency()" into qt-dev am: fd409edeca -s ours am: 26e815023f -s ours am skip reason: change_id Ie99011acbbe66e9088f73964fd0c39d640594011 with SHA1 9c97c58656 is in history" into qt-r1-dev-plus-aosp 2019-08-29 03:51:02 +00:00
Remi NGUYEN VAN
7db79fe5e6 [automerger skipped] Merge "Add test for WifiInfo#getFrequency()" into qt-dev am: fd409edeca -s ours
am: 26e815023f -s ours
am skip reason: change_id Ie99011acbbe66e9088f73964fd0c39d640594011 with SHA1 9c97c58656 is in history

Change-Id: I05aecfee12cd4395732ac8c8de8d6e465b897edc
2019-08-28 20:50:40 -07:00
Remi NGUYEN VAN
446037544b [automerger skipped] Merge "Add test for WifiInfo#getFrequency()" into qt-dev am: fd409edeca
am: 09f277d4d8 -s ours
am skip reason: change_id Ie99011acbbe66e9088f73964fd0c39d640594011 with SHA1 9c97c58656 is in history

Change-Id: I7dd987e4099be7b2ea8b64495bf011f4e6c09513
2019-08-28 20:50:38 -07:00
Remi NGUYEN VAN
26e815023f [automerger skipped] Merge "Add test for WifiInfo#getFrequency()" into qt-dev
am: fd409edeca -s ours
am skip reason: change_id Ie99011acbbe66e9088f73964fd0c39d640594011 with SHA1 9c97c58656 is in history

Change-Id: I8e124374d711efc51b752c14f8a0ee524d3fb53e
2019-08-28 20:38:57 -07:00
Remi NGUYEN VAN
09f277d4d8 Merge "Add test for WifiInfo#getFrequency()" into qt-dev
am: fd409edeca

Change-Id: Iae0f61f999c113546eb425e26db5d4d4c0c1a51c
2019-08-28 20:35:43 -07:00
TreeHugger Robot
fd409edeca Merge "Add test for WifiInfo#getFrequency()" into qt-dev 2019-08-29 03:17:58 +00:00
Chalard Jean
911079a493 Merge "[automerger skipped] Merge "Merge "Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b" into oreo-mr1-cts-dev am: acfa8b7bb7" into pie-cts-dev am: 3a915f2921 -s ours am: 97c35de59a -s ours am: 37c92ec10c -s ours
am: df298b6c9f -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I3371b4d2c3c5adf4e73fccf101b544759ce07639
2019-08-28 18:46:18 -07:00
markchien
718f123cfc Merge "Merge "Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am: 4f182df10a -s ours am: c347654003 -s ours am: 0cfcb1a472 -s ours am: ddbd12377c -s ours
am: dad9c8a980 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I3eef4d82eb1426061122ec3dba410e38ae37c349
2019-08-28 18:44:19 -07:00
markchien
7526bf0f92 Merge "Merge "Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours am: ddb681cafe -s ours am: ddce521efa -s ours am: 8fe93b6bda -s ours
am: f2e8130635 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: Ie2500561329bba3cab6b6bab5851d080b0170b97
2019-08-28 17:33:23 -07:00
Chalard Jean
df298b6c9f Merge "[automerger skipped] Merge "Merge "Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b" into oreo-mr1-cts-dev am: acfa8b7bb7" into pie-cts-dev am: 3a915f2921 -s ours am: 97c35de59a -s ours
am: 37c92ec10c -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I3fe3275c1145789b9b3a4e0ce9db26c97ca479c4
2019-08-28 17:27:13 -07:00
markchien
dad9c8a980 Merge "Merge "Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am: 4f182df10a -s ours am: c347654003 -s ours am: 0cfcb1a472 -s ours
am: ddbd12377c -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I3ccc63a60e9fa465f391b1378b6b7be0c4749286
2019-08-28 17:25:17 -07:00
markchien
0cb9eae765 Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours am: 7ff168c7a1 -s ours am: 07e500dd00 -s ours
am: 10d149e4bc -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: Ia21904b4bcd6d02f516416fdeb712082735941be
2019-08-28 15:25:00 -07:00
Chalard Jean
37c92ec10c Merge "[automerger skipped] Merge "Merge "Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b" into oreo-mr1-cts-dev am: acfa8b7bb7" into pie-cts-dev am: 3a915f2921 -s ours
am: 97c35de59a -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I649b7cd056f818394e1887da217fed735c1809e3
2019-08-28 15:12:44 -07:00
markchien
ddbd12377c Merge "Merge "Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am: 4f182df10a -s ours am: c347654003 -s ours
am: 0cfcb1a472 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: I10deed57736172e6e54abcb032ad27b8caa0295b
2019-08-28 15:10:41 -07:00
markchien
f2e8130635 Merge "Merge "Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours am: ddb681cafe -s ours am: ddce521efa -s ours
am: 8fe93b6bda -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: I4fad6af42f1e70e940729e6463e762cb197b6483
2019-08-28 15:08:22 -07:00
markchien
10d149e4bc Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours am: 7ff168c7a1 -s ours
am: 07e500dd00 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: Id67a80017c90ace63ff1846114eafcd1adb8d1c3
2019-08-28 14:39:33 -07:00
markchien
8fe93b6bda Merge "Merge "Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours am: ddb681cafe -s ours
am: ddce521efa -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: I4fb6aa5ec81287040bba2c213a5f06024bd6eddf
2019-08-28 14:24:50 -07:00
markchien
07e500dd00 Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours
am: 7ff168c7a1 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: Ibb2e82ee1d02bb22abe5a10b0e48c80bf7f047cf
2019-08-28 13:56:23 -07:00
Chalard Jean
12a7d3fb17 [automerger skipped] [automerger] Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07 am: f515825b13 am: 0fc63b9a32 am: 44d2051887 am: 8ea6a7e0c3 am: 503542058b am: b8ab60bcc2 am: 2a1a1ca5ca am: cfca80540f
am: fc63596439 -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: Ifc70e95d58b292dd1fff80bb8cf58de5893db0ef
2019-08-27 18:28:31 -07:00
markchien
74be0f2027 [automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 98a30a1eec -s ours am: e693a1fd0f -s ours am: f37b8ca988 -s ours am: 02ec1bfb0c -s ours am: dd9de69fa9 -s ours
am: b9184953f6 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I9fc414222deda6e234b5dfd148036fdbfb653322
2019-08-27 18:19:46 -07:00
Chalard Jean
fc63596439 [automerger] Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07 am: f515825b13 am: 0fc63b9a32 am: 44d2051887 am: 8ea6a7e0c3 am: 503542058b am: b8ab60bcc2 am: 2a1a1ca5ca
am: cfca80540f

Change-Id: I884b39bdaad5e5db330e5aa0c93a9d8b200e9321
2019-08-27 18:14:43 -07:00
markchien
b9184953f6 [automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 98a30a1eec -s ours am: e693a1fd0f -s ours am: f37b8ca988 -s ours am: 02ec1bfb0c -s ours
am: dd9de69fa9 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I25d1ae42e9af624b6fad6cc4c05449af1a286d94
2019-08-27 18:13:37 -07:00
Chalard Jean
0bb467ab00 [automerger skipped] [automerger] Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07 am: f515825b13 am: 0fc63b9a32 am: 44d2051887 am: 8ea6a7e0c3 am: 503542058b am: b8ab60bcc2 am: 2a1a1ca5ca am: cfca80540f -s ours
am: 51a055b74f -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: Ic6a073e1ca1ef807a4d09bfc058a80e43981fa91
2019-08-27 18:12:26 -07:00
markchien
c5f02a7347 [automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 98a30a1eec -s ours am: e693a1fd0f -s ours am: f37b8ca988 -s ours am: 02ec1bfb0c -s ours am: dd9de69fa9 -s ours
am: 9ccbe8219b -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I50b01dd298c9a2209c7de139dedb179496cc1a97
2019-08-27 18:11:22 -07:00