Commit Graph

4752 Commits

Author SHA1 Message Date
TreeHugger Robot
5148deeb60 [automerger skipped] Merge "Add a first NetworkAgent CTS test" into rvc-dev am: 7aef439cc3 am: e82a6d2963 -s ours am: 9cad20f2c4 -s ours am: 8118cf0ea2 -s ours
am skip reason: Change-Id I022c9e237fdaec27338047c171c04e5a96cf89e3 with SHA-1 21793bad18 is in history

Change-Id: I550956425f6cf13e3debb8a10f06cb373c5e17cd
2020-04-11 07:50:21 +00:00
TreeHugger Robot
8118cf0ea2 [automerger skipped] Merge "Add a first NetworkAgent CTS test" into rvc-dev am: 7aef439cc3 am: e82a6d2963 -s ours am: 9cad20f2c4 -s ours
am skip reason: Change-Id I022c9e237fdaec27338047c171c04e5a96cf89e3 with SHA-1 21793bad18 is in history

Change-Id: If5be4a97fba01a70035030191b00323cb6cd36c2
2020-04-11 07:41:56 +00:00
TreeHugger Robot
9cad20f2c4 [automerger skipped] Merge "Add a first NetworkAgent CTS test" into rvc-dev am: 7aef439cc3 am: e82a6d2963 -s ours
am skip reason: Change-Id I022c9e237fdaec27338047c171c04e5a96cf89e3 with SHA-1 21793bad18 is in history

Change-Id: Ie5bc97f04bf58e87257f9ab277a1365e24a22158
2020-04-11 07:25:06 +00:00
TreeHugger Robot
7aef439cc3 Merge "Add a first NetworkAgent CTS test" into rvc-dev 2020-04-11 06:42:14 +00:00
Xin Li
f8a66198cb [automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master" into stage-aosp-master am: e13a501ba6 -s ours am: cc5bd7d948 am: 5279a35cd6 am: 76f5d91f6a -s ours
am skip reason: subject contains skip directive

Change-Id: I89a98a54349951fe6b042442ad19e905b80ee51a
2020-04-10 20:06:58 +00:00
Xin Li
76f5d91f6a [automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master" into stage-aosp-master am: e13a501ba6 -s ours am: cc5bd7d948 am: 5279a35cd6
Change-Id: Ib1ae61b061019da38efacb748f8b35d44f0ab35c
2020-04-10 19:46:40 +00:00
Xin Li
5279a35cd6 [automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master" into stage-aosp-master am: e13a501ba6 -s ours am: cc5bd7d948
Change-Id: Ie10afa51c0691d213ce8f0c754f6079898a19947
2020-04-10 19:27:42 +00:00
Xin Li
cc5bd7d948 [automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master" into stage-aosp-master am: e13a501ba6 -s ours
am skip reason: subject contains skip directive

Change-Id: Icf0f3f47d9dc070181b20d7bb3f8c40024a8da71
2020-04-10 19:07:16 +00:00
TreeHugger Robot
28578a46bc [automerger skipped] Merge "Add ProxyInfoTest to test public APIs" into rvc-dev am: df4747a13e -s ours am: f38823072d -s ours am: 257a3d716d -s ours am: 7a44189035 -s ours
am skip reason: Change-Id I451989f7312fb98ec2fa0b7b9ddc856ecf2087be with SHA-1 b03df59c70 is in history

Change-Id: I25aa3674af0616cfd2c8169473dcbefdfd062b6e
2020-04-10 13:55:58 +00:00
TreeHugger Robot
3c5b362e19 [automerger skipped] Merge "CTS test for DhcpInfo parcel/unparcel" into rvc-dev am: 3e89fdbc56 -s ours am: 87e99aee67 -s ours am: 48237c596b -s ours am: a617d2e398 -s ours
am skip reason: Change-Id I076241072688fca37b8451873183f9597bc5fe79 with SHA-1 2648ad46fe is in history

Change-Id: Icba74a30c844510f90fa55f57533132026fb9863
2020-04-10 13:55:49 +00:00
TreeHugger Robot
7e71d30b36 [automerger skipped] Merge "Refactor assertion into assertInRange() method" into rvc-dev am: 59be915eeb -s ours am: abc3bcaa67 -s ours am: 7dac5a787e -s ours am: ef252fb8dd -s ours
am skip reason: Change-Id I6d939dd62cad3d6ba23a3c5ca7b1e6a8b4131a90 with SHA-1 2b1fbd6404 is in history

Change-Id: I78a86145bc54417a648b6764a76bc21889b50453
2020-04-10 13:55:31 +00:00
TreeHugger Robot
2d397556a2 [automerger skipped] Merge "Add ProxyInfoTest to test public APIs" into rvc-dev am: df4747a13e am: da6b514147 -s ours am: 0261691494 -s ours am: 0f54262782 -s ours
am skip reason: Change-Id I451989f7312fb98ec2fa0b7b9ddc856ecf2087be with SHA-1 b03df59c70 is in history

Change-Id: I5c8314b03955b6ab9fd162cb9bc49d3b99844558
2020-04-10 13:55:23 +00:00
TreeHugger Robot
dafb9d9891 [automerger skipped] Merge "CTS test for DhcpInfo parcel/unparcel" into rvc-dev am: 3e89fdbc56 am: 6863db0b44 -s ours am: f3fa69a1a7 -s ours am: 768b8c6415 -s ours
am skip reason: Change-Id I076241072688fca37b8451873183f9597bc5fe79 with SHA-1 2648ad46fe is in history

Change-Id: I5c3e56e9ffb24ab4630edc1753568e0ed4d94891
2020-04-10 13:55:15 +00:00
TreeHugger Robot
458c67637c [automerger skipped] Merge "Refactor assertion into assertInRange() method" into rvc-dev am: 59be915eeb am: 580a16ef02 -s ours am: e69adfc786 -s ours am: b826678302 -s ours
am skip reason: Change-Id I6d939dd62cad3d6ba23a3c5ca7b1e6a8b4131a90 with SHA-1 cb68d1cd09 is in history

Change-Id: I997eeacc9034393eed3df65a38419331f1a6100c
2020-04-10 13:55:02 +00:00
TreeHugger Robot
7a44189035 [automerger skipped] Merge "Add ProxyInfoTest to test public APIs" into rvc-dev am: df4747a13e -s ours am: f38823072d -s ours am: 257a3d716d -s ours
am skip reason: Change-Id I451989f7312fb98ec2fa0b7b9ddc856ecf2087be with SHA-1 b03df59c70 is in history

Change-Id: I72a62d8cbac10538175dac6c8ddf79dd37d5153f
2020-04-10 13:30:30 +00:00
TreeHugger Robot
a617d2e398 [automerger skipped] Merge "CTS test for DhcpInfo parcel/unparcel" into rvc-dev am: 3e89fdbc56 -s ours am: 87e99aee67 -s ours am: 48237c596b -s ours
am skip reason: Change-Id I076241072688fca37b8451873183f9597bc5fe79 with SHA-1 2648ad46fe is in history

Change-Id: I8d4ad675954d81622c794718bcae4a051f7c54cf
2020-04-10 13:30:23 +00:00
TreeHugger Robot
ef252fb8dd [automerger skipped] Merge "Refactor assertion into assertInRange() method" into rvc-dev am: 59be915eeb -s ours am: abc3bcaa67 -s ours am: 7dac5a787e -s ours
am skip reason: Change-Id I6d939dd62cad3d6ba23a3c5ca7b1e6a8b4131a90 with SHA-1 2b1fbd6404 is in history

Change-Id: I49234a48dd6c2957dd7ee80dde7e1cbe7f2f44f1
2020-04-10 13:30:17 +00:00
TreeHugger Robot
0f54262782 [automerger skipped] Merge "Add ProxyInfoTest to test public APIs" into rvc-dev am: df4747a13e am: da6b514147 -s ours am: 0261691494 -s ours
am skip reason: Change-Id I451989f7312fb98ec2fa0b7b9ddc856ecf2087be with SHA-1 b03df59c70 is in history

Change-Id: I6e902b2309e3409c9c405a2a20e7f5dd330dba78
2020-04-10 13:30:11 +00:00
TreeHugger Robot
768b8c6415 [automerger skipped] Merge "CTS test for DhcpInfo parcel/unparcel" into rvc-dev am: 3e89fdbc56 am: 6863db0b44 -s ours am: f3fa69a1a7 -s ours
am skip reason: Change-Id I076241072688fca37b8451873183f9597bc5fe79 with SHA-1 2648ad46fe is in history

Change-Id: Ie5ab9e879adcf81f8582555b35452da814f45580
2020-04-10 13:30:03 +00:00
TreeHugger Robot
b826678302 [automerger skipped] Merge "Refactor assertion into assertInRange() method" into rvc-dev am: 59be915eeb am: 580a16ef02 -s ours am: e69adfc786 -s ours
am skip reason: Change-Id I6d939dd62cad3d6ba23a3c5ca7b1e6a8b4131a90 with SHA-1 cb68d1cd09 is in history

Change-Id: I38252b65405a05957f42dce2053d1c2d7e30e8fa
2020-04-10 13:29:54 +00:00
TreeHugger Robot
257a3d716d [automerger skipped] Merge "Add ProxyInfoTest to test public APIs" into rvc-dev am: df4747a13e -s ours am: f38823072d -s ours
am skip reason: Change-Id I451989f7312fb98ec2fa0b7b9ddc856ecf2087be with SHA-1 b03df59c70 is in history

Change-Id: Ic0a96e327dbbc6b1fd1f662c645b5b4ceb4885c4
2020-04-10 13:07:40 +00:00
TreeHugger Robot
48237c596b [automerger skipped] Merge "CTS test for DhcpInfo parcel/unparcel" into rvc-dev am: 3e89fdbc56 -s ours am: 87e99aee67 -s ours
am skip reason: Change-Id I076241072688fca37b8451873183f9597bc5fe79 with SHA-1 2648ad46fe is in history

Change-Id: Id6cbad86f06088af181dd3460f4a6902b5fd9d14
2020-04-10 13:07:32 +00:00
TreeHugger Robot
7dac5a787e [automerger skipped] Merge "Refactor assertion into assertInRange() method" into rvc-dev am: 59be915eeb -s ours am: abc3bcaa67 -s ours
am skip reason: Change-Id I6d939dd62cad3d6ba23a3c5ca7b1e6a8b4131a90 with SHA-1 2b1fbd6404 is in history

Change-Id: Ic18699ce15cc699783828b26e3a722e72156d8c9
2020-04-10 13:07:17 +00:00
TreeHugger Robot
0261691494 [automerger skipped] Merge "Add ProxyInfoTest to test public APIs" into rvc-dev am: df4747a13e am: da6b514147 -s ours
am skip reason: Change-Id I451989f7312fb98ec2fa0b7b9ddc856ecf2087be with SHA-1 b03df59c70 is in history

Change-Id: I55376bfabc292607870659799e3a7947ceefb294
2020-04-10 13:06:58 +00:00
TreeHugger Robot
f3fa69a1a7 [automerger skipped] Merge "CTS test for DhcpInfo parcel/unparcel" into rvc-dev am: 3e89fdbc56 am: 6863db0b44 -s ours
am skip reason: Change-Id I076241072688fca37b8451873183f9597bc5fe79 with SHA-1 2648ad46fe is in history

Change-Id: I04d101ea3e27ee73b9eb83a863110d574bfd2372
2020-04-10 13:06:49 +00:00
TreeHugger Robot
e69adfc786 [automerger skipped] Merge "Refactor assertion into assertInRange() method" into rvc-dev am: 59be915eeb am: 580a16ef02 -s ours
am skip reason: Change-Id I6d939dd62cad3d6ba23a3c5ca7b1e6a8b4131a90 with SHA-1 cb68d1cd09 is in history

Change-Id: I20a76c7b2d7a14ef32bcf1703cf6955710b4f360
2020-04-10 13:05:39 +00:00
TreeHugger Robot
f38823072d [automerger skipped] Merge "Add ProxyInfoTest to test public APIs" into rvc-dev am: df4747a13e -s ours
am skip reason: Change-Id I451989f7312fb98ec2fa0b7b9ddc856ecf2087be with SHA-1 b03df59c70 is in history

Change-Id: I17709eca928ca225fa06f3120b51e130032caa9e
2020-04-10 12:46:09 +00:00
TreeHugger Robot
87e99aee67 [automerger skipped] Merge "CTS test for DhcpInfo parcel/unparcel" into rvc-dev am: 3e89fdbc56 -s ours
am skip reason: Change-Id I076241072688fca37b8451873183f9597bc5fe79 with SHA-1 2648ad46fe is in history

Change-Id: If0a8fe299a299890f8d391b287a854f25de111dd
2020-04-10 12:45:45 +00:00
TreeHugger Robot
abc3bcaa67 [automerger skipped] Merge "Refactor assertion into assertInRange() method" into rvc-dev am: 59be915eeb -s ours
am skip reason: Change-Id I6d939dd62cad3d6ba23a3c5ca7b1e6a8b4131a90 with SHA-1 cb68d1cd09 is in history

Change-Id: I938b8f0fce04019e9955fd10ed2363c4bf2336ca
2020-04-10 12:45:37 +00:00
TreeHugger Robot
df4747a13e Merge "Add ProxyInfoTest to test public APIs" into rvc-dev 2020-04-10 12:22:55 +00:00
TreeHugger Robot
3e89fdbc56 Merge "CTS test for DhcpInfo parcel/unparcel" into rvc-dev 2020-04-10 12:20:04 +00:00
TreeHugger Robot
59be915eeb Merge "Refactor assertion into assertInRange() method" into rvc-dev 2020-04-10 12:18:37 +00:00
Xin Li
dbc3ccf1b5 DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master
Bug: 151763422
Change-Id: I15c5eb1b3089a082e1ff728ad3a8e9e99b087211
2020-04-09 18:41:37 -07:00
Yan Yan
4ac3bc85a1 [automerger skipped] Merge "Create build files for CtsIkeTestCases" into rvc-dev am: f462415146 -s ours am: e3e7c8c7f6 -s ours am: 5f0c8b847f -s ours am: 5fe0d65c9a -s ours
am skip reason: Change-Id I2f49fc12314ac648e8df816058d599033c822dca with SHA-1 03dfb41f8c is in history

Change-Id: Ieebd44f83cde9bf2e5e220574ba78a168d6b78b2
2020-04-10 00:36:31 +00:00
Yan Yan
f02db37ba5 [automerger skipped] Merge "Create build files for CtsIkeTestCases" into rvc-dev am: f462415146 am: 5e13ed6e10 -s ours am: 8d5dfc55a3 -s ours am: c05c65eb35 -s ours
am skip reason: Change-Id I2f49fc12314ac648e8df816058d599033c822dca with SHA-1 5c22928658 is in history

Change-Id: I4a105c6277fb3b4d5d9dcb7c5b3edc2a137b1e7a
2020-04-10 00:35:59 +00:00
Yan Yan
5fe0d65c9a [automerger skipped] Merge "Create build files for CtsIkeTestCases" into rvc-dev am: f462415146 -s ours am: e3e7c8c7f6 -s ours am: 5f0c8b847f -s ours
am skip reason: Change-Id I2f49fc12314ac648e8df816058d599033c822dca with SHA-1 03dfb41f8c is in history

Change-Id: I70c9444415512e19b51eed3690b71d7cb3779d81
2020-04-10 00:16:48 +00:00
Yan Yan
c05c65eb35 [automerger skipped] Merge "Create build files for CtsIkeTestCases" into rvc-dev am: f462415146 am: 5e13ed6e10 -s ours am: 8d5dfc55a3 -s ours
am skip reason: Change-Id I2f49fc12314ac648e8df816058d599033c822dca with SHA-1 5c22928658 is in history

Change-Id: Ifad8c6b72376953ae467264761cd5362773d0b31
2020-04-10 00:16:32 +00:00
Yan Yan
5f0c8b847f [automerger skipped] Merge "Create build files for CtsIkeTestCases" into rvc-dev am: f462415146 -s ours am: e3e7c8c7f6 -s ours
am skip reason: Change-Id I2f49fc12314ac648e8df816058d599033c822dca with SHA-1 03dfb41f8c is in history

Change-Id: I7bb9d333771ee12126788b4d47b1bf3a760971d6
2020-04-09 23:58:46 +00:00
Yan Yan
8d5dfc55a3 [automerger skipped] Merge "Create build files for CtsIkeTestCases" into rvc-dev am: f462415146 am: 5e13ed6e10 -s ours
am skip reason: Change-Id I2f49fc12314ac648e8df816058d599033c822dca with SHA-1 5c22928658 is in history

Change-Id: I554a66c0ac9bc12d264927e09f5665b0f6b146ac
2020-04-09 23:57:22 +00:00
Yan Yan
e3e7c8c7f6 [automerger skipped] Merge "Create build files for CtsIkeTestCases" into rvc-dev am: f462415146 -s ours
am skip reason: Change-Id I2f49fc12314ac648e8df816058d599033c822dca with SHA-1 5c22928658 is in history

Change-Id: I5908da6e730557971bf22fbf1930b4892860b98c
2020-04-09 23:36:34 +00:00
Yan Yan
f462415146 Merge "Create build files for CtsIkeTestCases" into rvc-dev 2020-04-09 23:11:24 +00:00
Aaron Huang
2b1fbd6404 Refactor assertion into assertInRange() method
It's hard to read in current design, refactor the
assertion into assertInRange() for readability.

Bug: 153614624
Test: atest android.net.cts.TrafficStatsTest
Change-Id: I6d939dd62cad3d6ba23a3c5ca7b1e6a8b4131a90
Merged-In: I6d939dd62cad3d6ba23a3c5ca7b1e6a8b4131a90
(cherry picked from commit af3469bdc7031d80f3d3838518fd7518b3e8eb9c)
2020-04-09 08:54:34 +00:00
Aaron Huang
aeee462538 Merge "Add cts test for traffic stats APIs" am: 078d412a6b am: c6b0b84684 am: 0ddd05fb08 am: ef9f0fb734 am: 2147723ba7
Change-Id: Iefc234fb85145b31a1f7842b93b4d6fc4425bab6
2020-04-09 03:26:31 +00:00
Aaron Huang
2147723ba7 Merge "Add cts test for traffic stats APIs" am: 078d412a6b am: c6b0b84684 am: 0ddd05fb08 am: ef9f0fb734
Change-Id: Iab3cc785327962b163b1e6cbfc014a18dcdd61d3
2020-04-09 03:25:32 +00:00
Aaron Huang
ef9f0fb734 Merge "Add cts test for traffic stats APIs" am: 078d412a6b am: c6b0b84684 am: 0ddd05fb08
Change-Id: If62ce9a713f49ae2528436cb0ad04446e5193724
2020-04-09 03:18:45 +00:00
Aaron Huang
7640d063eb Merge "Add cts test for traffic stats APIs" am: 078d412a6b am: c6b0b84684
Change-Id: I9737e922d46f506cd3ce910dc38d52441d4ad10f
2020-04-09 03:08:06 +00:00
Aaron Huang
0ddd05fb08 Merge "Add cts test for traffic stats APIs" am: 078d412a6b am: c6b0b84684
Change-Id: Iab88208d9e801eaa3efea3d5495f57ea044cbd44
2020-04-09 03:08:06 +00:00
Aaron Huang
c6b0b84684 Merge "Add cts test for traffic stats APIs" am: 078d412a6b
Change-Id: Ie1f53b33e2576d1906e437061fff0b7519e39966
2020-04-09 02:52:40 +00:00
Aaron Huang
078d412a6b Merge "Add cts test for traffic stats APIs" 2020-04-09 02:37:15 +00:00
Mark Chien
e3b0a5f8f7 Merge "Add testRegisterTetheringEventCallback for CtsTetheringTest" am: 742cfc0984 am: 6a50f05416 am: 51031fad9b am: 51d348d262 am: ee80ba3d85
Change-Id: I8be21f78ad6a8090830a393b18ba33387edef626
2020-04-08 15:21:49 +00:00