Commit Graph

835 Commits

Author SHA1 Message Date
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
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
Lorenzo Colitti
45af342981 Merge "Add a test for closing sockets when a VPN comes up." into nyc-dev
am: 94636121f1

* commit '94636121f156c6b53a10b79f27d37c2a9c592f1c':
  Add a test for closing sockets when a VPN comes up.

Change-Id: I0b23a38566afd96448a202d7a3b258d1960a53a3
2016-05-24 05:44:06 +00:00
TreeHugger Robot
94636121f1 Merge "Add a test for closing sockets when a VPN comes up." into nyc-dev 2016-05-24 05:38:33 +00:00
Felipe Leme
68471ef930 Use ConnectionManager API to check if network is metered.
Also retry when getActiveNetworkInfo() returns null.

BUG: 28870582
BUG: 28909522
Change-Id: I4a43f171a7d6c73ea50555b66f858a54da65ae58
2016-05-23 11:33:34 -07:00
Phil Weaver
36f05df51f CTS coverage: connectivity change, photo, + video
Confirming that connectivity change broadcasts can be received
when explicitly registering for them in N, and via the manifest
pre-N.

Confirming that new_photo and new_video broadcasts are not received.

Bug: 28122277
Change-Id: Icfc27364a41ee8f4a55920e295ba658a367bb7d2
2016-05-19 13:27:24 -07:00
Marcus Nascimento
058420aaef 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 am: 01c938ccb7 am: 64f19d0319 am: b232cf2d49
am: 6829652e87

* commit '6829652e87b94002b19c482976c5928abff793da':
  Add assertion messages to testStartUsingNetworkFeature_enableHipri.

Change-Id: I47ebc08589ccd0191abafc9d9406e4a77cc4bed7
2016-05-19 18:28:56 +00:00
Marcus Nascimento
6829652e87 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 am: 01c938ccb7 am: 64f19d0319
am: b232cf2d49

* commit 'b232cf2d49c66291e203d63b05cc0921170f42c2':
  Add assertion messages to testStartUsingNetworkFeature_enableHipri.

Change-Id: I48999b9bc410228a67a52f4fedf85e613b2d3ebf
2016-05-19 18:26:21 +00:00
Marcus Nascimento
b232cf2d49 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 am: 01c938ccb7
am: 64f19d0319

* commit '64f19d031975520dc26fbe23c70a826e491032c9':
  Add assertion messages to testStartUsingNetworkFeature_enableHipri.

Change-Id: I222dcf7299db1d2bac9641c5f200f69f87a21905
2016-05-19 18:23:44 +00: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

* commit 'a6aa5bce79af1d1294ff815a396f1764fc703a27':
  Add assertion messages to testStartUsingNetworkFeature_enableHipri.

Change-Id: Ib12541988e1c5154fd5343d8fec9e6628239238a
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  -s ours

* commit '92849de21f245cd43c4c05b28fbf59ef6feb725a':
  Add assertion messages to testStartUsingNetworkFeature_enableHipri.

Change-Id: Iabea0582c95db8353d3d7e4ec5008a45aa05b403
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
Android Build Merger (Role)
7b16a128b6 Merge "Merge "Added tests for idle apps and doze mode." into nyc-dev am: f76c309ebe am: 999a4fef2d" into nyc-mr1-dev-plus-aosp 2016-05-17 23:14:04 +00:00
Felipe Leme
cc1e3faea2 Merge "Added tests for idle apps and doze mode." into nyc-dev am: f76c309ebe
am: 999a4fef2d

* commit '999a4fef2d3e08d077e230cff7f042e40477696d':
  Added tests for idle apps and doze mode.

Change-Id: I5585cb62ca900333c031a94d7936ea178ad7ee61
2016-05-17 23:13:56 +00:00
Felipe Leme
4314247838 Merge "Added tests for idle apps and doze mode." into nyc-dev am: f76c309ebe
am: ee32b82217

* commit 'ee32b82217a1e4e7cbd01eb68333c7aa1e4b8102':
  Added tests for idle apps and doze mode.

Change-Id: Id4f876b2abaff405af3c32375807f7d1771c047e
2016-05-17 23:13:44 +00:00
Felipe Leme
999a4fef2d Merge "Added tests for idle apps and doze mode." into nyc-dev
am: f76c309ebe

* commit 'f76c309ebe0287aee4f729bbb997417ea938ef15':
  Added tests for idle apps and doze mode.

Change-Id: I9acd82ca0cb163ea12281418e23dfea0f5cb32ac
2016-05-17 23:06:34 +00:00
TreeHugger Robot
f76c309ebe Merge "Added tests for idle apps and doze mode." into nyc-dev 2016-05-17 22:40:45 +00:00
Aaron Holden
5e481ae589 Merge "Remove module-level WifiCheck preparers" into nyc-dev am: 4e0eb2e458
am: 769683c76d

* commit '769683c76dda1db7659724ce915f903c8cf95ee6':
  Remove module-level WifiCheck preparers

Change-Id: I5cc73a5cd3d05e21b590203a9ea399ef864cc9ce
2016-05-16 23:00:02 +00:00
Aaron Holden
769683c76d Merge "Remove module-level WifiCheck preparers" into nyc-dev
am: 4e0eb2e458

* commit '4e0eb2e4586a7e719e2deabcca1bd759a524a9e7':
  Remove module-level WifiCheck preparers

Change-Id: Iae73d1aaf52636a9e492e69dbedb590699ce2746
2016-05-16 22:57:18 +00:00
Aaron Holden
4e0eb2e458 Merge "Remove module-level WifiCheck preparers" into nyc-dev 2016-05-16 22:45:29 +00:00