Commit Graph

815 Commits

Author SHA1 Message Date
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
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
Lorenzo Colitti
cbcfb98dd8 Add a test for closing sockets when a VPN comes up.
Bug: 28251576
Change-Id: Iab0a8643cff3c54eb04168a7cdfa116c0b8e30b1
2016-05-16 23:10:44 +09:00
Felipe Leme
88debac60e Added tests for idle apps and doze mode.
BUG: 28473659
BUG: 28521946
Change-Id: I4bc9166bf2050136fa86e374aac59f80afd76f1c
2016-05-13 15:08:16 -07:00
Android Build Merger (Role)
27327bc03b Merge "Merge "Covers more corner cases on restricted network modes:" into nyc-dev am: b10c777ceb am: c88f39571c" into nyc-mr1-dev-plus-aosp 2016-05-12 20:11:41 +00:00
Felipe Leme
0065f100a2 Merge "Covers more corner cases on restricted network modes:" into nyc-dev am: b10c777ceb
am: 3eb5851664

* commit '3eb5851664e0c604714f080fd1a812ca5edb321d':
  Covers more corner cases on restricted network modes:

Change-Id: I459897d90c63e115bf7b88b15c270e08e1b25ed5
2016-05-12 20:11:25 +00:00
Felipe Leme
3aec960f13 Merge "Covers more corner cases on restricted network modes:" into nyc-dev am: b10c777ceb
am: c88f39571c

* commit 'c88f39571cb380f5bf1251c1f534dc857ede025d':
  Covers more corner cases on restricted network modes:

Change-Id: Iffd229d78b2bd2f28825c7e74538855ba366a381
2016-05-12 20:11:25 +00:00
Felipe Leme
3eb5851664 Merge "Covers more corner cases on restricted network modes:" into nyc-dev
am: b10c777ceb

* commit 'b10c777cebf2a86605f850c4181f45dc67d2a9a6':
  Covers more corner cases on restricted network modes:

Change-Id: I8fd7ddb841e40f9e5697be2e5f2b109fcc71bf33
2016-05-12 20:08:51 +00:00
Aaron Holden
3361c86147 Remove module-level WifiCheck preparers
As WifiCheck is now declared in the CTS config, remove declarations in
the module configs.

Also downgrade TargetSetupErrors on failure to logged errors

bug:28234985
Change-Id: I2e1a369bc26aeca922686c4c3d8c033bb7f9fbc7
2016-05-11 09:55:44 -07:00
Felipe Leme
ed64e61b5f Covers more corner cases on restricted network modes:
- Tests what happens on foreground applications when a restriction (like
  Data Saver or Battery Saver modes) is turned on (prior tests would
  turn the restriction on *before* switching the app to foreground).
- Tests multiple restrictions simultaneously enabled.

Also improved existing code:

- Fixed background state check.
- Reused some common checks in helper methods.
- Retries checks for process state.

BUG: 28473659

Change-Id: Ifcf9cc6d895ccde0ab5177f9f5d8c347ce53b811
2016-05-09 12:48:29 -07:00
Android Build Merger (Role)
ff748bce55 Merge "Merge "Asserts foreground apps always have network access." into nyc-dev am: 68aeb4d914 am: 10dd3d7a84" into nyc-mr1-dev-plus-aosp 2016-05-06 23:22:53 +00:00
Felipe Leme
dac6960178 Merge "Asserts foreground apps always have network access." into nyc-dev am: 68aeb4d914
am: 10dd3d7a84

* commit '10dd3d7a84d2e5604d9a7e256646c5ed682d0280':
  Asserts foreground apps always have network access.

Change-Id: I1d549c0fb80da3d0b9338ff5b063bfc29b1b707a
2016-05-06 23:22:45 +00:00
Felipe Leme
1a29dff7a9 Merge "Asserts foreground apps always have network access." into nyc-dev am: 68aeb4d914
am: fb83bb3bf7

* commit 'fb83bb3bf780fa1dfbed71b7e20f3b61bf5f2173':
  Asserts foreground apps always have network access.

Change-Id: Ie752cd0240f4700be4c8e1ea2fada625de685365
2016-05-06 23:22:36 +00:00
Felipe Leme
10dd3d7a84 Merge "Asserts foreground apps always have network access." into nyc-dev
am: 68aeb4d914

* commit '68aeb4d9147942496beb2bf5fa78ae2428f15c82':
  Asserts foreground apps always have network access.

Change-Id: I32dd08add98d57c3feca224920d8028254102aab
2016-05-06 23:17:12 +00:00
Felipe Leme
6cd41f6d03 Asserts foreground apps always have network access.
BUG: 28473659
Change-Id: Iea6933a4630ff2e9c00a2d2e9e4a6f1a51de70f2
2016-05-06 14:28:03 -07:00
Android Build Merger (Role)
e7f3e4d681 Merge "Merge "Assert whitelists are revoked on uninstall." into nyc-dev am: cd8e99563b am: 11cda18ea6" into nyc-mr1-dev-plus-aosp 2016-05-06 17:46:59 +00:00
Felipe Leme
12e8043b89 Merge "Assert whitelists are revoked on uninstall." into nyc-dev am: cd8e99563b
am: 11cda18ea6

* commit '11cda18ea6bb5368bf766ca1841c52958541c633':

Change-Id: I12a4d2aea403d40dd8ca9c1417083fc7db9a2564
2016-05-06 17:46:50 +00:00
Android Build Merger (Role)
1eab284a54 Merge "Merge "Assert whitelists are revoked on uninstall." into nyc-dev am: cd8e99563b am: 11cda18ea6" into nyc-mr1-dev-plus-aosp 2016-05-06 17:46:07 +00:00
Felipe Leme
43829099b1 Merge "Assert whitelists are revoked on uninstall." into nyc-dev am: cd8e99563b
am: c180707aa4

* commit 'c180707aa4ca9a14f38c118103d003cbe0624ae2':
  Assert whitelists are revoked on uninstall.

Change-Id: I624660ebae235bd8cf5c5b80d471237bbc3db818
2016-05-06 17:45:54 +00:00
Felipe Leme
9e668d1e25 Merge "Assert whitelists are revoked on uninstall." into nyc-dev am: cd8e99563b
am: 11cda18ea6

* commit '11cda18ea6bb5368bf766ca1841c52958541c633':
  Assert whitelists are revoked on uninstall.

Change-Id: Id745562c9be8e014b7def2b0b1aabbd4dc7d99bb
2016-05-06 17:45:54 +00:00
Felipe Leme
11cda18ea6 Merge "Assert whitelists are revoked on uninstall." into nyc-dev
am: cd8e99563b

* commit 'cd8e99563b4accd3162bff1f002468971f4dc771':
  Assert whitelists are revoked on uninstall.

Change-Id: Ic91c283812b15a0db5ca26dc771c25f5aa8603a6
2016-05-06 17:40:49 +00:00
Felipe Leme
aa2e8ea1d8 Assert whitelists are revoked on uninstall.
BUG: 28616418
Change-Id: I909fd4c6024afe5b42560090c6e2f11b43c220de
2016-05-06 09:18:54 -07:00