Jun Tahara
c8ce808664
Merge \\\\\\\"Remove non-CTS packets assertion code\\\\\\\" into marshmallow-cts-dev am: 0ba763ab98 am: 6ce150c6ae am: 5c4a3982a8 am: fd1fb4d863 am: 995005d649 am: 86ba00d2a9
...
am: 949d019a45
Change-Id: I72f38904179cb53cc9f3f22174c4831113c7674b
2016-06-22 00:26:04 +00:00
Daniel Xie
949d019a45
Merge \\\\\\"Remove non-CTS packets assertion code\\\\\\" into marshmallow-cts-dev am: 0ba763ab98 am: 6ce150c6ae am: 5c4a3982a8 am: fd1fb4d863 am: 995005d649
...
am: 86ba00d2a9
Change-Id: I5d1edb0f813aaf3aa6b4558e5ce21e6b60fa340d
2016-06-22 00:23:13 +00:00
Jun Tahara
86ba00d2a9
Merge \\\\\"Remove non-CTS packets assertion code\\\\\" into marshmallow-cts-dev am: 0ba763ab98 am: 6ce150c6ae am: 5c4a3982a8 am: fd1fb4d863
...
am: 995005d649
Change-Id: I40f34d7a22b09a4ef5a4190f2a236b643062f306
2016-06-22 00:20:07 +00: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
Lorenzo Colitti
b2235a43b1
Merge \\"Clear local test results across DNS lookups.\\" into nyc-dev am: cbdcf1d183
...
am: 0aeb28ea33
Change-Id: Id266f893a63d26adda867e7b62f23555f9bfeeac
2016-06-21 06:34:36 +00:00
Lorenzo Colitti
0aeb28ea33
Merge \"Clear local test results across DNS lookups.\" into nyc-dev
...
am: cbdcf1d183
Change-Id: Id9a662ddec527356e0c8a2850da2dabca8a44fb9
2016-06-21 06:33:08 +00:00
Lorenzo Colitti
abc35d5527
Clear local test results across DNS lookups.
...
If InetAddress.getAllByName("ipv6.google.com") throws
UnknownHostException, the test silently ignores it. This
causes a misleading failure, because the test then reuses the
addrs variable that is left over from the previous DNS query
for "www.google.com", and fails because it has an IPv4 address.
Fixes: 12210306
Bug: 29231261
Change-Id: I1dde945765d40a84eba139055306b07ebc97d0ec
2016-06-21 13:39:49 +09: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
Felipe Leme
64bc0d5dcc
Merge \\"Add non-parcelable extras to notification to make sure it does not crash the app.\\" into nyc-dev am: c72edd7a89
...
am: 5d53b301dc
Change-Id: Id1d3ea4a4170c6947c2aec1b0b304e193507babd
2016-06-16 18:38:09 +00:00
Felipe Leme
6b6f09dd70
Merge \\"Add non-parcelable extras to notification to make sure it does not crash the app.\\" into nyc-dev am: c72edd7a89
...
am: 677eb31ed4
Change-Id: I76f5d5b31abbf329d4a59d11b74020319a65bd9d
2016-06-16 18:37:39 +00:00
Felipe Leme
5d53b301dc
Merge \"Add non-parcelable extras to notification to make sure it does not crash the app.\" into nyc-dev
...
am: c72edd7a89
Change-Id: Icc8449c663d6fd97c8f8aff13afad936534a39a1
2016-06-16 18:35:13 +00:00
Felipe Leme
c3a9008e3d
Add non-parcelable extras to notification to make sure it does not crash
...
the app.
BUG: 29402928
Change-Id: I4fc47535ae14e71c50b25285b2fe5375abdb4f11
2016-06-16 10:03:27 -07:00
Lorenzo Colitti
3716ad889d
Merge \\"Log the address of the IPv4 address that causes the test to fail.\\" into nyc-dev am: db3485a45e
...
am: d1970e861b
Change-Id: I36de95956ef796b78d47d913ef74ed21e51c64f8
2016-06-09 07:56:15 +00:00
Lorenzo Colitti
d1970e861b
Merge \"Log the address of the IPv4 address that causes the test to fail.\" into nyc-dev
...
am: db3485a45e
Change-Id: Id3818163f9fef1b2ba9d7b29f6b0f84c6659625d
2016-06-09 07:53:30 +00:00
TreeHugger Robot
db3485a45e
Merge "Log the address of the IPv4 address that causes the test to fail." into nyc-dev
2016-06-09 07:46:17 +00:00
Lorenzo Colitti
1d75845bd5
Log the address of the IPv4 address that causes the test to fail.
...
Bug: 29231261
Change-Id: I6aac389d2c234091a284486422ee663119d021a9
2016-06-09 14:38:03 +09:00
Android Build Merger (Role)
f1473773c3
Merge "Merge "Changed network check URL." into nyc-dev am: 1791555ca8 am: b3f828552e" into nyc-mr1-dev-plus-aosp
2016-06-06 17:20:55 +00:00
Felipe Leme
f423da0575
Merge "Changed network check URL." into nyc-dev am: 1791555ca8
...
am: b3f828552e
* commit 'b3f828552ef01b1a22b4ce59e907dcc4e795a333':
Changed network check URL.
Change-Id: I6200217478ffe42a4ad8b7c8bcdedd800cbf09b1
2016-06-06 17:20:46 +00:00
Felipe Leme
a1fb374cfc
Merge "Changed network check URL." into nyc-dev am: 1791555ca8
...
am: e3bb2200b7
* commit 'e3bb2200b7f6474df0a790c8f5c28b697ff3b4fa':
Changed network check URL.
Change-Id: I717a9026aed020c06a8ab814685343e65197a208
2016-06-06 17:20:28 +00:00
Felipe Leme
b3f828552e
Merge "Changed network check URL." into nyc-dev
...
am: 1791555ca8
* commit '1791555ca880db2aaa909d6f04f6cd082f21df0a':
Changed network check URL.
Change-Id: I7722ad944c8d19a26412eb798f39dcfb74bc9dfe
2016-06-06 17:17:43 +00:00
Felipe Leme
1791555ca8
Merge "Changed network check URL." into nyc-dev
2016-06-06 17:09:36 +00:00
Felipe Leme
829443c140
Changed network check URL.
...
It cannot use google.com because it's blocked in some countries where
CTS tests are run.
BUG: 29082308
Change-Id: I749659ec2cd33248fddbe5b4ab02bd6e90f24a67
2016-06-06 16:05:57 +00:00
Android Build Merger (Role)
ee6d1c6d10
Merge "Merge "Skip Doze Mode-related tests when device does not support it." into nyc-dev am: 07924c0489 am: 3e28ac045e" into nyc-mr1-dev-plus-aosp
2016-06-02 21:46:27 +00:00
Felipe Leme
0831d88e2e
Merge "Skip Doze Mode-related tests when device does not support it." into nyc-dev am: 07924c0489
...
am: 3e28ac045e
* commit '3e28ac045e0c21551c860b28f937bc614e6a79fc':
Skip Doze Mode-related tests when device does not support it.
Change-Id: I65d4f676ccd580961d3bf143a777f7fbb124eb05
2016-06-02 21:46:14 +00:00
Felipe Leme
c978d4e741
Merge "Skip Doze Mode-related tests when device does not support it." into nyc-dev am: 07924c0489
...
am: 9f6d50289c
* commit '9f6d50289c11a2831f7965e8f8956895f60db817':
Skip Doze Mode-related tests when device does not support it.
Change-Id: I1d9398ae0db7ee8566bcb60716720f266790da93
2016-06-02 21:46:13 +00:00
Felipe Leme
9f6d50289c
Merge "Skip Doze Mode-related tests when device does not support it." into nyc-dev
...
am: 07924c0489
* commit '07924c0489b60f460b285eddc69533cbda51f5a9':
Skip Doze Mode-related tests when device does not support it.
Change-Id: Ibbe3e77b88ffdcf7fe773aa18314661b59afca75
2016-06-02 21:43:46 +00:00
Felipe Leme
d1f3d68694
Skip Doze Mode-related tests when device does not support it.
...
Fixes: 29072117
Change-Id: I7ca37eae58258c021ed6297a9f1ee3b2749da7d7
2016-06-02 20:16:25 +00:00
Android Build Merger (Role)
6acd93e920
Merge "Merge "Add flakyness check when a valid connection is expected." into nyc-dev am: 8ee60199fd am: 8ce6537c06" into nyc-mr1-dev-plus-aosp
2016-06-02 17:49:00 +00:00
Felipe Leme
1e5ac02f48
Merge "Add flakyness check when a valid connection is expected." into nyc-dev am: 8ee60199fd
...
am: 8ce6537c06
* commit '8ce6537c0670b746b09dcfd261f2ecea36d5729d':
Add flakyness check when a valid connection is expected.
Change-Id: I9827f4a720b1f7d6d80e70349ec82385dce7f4f1
2016-06-02 17:48:34 +00:00
Felipe Leme
621ab0ab87
Merge "Add flakyness check when a valid connection is expected." into nyc-dev am: 8ee60199fd
...
am: 91010028de
* commit '91010028de430e59112f7ea26fbc052159612a4f':
Add flakyness check when a valid connection is expected.
Change-Id: Iec06367d36204aed0eb7e6f40a398ce76a23cf7f
2016-06-02 17:48:18 +00:00
Felipe Leme
8ce6537c06
Merge "Add flakyness check when a valid connection is expected." into nyc-dev
...
am: 8ee60199fd
* commit '8ee60199fd55b1ceefbb6c98a36a3d688c892f3f':
Add flakyness check when a valid connection is expected.
Change-Id: I5dcd03e34fc6ada0e8f49429f2a25f3cdb10e476
2016-06-02 17:45:30 +00:00
Felipe Leme
b9b85ce0cd
Add flakyness check when a valid connection is expected.
...
BUG: 29082308
Change-Id: Iadb9a0bd7fbd307d799af7a7a5dabc0ed000bc6d
2016-06-02 09:08:49 -07:00
Felipe Leme
607dbf55da
Merge "Added test for whitelisting pending intent for Doze Mode." into nyc-dev am: 12a8e761d2
...
am: f274abf6a5
* commit 'f274abf6a5149c89340cfd9e1c58750d34398395':
Change-Id: Ia325bc7779886354c9a626811114fe77d1513c6a
2016-05-27 22:58:14 +00:00
Felipe Leme
f274abf6a5
Merge "Added test for whitelisting pending intent for Doze Mode." into nyc-dev
...
am: 12a8e761d2
* commit '12a8e761d2598672db4c4e221868985073f73ada':
Added test for whitelisting pending intent for Doze Mode.
Change-Id: Id56c18de63d9d1e617110506a3aaa0baffd73d16
2016-05-27 22:48:38 +00:00
Felipe Leme
59469f73bc
Merge "Added test for whitelisting pending intent for Doze Mode." into nyc-dev am: 12a8e761d2
...
am: be0249dc08
* commit 'be0249dc08eb557b3d00f5bdfe440bbc41af6c8b':
Added test for whitelisting pending intent for Doze Mode.
Change-Id: I1f4539e33138c2c31c796fe18496126b405d9fdd
2016-05-27 22:48:38 +00:00
Felipe Leme
4188bc32d5
Added test for whitelisting pending intent for Doze Mode.
...
BUG: 28818704
Change-Id: I927364e78cd73133899d67be23e0b274829686af
2016-05-27 14:21:36 -07:00
Android Build Merger (Role)
1a88174c09
Merge "Merge "CTS coverage: connectivity change, photo, + video" into nyc-dev am: f057299a13 am: 1a9e5fd490" into nyc-mr1-dev-plus-aosp
2016-05-25 23:27:41 +00:00
Phil Weaver
0937e5bc59
Merge "CTS coverage: connectivity change, photo, + video" into nyc-dev am: f057299a13
...
am: da9e8fae16
* commit 'da9e8fae16757694f21c9af55d7222518a2ea7ae':
CTS coverage: connectivity change, photo, + video
Change-Id: I99cb61f27b0532b7b17be0e938fd7655b43b57f1
2016-05-25 23:27:11 +00:00
Phil Weaver
c482acdfee
Merge "CTS coverage: connectivity change, photo, + video" into nyc-dev am: f057299a13
...
am: 1a9e5fd490
* commit '1a9e5fd4905f7c7774f8b13132007c10c8d4324a':
CTS coverage: connectivity change, photo, + video
Change-Id: Ic73b74e1268da8eecc3cda0c4d290190a1c5531b
2016-05-25 23:27:11 +00:00
Phil Weaver
1a9e5fd490
Merge "CTS coverage: connectivity change, photo, + video" into nyc-dev
...
am: f057299a13
* commit 'f057299a13393fab596caccc3b9ac21fb5ecd599':
CTS coverage: connectivity change, photo, + video
Change-Id: Ic97685bfc46ac46536116bebc3a257f5734532b1
2016-05-25 23:17:42 +00:00
Phil Weaver
f057299a13
Merge "CTS coverage: connectivity change, photo, + video" into nyc-dev
2016-05-25 23:06:26 +00:00
Android Build Merger (Role)
8f8be84cd1
Merge "Merge "Use ConnectionManager API to check if network is metered." into nyc-dev am: b853005f3c am: 0ce15caf77" into nyc-mr1-dev-plus-aosp
2016-05-25 17:03:54 +00:00
Felipe Leme
b8b3247eec
Merge "Use ConnectionManager API to check if network is metered." into nyc-dev am: b853005f3c
...
am: 0ce15caf77
* commit '0ce15caf77691d6a8d209a918ace9fa96bcfc0cf':
Use ConnectionManager API to check if network is metered.
Change-Id: I6bbe0d03a8725017f756fa5fb49d338c7e8e0893
2016-05-25 17:03:46 +00:00
Felipe Leme
62783f4cf2
Merge "Use ConnectionManager API to check if network is metered." into nyc-dev am: b853005f3c
...
am: 3c4526d753
* commit '3c4526d753e6ad0479a370c42fc12214a0d385b4':
Use ConnectionManager API to check if network is metered.
Change-Id: Ida229bd1b752f7e6e87af1af22c1257326443a60
2016-05-25 17:03:30 +00:00
Felipe Leme
3c4526d753
Merge "Use ConnectionManager API to check if network is metered." into nyc-dev
...
am: b853005f3c
* commit 'b853005f3ce50c6a51963cff2e6627d55c6012b0':
Use ConnectionManager API to check if network is metered.
Change-Id: I5f092fcc9b2220af3c033d84271c29e641027e4e
2016-05-25 17:00:54 +00:00
TreeHugger Robot
b853005f3c
Merge "Use ConnectionManager API to check if network is metered." into nyc-dev
2016-05-25 16:54:26 +00:00
Android Build Merger (Role)
1b302781d3
Merge "Merge "Add a test for closing sockets when a VPN comes up." into nyc-dev am: 94636121f1 am: 45af342981" into nyc-mr1-dev-plus-aosp
2016-05-24 05:46:47 +00:00
Lorenzo Colitti
89b2f762ff
Merge "Add a test for closing sockets when a VPN comes up." into nyc-dev am: 94636121f1
...
am: 3cb83a57e7
* commit '3cb83a57e728c35058ff030b8521ac299b3e3996':
Add a test for closing sockets when a VPN comes up.
Change-Id: Ic2bcf6036f861ba6fa2a4f42f2109eb0ce26385a
2016-05-24 05:46:33 +00:00
Lorenzo Colitti
4b31fe9f84
Merge "Add a test for closing sockets when a VPN comes up." into nyc-dev am: 94636121f1
...
am: 45af342981
* commit '45af342981e837e5ea2458b6f8ea5451a301e145':
Add a test for closing sockets when a VPN comes up.
Change-Id: I3527d04f95f492589cd9cf5db4e048836405d77e
2016-05-24 05:46:33 +00:00