Android Build Merger (Role)
70171fe46e
[automerger] Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 am: 6d52324524 am: 87ad8f6dcb
...
Change-Id: I3d0bb181be9a6850c04c414c00caa34357af64c2
2018-04-09 23:48:48 +00:00
Android Build Merger (Role)
bbfa5d23a9
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours skipped: 151750d842 skipped: d1811f0384
...
Change-Id: Iab81c84291e17c1124aa3e02f6a53515585a11e7
2018-04-09 23:47:01 +00:00
Ray Essick
6d52324524
Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev
...
am: 7f0c5e7da8
2018-04-09 16:46:34 -07:00
Ray Essick
151750d842
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
...
am: 2215338715 -s ours
Change-Id: Ie4d139a1eb1c5fc6506bb79861ffe81fed7c0157
2018-04-09 16:46:17 -07:00
Treehugger Robot
7f0c5e7da8
Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev
...
* changes:
DO NOT MERGE CTS for presence of avc fix for b/70897454
DO NOT MERGE Add CTS test for URI fix.
DO NOT MERGE CTS additions for b/72165027
DO NOT MERGE CTS tests for b/70897394
2018-04-09 23:26:06 +00:00
Adam Vartanian
ac7531ccb4
DO NOT MERGE Add CTS test for URI fix.
...
Bug: 71360761
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: I09a156040d4970b7b2f973e9bffcfc97a8ff2274
(cherry picked from commit 85156429a2
2018-04-09 14:43:20 -07:00
Android Build Merger (Role)
67ae9d3245
[automerger] Add CTS test for URI fix. am: 85156429a2 am: 27914625b1 am: 662ce9724a
...
Change-Id: I29da2e67aa8c3ec9bde0d72c91ada85f160e39d9
2018-01-31 11:17:19 +00:00
Android Build Merger (Role)
27914625b1
[automerger] Add CTS test for URI fix. am: 85156429a2
...
Change-Id: Iedd07e900b8512737df2d0d6ca33920ef9bfd30b
2018-01-31 11:17:09 +00:00
Adam Vartanian
85156429a2
Add CTS test for URI fix.
...
Bug: 71360761
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: I09a156040d4970b7b2f973e9bffcfc97a8ff2274
2018-01-31 10:47:13 +00:00
Android Merger
edf8250d28
Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev am: 27e23e96ca am: 326fcb43e5
...
am: e98d4f9f59
Change-Id: I8c851ce455f33edf9b949769c409f9484d905500
2018-01-12 00:17:09 +00:00
Adam Vartanian
eb712f2808
DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 18e3114317
...
am: b7a93eb721
Change-Id: I758fa1d489e64c82465443cc6f91a23673060d7d
2018-01-12 00:16:34 +00:00
Android Merger
326fcb43e5
Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev
...
am: 27e23e96ca
2018-01-12 00:08:17 +00:00
Adam Vartanian
18e3114317
DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours
...
am: 181a10e364
2018-01-12 00:07:35 +00:00
Android Merger
27e23e96ca
Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev
...
* changes:
Merge changes from topic "l1" into lollipop-mr1-cts-dev am: ba3927948d36c5e0d87f
2018-01-11 23:56:54 +00:00
Adam Vartanian
b0ba87dd9b
Merge changes from topic "l1" into lollipop-mr1-cts-dev
...
am: ba3927948d
2018-01-11 23:56:45 +00:00
Adam Vartanian
181a10e364
DO NOT MERGE Add CTS test for URI fix.
...
am: 36c5e0d87f
2018-01-11 23:56:40 +00:00
Treehugger Robot
ba3927948d
Merge changes from topic "l1" into lollipop-mr1-cts-dev
...
* changes:
DO NOT MERGE Add CTS test for URI fix.
DO NOT MERGE Add EffectBundleTest
DO NOT MERGE Add CTS test for cve_2017_0852_b_62815506
2018-01-11 23:52:44 +00:00
Adam Vartanian
36c5e0d87f
DO NOT MERGE Add CTS test for URI fix.
...
Bug: 68341964
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: If532123542155ea3be281044a3ea4ca0b6cf2db5
(cherry picked from commit a01da8536c
2018-01-11 15:18:47 -08:00
Adam Vartanian
017cac1442
Merge changes from topic "mm" into marshmallow-cts-dev am: 2996702607 am: 3f2c592c8d
...
am: b7279d7562
Change-Id: I1e4f6c9b0a217422b8f9b8a3d031d6f4c5c25592
2018-01-10 19:29:58 +00:00
Adam Vartanian
6f4857d900
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: 8db54315a0
...
am: c0411106a9
Change-Id: I9b4f33e8726faeedc3e00d00a1ff69826e7467f4
2018-01-10 19:29:33 +00:00
Adam Vartanian
3f2c592c8d
Merge changes from topic "mm" into marshmallow-cts-dev
...
am: 2996702607
2018-01-10 19:14:55 +00:00
Adam Vartanian
8db54315a0
DO NOT MERGE Add CTS test for URI fix.
...
am: 1efb5151db
2018-01-10 19:14:49 +00:00
Treehugger Robot
2996702607
Merge changes from topic "mm" into marshmallow-cts-dev
...
* changes:
DO NOT MERGE Add CTS test for URI fix.
DO NOT MERGE Add EffectBundleTest
DO NOT MERGE resolve merge conflicts of 4e1d862763 to mnc-dev
DO NOT MERGE Add CTS test for cve_2017_0852_b_62815506
2018-01-10 19:05:55 +00:00
Adam Vartanian
1efb5151db
DO NOT MERGE Add CTS test for URI fix.
...
Bug: 68341964
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: If532123542155ea3be281044a3ea4ca0b6cf2db5
(cherry picked from commit a01da8536c
2018-01-08 12:52:51 -08:00
Adam Vartanian
5d8ba63f42
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa
...
am: c210cc1a90
Change-Id: I276a0be85c41f823506fc8397050d406257324e9
2017-11-07 21:26:57 +00:00
Adam Vartanian
73105d42aa
Add CTS test for URI fix. am: a01da8536c
...
am: b1b5379591
2017-11-07 20:49:55 +00:00
Adam Vartanian
b1b5379591
Add CTS test for URI fix.
...
am: a01da8536c
2017-11-07 20:40:20 +00:00
Adam Vartanian
a01da8536c
Add CTS test for URI fix.
...
Bug: 68341964
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: If532123542155ea3be281044a3ea4ca0b6cf2db5
2017-11-07 14:02:08 +00:00
Tina Zhou
576bfa9242
Merge "Add test to check sock addr in qtaguid ctrl file" into marshmallow-cts-dev am: 8482d8c85c am: 766fa6a623
...
am: 14a394402f
Change-Id: I5586b1f18e12f0022040de044ad1291b642dbf9e
2017-07-13 21:17:09 +00:00
Tina Zhou
766fa6a623
Merge "Add test to check sock addr in qtaguid ctrl file" into marshmallow-cts-dev
...
am: 8482d8c85c
Change-Id: I2fefc3090844c2ed9be8434ad0d0bcd11af13d08
2017-07-13 21:02:32 +00:00
Chenbo Feng
ba65ffc462
Add test to check sock addr in qtaguid ctrl file
...
This test verifies the socket address information is not leaked by
xt_qtaguid module inside the kernel. The sock_addr parsed from
proc/net/xt_qtaguid/ctrl file should always be 0
Bug: 62489688
Test: in cts-tf: run cts --package android.net.native
2017-06-28 13:47:30 -07:00
Nicolas Boichat
c4df82d292
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 5696846426
...
am: ffe4cefe73
Change-Id: Ib17900cfd7e3371c6afb703c956dd9d4aa7e26f1
2016-10-17 22:04:33 +00:00
Nicolas Boichat
5696846426
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test
...
am: 36c0f02d94
2016-10-17 21:50:57 +00:00
Nicolas Boichat
36c0f02d94
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test
...
Since Linux kernel 4.2, net.ipv6.auto_flowlabels is set by default, and
therefore the request and reply may have different IPv6 flow label.
Bug: 31444338
Test: On a kernel 4.4 board, run com.android.cts.net.HostsideNetworkTests#testVpn
Test: On a kernel 3.18 board, run echo 1 > /proc/sys/net/ipv6/auto_flowlabels, then
com.android.cts.net.HostsideNetworkTests#testVpn
Change-Id: I913bbf91574239a24cb32ae908834eb951ea2010
2016-09-13 17:32:40 +08:00
Jun Tahara
fd1fb4d863
Merge \\\"Remove non-CTS packets assertion code\\\" into marshmallow-cts-dev am: 0ba763ab98 am: 6ce150c6ae
...
am: 5c4a3982a8
Change-Id: Idcd4a248c8f74e095ba4162d8a468dbd962c8163
2016-06-22 00:14:51 +00:00
Jun Tahara
6ce150c6ae
Merge \"Remove non-CTS packets assertion code\" into marshmallow-cts-dev
...
am: 0ba763ab98
Change-Id: I9d9549d4388af53475a0457f7be1d55d88d5e72d
2016-06-22 00:09:33 +00:00
Jun Tahara
349f7ed040
Remove non-CTS packets assertion code
...
Symptom:
testTrafficStatsForLocalhost fails when applications or services
except CTS are using network.
Root cause:
testTrafficStatsForLocalhost can't calculate the number of
non-localhost packets for CTS.
It includes the all of packets for applications/services except CTS
and non-localhost packets for CTS.
Solution:
Remove this assertion and only logging the number of packets.
Change-Id: I49243d59f359f3a543c6bdb46f6a2645cde8f292
2016-06-20 17:50:39 +09:00
Marcus Nascimento
01c938ccb7
Merge "Merge "Add assertion messages to testStartUsingNetworkFeature_enableHipri." into lollipop-mr1-cts-dev am: 92849de21f -s ours" into marshmallow-cts-dev am: a6aa5bce79 am: 9ef251d523
...
am: 1ad52d8800
* commit '1ad52d8800d39194d738a0d805de134a833b412c':
Add assertion messages to testStartUsingNetworkFeature_enableHipri.
Change-Id: I5fe5ef00893350a7bf0d52176c0dc451d9e089a9
2016-05-19 18:09:28 +00:00
Marcus Nascimento
9ef251d523
Merge "Merge "Add assertion messages to testStartUsingNetworkFeature_enableHipri." into lollipop-mr1-cts-dev am: 92849de21f -s ours" into marshmallow-cts-dev
...
am: a6aa5bce79
2016-05-19 17:54:53 +00:00
Android Merger
a6aa5bce79
Merge "Merge "Add assertion messages to testStartUsingNetworkFeature_enableHipri." into lollipop-mr1-cts-dev am: 92849de21f -s ours" into marshmallow-cts-dev
2016-05-19 17:28:36 +00:00
Marcus Nascimento
8074918f7f
Merge "Add assertion messages to testStartUsingNetworkFeature_enableHipri." into lollipop-mr1-cts-dev
...
am: 92849de21f
2016-05-19 17:28:26 +00:00
Daniel Xie
92849de21f
Merge "Add assertion messages to testStartUsingNetworkFeature_enableHipri." into lollipop-mr1-cts-dev
2016-05-19 16:39:30 +00:00
Marcus Nascimento
f9185c256f
Merge "Merge "Add assertion message to assertions for testExecute_withMobile." into lollipop-mr1-cts-dev am: ce158e65ae -s ours" into marshmallow-cts-dev am: 90419fc992 am: 4699aa522a
...
am: 69db501b63
* commit '69db501b632720dda1e5aba0ac8aa676f11247e8':
Add assertion message to assertions for testExecute_withMobile.
Change-Id: I17fe6ca042b8ec387e082ef475538933e1e9a33c
2016-04-29 11:12:32 +00:00
Marcus Nascimento
4699aa522a
Merge "Merge "Add assertion message to assertions for testExecute_withMobile." into lollipop-mr1-cts-dev am: ce158e65ae -s ours" into marshmallow-cts-dev
...
am: 90419fc992
2016-04-29 11:05:01 +00:00
Android Merger
90419fc992
Merge "Merge "Add assertion message to assertions for testExecute_withMobile." into lollipop-mr1-cts-dev am: ce158e65ae -s ours" into marshmallow-cts-dev
2016-04-29 10:59:36 +00:00
Marcus Nascimento
5d6e8323f6
Merge "Add assertion message to assertions for testExecute_withMobile." into lollipop-mr1-cts-dev
...
am: ce158e65ae
2016-04-29 10:59:28 +00:00
Daniel Xie
ce158e65ae
Merge "Add assertion message to assertions for testExecute_withMobile." into lollipop-mr1-cts-dev
2016-04-28 16:44:37 +00:00
Marcus Nascimento
51eb8c19a0
Add assertion message to assertions for testExecute_withMobile.
...
Some partner test devices without a SIM Card or with no signal, thus
without mobile network data connection.
Added a message to check signal and SIM card and rerun the test.
Also added a verification that the network type is supported in the
event of a Connectivity Action's timeout. Unsuported network type could
be caused by a network stack crash.
Bug: 28207677
Change-Id: Ibca50359df7d5fb8371f4f4037fc81f029f48b30
2016-04-28 16:40:31 +00:00
Marcus Nascimento
335856c1d3
Add assertion messages to testStartUsingNetworkFeature_enableHipri.
...
testStartUsingNetworkFeature_enableHipri should be able to reconnect to Wifi Network.
Added a prefix to the already defined error message to rerun the test.
The ConnectivityManager's startUsingNetworkFeature will fail without SIM card and/or signal.
Changed the error message to check SIM card and signal and rerun the test.
Bug: 28264205
Change-Id: Ia1b35cab11afa65ae93ea7dab2f7cc3a330d8471
2016-04-26 11:32:30 +01:00
Owain Davies
03995235ba
Merge "Merge "Add assertion message if testDns ipv6 lookup reutrns ipv4." into lollipop-mr1-cts-dev am: b996de8" into marshmallow-cts-dev am: 48216c2 am: 275a0e6
...
am: 4be27c8
* commit '4be27c8e8497987720d58494a330484648e72caa':
Add assertion message if testDns ipv6 lookup reutrns ipv4.
Change-Id: I03a0a86365929a6bdc8eb2815229341eb7a6a311
2016-04-23 06:19:47 +00:00
