Felipe Leme
75e3d42cf6
Merge "Improved connectivity check by also asserting NetworkInfo states." into nyc-dev am: fe6dc2b966
...
am: 00cf921893
2016-05-04 01:06:02 +00:00
Felipe Leme
00cf921893
Merge "Improved connectivity check by also asserting NetworkInfo states." into nyc-dev
...
am: fe6dc2b966
* commit 'fe6dc2b966686da65dae3e0766e56bf25844500c':
Improved connectivity check by also asserting NetworkInfo states.
Change-Id: Icba9139f192182fe6adaf03ef813dc20bd66f681
2016-05-04 00:59:59 +00:00
Felipe Leme
50bce69fab
Improved connectivity check by also asserting NetworkInfo states.
...
BUG: 28473659
BUG: 26571724
Change-Id: Iba687003431ed5c353412268726967a798f538da
2016-05-03 08:29:52 -07:00
Android Build Merger (Role)
4a8dbb8899
Merge "Merge "Added test for required packages whitelisted for Data Saver Mode." into nyc-dev am: 16ae24badd am: a8eac2bd2d" into nyc-mr1-dev-plus-aosp
2016-04-29 23:52:18 +00:00
Felipe Leme
de5b334ca0
Merge "Added test for required packages whitelisted for Data Saver Mode." into nyc-dev am: 16ae24badd
...
am: 9d9ca56079
2016-04-29 23:52:06 +00:00
Felipe Leme
77b14e5a20
Merge "Added test for required packages whitelisted for Data Saver Mode." into nyc-dev am: 16ae24badd
...
am: a8eac2bd2d
* commit 'a8eac2bd2da354fe081606f69c72df309f19e063':
Added test for required packages whitelisted for Data Saver Mode.
Change-Id: Ia9d77577b8815337c209489ecf613702af132073
2016-04-29 23:52:06 +00:00
Felipe Leme
9d9ca56079
Merge "Added test for required packages whitelisted for Data Saver Mode." into nyc-dev
...
am: 16ae24badd
* commit '16ae24badd79bf100b26dc4e6dfb3ed649a0c3ad':
Added test for required packages whitelisted for Data Saver Mode.
Change-Id: I1916d82a0fcc883679e200f79594381d29afd6b2
2016-04-29 23:49:49 +00:00
Felipe Leme
fa8e24c3e6
Added test for required packages whitelisted for Data Saver Mode.
...
Also fixed code that checks for whitelist uids, otherwise it would pass
when the required uid is missing but a superset was present (for
example, when asking for 1009 but 10090 was whitelisted).
BUG: 28431507
Change-Id: Iaaa67e586907dba215496460445ad627ba7b63c5
2016-04-29 14:10:12 -07:00
Android Build Merger (Role)
533825f004
Merge "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 am: f9185c256f am: 8ad4295bec am: c847a249c6 am: ad20b76de7" into nyc-mr1-dev-plus-aosp
2016-04-29 11:23:08 +00:00
Marcus Nascimento
7f66977e0e
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 am: f9185c256f am: 8ad4295bec am: c847a249c6
...
am: eaf3745bc8
2016-04-29 11:22:49 +00:00
Marcus Nascimento
8e5a1dd733
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 am: f9185c256f am: 8ad4295bec am: c847a249c6
...
am: ad20b76de7
* commit 'ad20b76de7998f2a086a973fd30b988ccdf98629':
Add assertion message to assertions for testExecute_withMobile.
Change-Id: I6c062a484790800a8073d5328dbd4a4dda923750
2016-04-29 11:22:46 +00:00
Marcus Nascimento
eaf3745bc8
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 am: f9185c256f am: 8ad4295bec
...
am: c847a249c6
2016-04-29 11:20:20 +00:00
Marcus Nascimento
c847a249c6
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 am: f9185c256f
...
am: 8ad4295bec
* commit '8ad4295bec64574b3c05547efc29f225b385e6ce':
Add assertion message to assertions for testExecute_withMobile.
Change-Id: Id4892624242d707920f285c13dbfd029f7f2cc3d
2016-04-29 11:17:44 +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
Android Build Merger (Role)
a1205b4f14
Merge "Merge "Add more test coverage to ConnectivityManagerTest." into nyc-dev am: 25a61dc am: 733eb43" into nyc-mr1-dev-plus-aosp
2016-04-27 10:34:05 +00:00
TreeHugger Robot
3ec601327f
Merge "Add more test coverage to ConnectivityManagerTest." into nyc-dev am: 25a61dc
...
am: 90855c4
* commit '90855c4756f1c06a74932af1966404199b74284d':
Add more test coverage to ConnectivityManagerTest.
Change-Id: Ie8e2bf0c2c2c45045d086d8e6dfb4478f4a1ce6a
2016-04-27 10:33:50 +00:00
TreeHugger Robot
b07ed230e4
Merge "Add more test coverage to ConnectivityManagerTest." into nyc-dev am: 25a61dc
...
am: 733eb43
2016-04-27 10:33:50 +00:00
Lorenzo Colitti
733eb43443
Merge "Add more test coverage to ConnectivityManagerTest." into nyc-dev
...
am: 25a61dc
2016-04-27 10:29:54 +00:00
TreeHugger Robot
25a61dcae9
Merge "Add more test coverage to ConnectivityManagerTest." into nyc-dev
2016-04-27 10:21:48 +00:00
Android Build Merger (Role)
7e1e503f4f
Merge "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 am: 0399523 am: fd3f832 am: c403c81 am: b03bd92" into nyc-mr1-dev-plus-aosp
2016-04-25 23:56:04 +00:00
Android Build Merger (Role)
89b4f96f0a
Merge "Merge "Merge "Added assertion message to testDns failures" into lollipop-mr1-cts-dev am: 350b2aa" into marshmallow-cts-dev am: 936375b am: 2bfd0e1 am: 2a0f366 am: 39cb9a5 am: 7cde9a8 am: 6d3841c am: 59c1898" into nyc-mr1-dev-plus-aosp
2016-04-25 23:56:01 +00:00
Owain Davies
a3cbe02799
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 am: 0399523 am: fd3f832 am: c403c81
...
am: b03bd92
* commit 'b03bd921b5d846312a67dc5f304d4ebc544bccbc':
Add assertion message if testDns ipv6 lookup reutrns ipv4.
Change-Id: Ifd7b42a72bc8c121ff433600efa484d2c7c57b9d
2016-04-25 23:55:20 +00:00
Owain Davies
fd9b2aacc6
Merge "Merge "Added assertion message to testDns failures" into lollipop-mr1-cts-dev am: 350b2aa" into marshmallow-cts-dev am: 936375b am: 2bfd0e1 am: 2a0f366 am: 39cb9a5 am: 7cde9a8 am: 6d3841c
...
am: 59c1898
* commit '59c189830e2be88486ecbfcd3a2939852fb82e37':
Added assertion message to testDns failures
Change-Id: I2291f8204ae97521068fb65dffa6bd8d657ad2a9
2016-04-25 23:55:19 +00:00
Owain Davies
ab17e30426
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 am: 0399523 am: fd3f832 am: c403c81
...
am: 774ed8f
2016-04-25 23:55:04 +00:00
Owain Davies
8b9edca9c4
Merge "Merge "Added assertion message to testDns failures" into lollipop-mr1-cts-dev am: 350b2aa" into marshmallow-cts-dev am: 936375b am: 2bfd0e1 am: 2a0f366 am: 39cb9a5 am: 7cde9a8 am: 6d3841c
...
am: 6ed611d
2016-04-25 23:55:03 +00:00
Owain Davies
774ed8f276
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 am: 0399523 am: fd3f832
...
am: c403c81
2016-04-25 23:50:59 +00:00
Owain Davies
6ed611d782
Merge "Merge "Added assertion message to testDns failures" into lollipop-mr1-cts-dev am: 350b2aa" into marshmallow-cts-dev am: 936375b am: 2bfd0e1 am: 2a0f366 am: 39cb9a5 am: 7cde9a8
...
am: 6d3841c
2016-04-25 23:50:58 +00:00
Owain Davies
c403c81218
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 am: 0399523
...
am: fd3f832
* commit 'fd3f832fcfb9dc4fa3e4d497a97ebdf1636269b2':
Add assertion message if testDns ipv6 lookup reutrns ipv4.
Change-Id: I774f8188a4329508bd590564859f38b3ec049f7c
2016-04-25 23:48:09 +00:00
Owain Davies
6d3841c6a5
Merge "Merge "Added assertion message to testDns failures" into lollipop-mr1-cts-dev am: 350b2aa" into marshmallow-cts-dev am: 936375b am: 2bfd0e1 am: 2a0f366 am: 39cb9a5
...
am: 7cde9a8
* commit '7cde9a81f8ee813b47dd424cea85692fd6f794fb':
Added assertion message to testDns failures
Change-Id: Icef1c18274c8ae3883b718d823f851d4c1562417
2016-04-25 23:48:07 +00: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
Owain Davies
39cb9a5a5c
Merge "Merge "Added assertion message to testDns failures" into lollipop-mr1-cts-dev am: 350b2aa" into marshmallow-cts-dev am: 936375b am: 2bfd0e1
...
am: 2a0f366
* commit '2a0f3660e12cdbaa8f573811d82f07ebd9a8ed51':
Added assertion message to testDns failures
Change-Id: I36b06607bea7de4f032daa1ddc84d988d6d44399
2016-04-23 06:19:46 +00:00
Owain Davies
275a0e6237
Merge "Merge "Add assertion message if testDns ipv6 lookup reutrns ipv4." into lollipop-mr1-cts-dev am: b996de8" into marshmallow-cts-dev
...
am: 48216c2
2016-04-23 06:13:45 +00:00
Owain Davies
2bfd0e1192
Merge "Merge "Added assertion message to testDns failures" into lollipop-mr1-cts-dev am: 350b2aa" into marshmallow-cts-dev
...
am: 936375b
2016-04-23 06:13:44 +00:00
Android Merger
48216c2807
Merge "Merge "Add assertion message if testDns ipv6 lookup reutrns ipv4." into lollipop-mr1-cts-dev am: b996de8" into marshmallow-cts-dev
2016-04-23 06:07:51 +00:00
Android Merger
936375b6f2
Merge "Merge "Added assertion message to testDns failures" into lollipop-mr1-cts-dev am: 350b2aa" into marshmallow-cts-dev
2016-04-23 06:07:42 +00:00
Owain Davies
4455109378
Merge "Add assertion message if testDns ipv6 lookup reutrns ipv4." into lollipop-mr1-cts-dev
...
am: b996de8
2016-04-23 06:07:33 +00:00
Owain Davies
7db24c68cf
Merge "Added assertion message to testDns failures" into lollipop-mr1-cts-dev
...
am: 350b2aa
* commit '350b2aae5bc303d094a540c12bcb650a8bf5e139':
Added assertion message to testDns failures
Change-Id: I347197b0db859e3875b14701424d2d55d9059d32
2016-04-23 06:07:31 +00:00
Daniel Xie
b996de81cd
Merge "Add assertion message if testDns ipv6 lookup reutrns ipv4." into lollipop-mr1-cts-dev
2016-04-23 06:02:23 +00:00
Android Build Merger (Role)
f47334ea4f
Merge "Merge "Rewrite X509TrustManagerExtensionsTest" into nyc-dev am: 1f8d6e8659 am: 75848bd16d" into nyc-mr1-dev-plus-aosp
2016-04-22 15:52:03 +00:00
Chad Brubaker
c1169f27b9
Merge "Rewrite X509TrustManagerExtensionsTest" into nyc-dev am: 1f8d6e8659
...
am: 75848bd16d
* commit '75848bd16d21400a784916232b269c9aa574b0eb':
Rewrite X509TrustManagerExtensionsTest
Change-Id: I18a4beea71323de992555412749d9a33998a0740
2016-04-22 15:51:47 +00:00
Chad Brubaker
595345b556
Merge "Rewrite X509TrustManagerExtensionsTest" into nyc-dev
...
am: 1f8d6e8659
* commit '1f8d6e865939d4ca00157216f70edd02eadc1cac':
Rewrite X509TrustManagerExtensionsTest
Change-Id: I0bfdcff66da33ba7219da69f8607addb34fdd236
2016-04-22 15:49:25 +00:00
Lorenzo Colitti
8a14c224e3
Add more test coverage to ConnectivityManagerTest.
...
1. Test NetworkCallbacks as well as CONNECTIVITY_ACTION, since
we are moving away from CONNECTIVITY_ACTION.
2. Use the Network objects we get back to test
Network#getSocketFactory().
3. Check that TCP connections are closed with ECONNABORTED when
a network disconnects.
Bug: 28251576
Change-Id: I41a438b82ef9251e52866332f3445f1bf876e04f
2016-04-22 22:25:51 +09:00
Chad Brubaker
bac071b74f
Rewrite X509TrustManagerExtensionsTest
...
X509TrustManagerExtensionsTest used internal implementation details to
test X509TrustManagerExtensions#isUserAddedCertificate, these
implementation details are no longer the same and so this test failed to
catch the API being broken and then incorrectly flagged the fixed API as
broken.
To ensure that isUserAddedCertificate is properly covered the tests for
the API are split into two places: X509TrustManagerExtensionsTest covers
tests for the default case where there are no added CAs and
CaCertManagementTest to test the behavior when CAs have been added.
Bug:28262103
Change-Id: I14f3211c277fdc9c8bfc3d4ac932be375961fa28
2016-04-20 15:12:38 -07:00
Felipe Leme
eacd0c1670
Merge "Changed order of metered network check." into nyc-dev
...
am: 901854e
* commit '901854eb92bcc8b12d9aaf350210e72eb7585416':
Changed order of metered network check.
Change-Id: Iad87c8f35e2a1aac56b9581e2c3f035dd02141e0
2016-04-14 20:08:15 +00:00
Felipe Leme
0e47422a47
Changed order of metered network check.
...
BUG: 27808364
Change-Id: I8a1088673cdd2c310a787a0b0708ad58876e9ac0
2016-04-14 12:49:31 -07:00
