Commit Graph

879 Commits

Author SHA1 Message Date
Chih-hung Hsieh
9be03581ef resolve merge conflicts of 079d417 to stage-aosp-master am: 64b0e44329 am: 9197c89071
am: ab757b423f

Change-Id: If26141a6ea6bc4d7f9e2966cbd1b7309530c634e
2016-06-27 21:41:51 +00:00
Chih-Hung Hsieh
ab757b423f resolve merge conflicts of 079d417 to stage-aosp-master am: 64b0e44329
am: 9197c89071

Change-Id: I829286b8c46ba540a4bf57a1f5ba6aee04a70535
2016-06-27 21:39:12 +00:00
Chih-hung Hsieh
9197c89071 resolve merge conflicts of 079d417 to stage-aosp-master
am: 64b0e44329

Change-Id: Ia3b91ebb942b4ab413ef4c76a06880c62e8581f9
2016-06-27 21:36:48 +00:00
Chih-Hung Hsieh
64b0e44329 resolve merge conflicts of 079d417 to stage-aosp-master
Change-Id: Ib8b7ed43d6c8dc4a9b843e6d2a974af30bcba0a0
2016-06-24 12:17:53 -07:00
Phil Weaver
0179803560 Merge \\\"CTS: Only listen to wifi events when toggling wifi\\\" into nyc-dev am: 79fad1a209 am: 3eab917a25
am: 1cd1ded4dc

Change-Id: Ib555cdee85fb1a7e723abbde92c842dee6e0581b
2016-06-23 02:11:44 +00:00
Phil Weaver
1cd1ded4dc Merge \\"CTS: Only listen to wifi events when toggling wifi\\" into nyc-dev am: 79fad1a209
am: 3eab917a25

Change-Id: Id360ce70d4ce44b17564e31d5ca8017a0a2a876f
2016-06-23 02:03:04 +00:00
Phil Weaver
3eab917a25 Merge \"CTS: Only listen to wifi events when toggling wifi\" into nyc-dev
am: 79fad1a209

Change-Id: Ieadf318b07d99acd8a2b73748fdac806731169d4
2016-06-23 01:57:27 +00:00
Phil Weaver
79fad1a209 Merge "CTS: Only listen to wifi events when toggling wifi" into nyc-dev 2016-06-23 01:48:11 +00:00
Phil Weaver
0d7d1da503 CTS: Only listen to wifi events when toggling wifi
When counting all connectivity changed events, we were failing
on devices with sim cards because we were counting both wifi and
mobile connectivity changes the same. Since the test only
toggles wifi, changing the listener only to pay attention to wifi
changes.

Bug: 29346253
Change-Id: I1ed3b976bc21419218c780d4afc4a5e73f128496
2016-06-22 16:50:38 -07:00
Chih-Hung Hsieh
60bd0b56fb Fix misc-macro-parentheses warnings in cts.
Add parentheses around macro arguments used beside operators.
Use 'aoto' type to avoid clang-tidy warnings of missing parentheses
of 'TYPE *'.

Bug: 28705665
Change-Id: I5d2c3b2bdfb7775200f31a011758b9a35b14794d
2016-06-22 14:29:53 -07:00
Daniel Xie
03b6bd7273 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
am: c8ce808664

Change-Id: Idacc412aac1906e750720f6483bbdeabae105686
2016-06-22 00:34:22 +00:00
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
fc2a160ecd Merge \\\"Clear local test results across DNS lookups.\\\" into nyc-dev am: cbdcf1d183 am: 0aeb28ea33
am: b2235a43b1

Change-Id: Icbce7badaf4d0f30fddca1bd0410396cf752d6bd
2016-06-21 06:37:10 +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
a95ee01bb1 Merge \\\"Add non-parcelable extras to notification to make sure it does not crash the app.\\\" into nyc-dev am: c72edd7a89 am: 5d53b301dc
am: 64bc0d5dcc

Change-Id: Ieff870bfcf33b3ab637cccba1b78b8d9c014c85a
2016-06-16 18:43:53 +00:00
Felipe Leme
b556efaba1 Merge \\\"Add non-parcelable extras to notification to make sure it does not crash the app.\\\" into nyc-dev am: c72edd7a89 am: 677eb31ed4
am: 6b6f09dd70

Change-Id: If24d2cbe8cdbd544781a3d4da9f89ef596f936f4
2016-06-16 18:43:52 +00: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
3eba73b40b Merge \\\"Log the address of the IPv4 address that causes the test to fail.\\\" into nyc-dev am: db3485a45e am: d1970e861b
am: 3716ad889d

Change-Id: Ic016cc7fd099207f22683c74eaffe92221a1f74b
2016-06-09 07:59:02 +00: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
Felipe Leme
8459572090 Merge "Merge "Changed network check URL." into nyc-dev am: 1791555ca8 am: b3f828552e" into nyc-mr1-dev-plus-aosp
am: f1473773c3

* commit 'f1473773c364afaa14d17213f28fe0eb4934c178':

Change-Id: I8f2704a26a8811cc59a13c9161ca7d72c2c9349d
2016-06-06 17:22:52 +00:00
Felipe Leme
bbd7b6e90a Merge "Changed network check URL." into nyc-dev am: 1791555ca8 am: e3bb2200b7
am: a1fb374cfc

* commit 'a1fb374cfc35ba3fbdc0b54aaef68b4684dfd4c0':
  Changed network check URL.

Change-Id: Ida8085fb73b4eba460ea4afc603e7268eeb61b79
2016-06-06 17:22:52 +00: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
Felipe Leme
e2253bd91c 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
am: ee6d1c6d10

* commit 'ee6d1c6d10c11efc9f68aac07173c5105f0fa121':

Change-Id: Id2e8258bc9a9936eebe89343593edb504a498b8f
2016-06-02 21:49:12 +00:00
Felipe Leme
44c5920999 Merge "Skip Doze Mode-related tests when device does not support it." into nyc-dev am: 07924c0489 am: 9f6d50289c
am: c978d4e741

* commit 'c978d4e741f98352f77d3ae8f76f1d26dd913583':
  Skip Doze Mode-related tests when device does not support it.

Change-Id: I504ca7e2b6cb9e9fffa6d9bb3bd2d106ef87d8df
2016-06-02 21:49:10 +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
Felipe Leme
78a4df28ec Merge "Merge "Add flakyness check when a valid connection is expected." into nyc-dev am: 8ee60199fd am: 8ce6537c06" into nyc-mr1-dev-plus-aosp
am: 6acd93e920

* commit '6acd93e9209cfbb453241ce9c7cc4b42ace35d86':

Change-Id: If23e5925c0cb7cf4ba22c8c833771ed104cd0eeb
2016-06-02 17:51:27 +00:00
Felipe Leme
23a108c1a0 Merge "Add flakyness check when a valid connection is expected." into nyc-dev am: 8ee60199fd am: 91010028de
am: 621ab0ab87

* commit '621ab0ab879ca33d361af4a4e3a58c637db00695':
  Add flakyness check when a valid connection is expected.

Change-Id: I88855d920b8698571b702b95b400d0a7997e95e8
2016-06-02 17:51: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