LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,773 Commits 2 Branches 0 Tags
f8bea674e2f3c32b9da1ec402ee65a0df024a5cb
Commit Graph

3773 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
f8bea674e2 [automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: 7512fc4407 -s ours am: d8368c7ee9 -s ours 
am: 7b9d907b2b -s ours
am skip reason: change_id Ia414339f44c010134faf02d87bcbfba140165398 with SHA1 6e1b2be2f5 is in history

Change-Id: I3fcfaa9ab9b8ef8de8700aa79422e31cf11552f6
 2019-10-26 23:35:28 -07:00
Xin Li
7b9d907b2b [automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: 7512fc4407 -s ours 
am: d8368c7ee9 -s ours
am skip reason: change_id Ia414339f44c010134faf02d87bcbfba140165398 with SHA1 6e1b2be2f5 is in history

Change-Id: I7ba1d900e08829350cd929a2130c8c9ece24baf2
 2019-10-26 23:11:20 -07:00
Xin Li
d8368c7ee9 [automerger skipped] Merge "Merge Coral/Flame into AOSP master" 
am: 7512fc4407 -s ours
am skip reason: change_id Ia414339f44c010134faf02d87bcbfba140165398 with SHA1 6e1b2be2f5 is in history

Change-Id: I3340ce47ce908daab8496b6dd60a189602549703
 2019-10-26 22:48:21 -07:00
Xin Li
39ec8275f0 Merge Coral/Flame into AOSP master 
Bug: 141248619
Change-Id: Iaba32e3e94ccfbeb953807b364ab7a6264aa709a
Merged-In: Ia414339f44c010134faf02d87bcbfba140165398
 2019-10-25 10:27:45 -07:00
Bookatz
3b27402548 Merge "CTS secondary_user: CtsNativeNetTestCases" am: eae810977d am: 421f3f4eb1 
am: 09ad73a386

Change-Id: I0088b266318049c346e76d753eb60cb30344a4be
 2019-10-25 01:57:26 -07:00
Bookatz
14696298f5 Merge "CTS secondary_user: CtsNetApi23TestCases" am: 32dbf1f7e4 am: 07e89e4601 
am: bc64102b1f

Change-Id: Id25d1a1057dd1313e61bb3909de032d61527f85a
 2019-10-25 01:56:53 -07:00
Bookatz
304ff02950 Merge "CTS secondary_user: CtsNativeNetDnsTestCases" am: dcc0677c72 am: d277b9c3c4 
am: 62c2bd3167

Change-Id: Ic8b22a57e99f78572299e4d3907e3355d8d8581b
 2019-10-25 01:56:46 -07:00
Bookatz
09ad73a386 Merge "CTS secondary_user: CtsNativeNetTestCases" am: eae810977d 
am: 421f3f4eb1

Change-Id: I07e29985cee9dbcecb4e88d89adc8bf326070817
 2019-10-25 01:47:02 -07:00
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
421f3f4eb1 Merge "CTS secondary_user: CtsNativeNetTestCases" 
am: eae810977d

Change-Id: Iae22a28251b1d7cbcd6eb49567f1a3350b249cbc
 2019-10-25 01:34:37 -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
eae810977d Merge "CTS secondary_user: CtsNativeNetTestCases" 2019-10-25 08:16:47 +00: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
Bookatz
ba585050d9 CTS secondary_user: CtsNativeNetTestCases 
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: I1d904c733ed6bc52b8fe3909c34b0ad186b7fd43
 2019-10-24 09:58:43 -07:00
Junyu Lai
ba9d45f792 Merge "Set keepalive socket timeout to default value" am: 4c8baa10f9 am: 8d03ba0e98 
am: d2b77dc01c

Change-Id: I37be1fdee14d9cc5f5c12fa7474b003130840ad6
 2019-10-24 02:53:51 -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
371e2a500a DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master am: 8da12ce4c8 
am: 32b3b7aaca

Change-Id: I510acaeed29d9436db25da7497b22cddc92782c9
 2019-10-15 10:29:33 -07: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
5a8999451e Merge "getConnectionOwnerUid: add test for b/141603906" am: e8a8d9a26f am: ab361a6fbd 
am: 90190f2e14

Change-Id: If1d5335854f076ec3f5b64678c83c879f3429bce
 2019-10-08 03:39:20 -07: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
08b3a7ee0f [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: b7fab0094c -s ours 
am: f920179eaa -s ours
am skip reason: change_id I4d60d2ad06007842be6af1f2ab844917f18cc629 with SHA1 55329386a3 is in history

Change-Id: I948c2d499e46121dfce5a6ed1bad05a285ddce62
 2019-09-11 14:47:15 -07: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
cda94f4bf1 [automerger skipped] Mark stage branch as merged in qt-dev. am: 5775b852a7 -s ours am: 1c04d967aa -s ours 
am: cc92930e29 -s ours
am skip reason: change_id Ibcbd7833bec952d69841abbea827affc202941b6 with SHA1 ca767c6852 is in history

Change-Id: Ibbc4e0b751f0636a976b9f35d908fcec4ec328f9
 2019-09-08 18:53:20 -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
02eb568b35 [automerger skipped] Mark stage branch as merged in qt-dev. am: 5775b852a7 -s ours am: 1c04d967aa -s ours 
am: 525d2c8ccf -s ours
am skip reason: change_id Ibcbd7833bec952d69841abbea827affc202941b6 with SHA1 ca767c6852 is in history

Change-Id: Idc75529282a8f621473d73f6c52a142f7cb01759
 2019-09-07 18:37:30 -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
710c96d876 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 409c0dd705 -s ours am: e89f62e446 
am: d00be03300

Change-Id: I327521e376846cd573726289469ce2a87b17a1b5
 2019-09-05 12:05:50 -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
Remi NGUYEN VAN
e8c6850fcf Merge "[automerger skipped] Merge "Add test for WifiInfo#getFrequency()" into qt-dev am: fd409edeca -s ours am: 26e815023f -s ours 
am: 1d25609428 -s ours
am skip reason: change_id Ie99011acbbe66e9088f73964fd0c39d640594011 with SHA1 9c97c58656 is in history

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

Change-Id: I320a0a54a5220c69691fb6e5cec673b7b8769994
 2019-08-28 20:56:39 -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