1177 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
bohu	0a67309fd4	CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 4b6d85e98c am: 6dd1ce66c9 am: 546530a93b am: 1919b19cbe am: d463437f47 ... am: 5c86e490f5 Change-Id: I59a5ba6dd17f8cc7a7840870e6dc8a39e256cebb	2017-02-03 17:55:09 +00:00
bohu	ab7e16fead	Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb am: cf06f6bca3 am: 96187b032a am: 2322e1ffb7 ... am: 62c870285a Change-Id: If85ae7a4c0d4720f46eb9057c7d5b0cda6bf41b2	2017-02-03 17:51:48 +00:00
bohu	bd3520c0ef	Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" am: f9329b58df am: 1ec884189f am: d443dc8479 ... am: 056d20bbd4 Change-Id: I57419e01277c22bb7e441db798a4543ee3a93c25	2017-02-03 17:51:12 +00:00
bohu	5c86e490f5	CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 4b6d85e98c am: 6dd1ce66c9 am: 546530a93b am: 1919b19cbe ... am: d463437f47 Change-Id: Id2d4f174fc857d6a002653a66a8726f3f45670f9	2017-02-03 17:49:29 +00:00
bohu	62c870285a	Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb am: cf06f6bca3 am: 96187b032a ... am: 2322e1ffb7 Change-Id: Ib14391e17416a1497f8c8c5c38483c95d5a39bb2	2017-02-03 17:47:39 +00:00
bohu	056d20bbd4	Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" am: f9329b58df am: 1ec884189f ... am: d443dc8479 Change-Id: Iff152dacc120cb694219ca09aa768f9147ec6ad8	2017-02-03 17:47:05 +00:00
bohu	2322e1ffb7	Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb am: cf06f6bca3 ... am: 96187b032a Change-Id: I81afae1bb2ce8995346a45ab24a483171d1ffa56	2017-02-03 17:43:47 +00:00
bohu	d443dc8479	Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" am: f9329b58df ... am: 1ec884189f Change-Id: Ic3777c5ad0088d466d7cd35d6d2e7a28bb501917	2017-02-03 17:43:14 +00:00
bohu	1919b19cbe	CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 4b6d85e98c am: 6dd1ce66c9 ... am: 546530a93b Change-Id: I4b7001dd916322ca68faec4264692034227f085b	2017-02-03 17:40:11 +00:00
bohu	96187b032a	Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb ... am: cf06f6bca3 Change-Id: I5ee0b22f18830503fed5951ea661280fe09cb07f	2017-02-03 17:38:25 +00:00
bohu	1ec884189f	Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" ... am: f9329b58df Change-Id: Id036a652078559982dbe05c40e8400b1a500464b	2017-02-03 17:37:45 +00:00
bohu	546530a93b	CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 4b6d85e98c ... am: 6dd1ce66c9 Change-Id: I9fb10ed3c2e3040279b36850f3b5b2808dcf0f24	2017-02-03 17:35:43 +00:00
Android Merger	f9329b58df	Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4"	2017-02-03 17:32:02 +00:00
bohu	cf06f6bca3	Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev ... am: 266d07f3cb Change-Id: I681b7ecf8f0990553a0cff59891771c8fa638bd1	2017-02-03 17:31:54 +00:00
bohu	5e6a02e4a3	CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 ... am: 40f71feca4 Change-Id: I4bbff2b7826bc627618c425243493c09feab3c96	2017-02-03 17:31:52 +00:00
bohu	6dd1ce66c9	CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 ... am: 4b6d85e98c Change-Id: Iecc534b475bc1c0c4211aba8b87122476b89e263	2017-02-03 17:31:11 +00:00
Android Merger	266d07f3cb	Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev	2017-02-03 17:29:18 +00:00
bohu	4b6d85e98c	CTS: skip wifi related net test if no such feature ... am: 2fa6e7ce43 Change-Id: I9a672139ea9e1b8675912a06315c6a4902411be8	2017-02-03 17:29:11 +00:00
bohu	40f71feca4	CTS: skip wifi related net test if no such feature ... am: 2fa6e7ce43 Change-Id: If1a8a0143687113dcde6173dcad05ed14597f5a8	2017-02-03 17:29:09 +00:00
Chris Manton	2fe8ce3f17	Include Wear device idle settings am: 1ac3a1f3fc am: 3af55efe11 am: 9096c0a7db am: c83638d68c ... am: 0af233b4b9 Change-Id: If454b6cb6f105bb81b26099662d4980509d18355	2017-02-03 01:26:00 +00:00
Chris Manton	903fcd838d	Include Wear device idle settings am: 1ac3a1f3fc am: 3af55efe11 am: 9096c0a7db am: 7414c4e875 ... am: e6a64ea0c6 Change-Id: Icd34dfde13ac4e42e2d64ab5c20acf4e1088f566	2017-02-03 01:12:46 +00:00
Chris Manton	da59f89ae4	Merge "Include Wear device idle settings am: 1ac3a1f3fc" am: afae7a6e23 am: f60a65f816 am: f8cd2e64be ... am: e68295db9e Change-Id: I1050da791fb350b3e4d5ab743c7542739e4846e3	2017-02-03 01:02:13 +00:00
Chris Manton	0af233b4b9	Include Wear device idle settings am: 1ac3a1f3fc am: 3af55efe11 am: 9096c0a7db ... am: c83638d68c Change-Id: I0485509299dcfa381dc595eed2fec41b4e73571c	2017-02-03 00:43:05 +00:00
Chris Manton	e6a64ea0c6	Include Wear device idle settings am: 1ac3a1f3fc am: 3af55efe11 am: 9096c0a7db ... am: 7414c4e875 Change-Id: I2964050d7a28657ee796a98e23cf3b2083e97043	2017-02-03 00:36:33 +00:00
Chris Manton	c83638d68c	Include Wear device idle settings am: 1ac3a1f3fc am: 3af55efe11 ... am: 9096c0a7db Change-Id: I9b50fea1aed8c6c5a806ad70eaf2229fe3f44275	2017-02-03 00:30:15 +00:00
Chris Manton	e68295db9e	Merge "Include Wear device idle settings am: 1ac3a1f3fc" am: afae7a6e23 am: f60a65f816 ... am: f8cd2e64be Change-Id: Ide4d5573fd5d70b8b8875f22a84d6ee155a0e7ea	2017-02-03 00:25:54 +00:00
Chris Manton	9096c0a7db	Include Wear device idle settings am: 1ac3a1f3fc ... am: 3af55efe11 Change-Id: Ieefea1af69affa64b9e665c92c5310d54c3d9b05	2017-02-03 00:20:04 +00:00
Chris Manton	f8cd2e64be	Merge "Include Wear device idle settings am: 1ac3a1f3fc" am: afae7a6e23 ... am: f60a65f816 Change-Id: Ic42a559bf5e57128919ae9747f58c3cdf83b804e	2017-02-03 00:18:02 +00:00
Chris Manton	f60a65f816	Merge "Include Wear device idle settings am: 1ac3a1f3fc" ... am: afae7a6e23 Change-Id: Ief16fa1d0029f9e60c59b3d551f6fe7b27528a17	2017-02-03 00:12:32 +00:00
Chris Manton	3af55efe11	Include Wear device idle settings ... am: 1ac3a1f3fc Change-Id: I9a644e1d421cf5a9e4c7cc28cc1f808ef1446854	2017-02-03 00:05:39 +00:00
Chris Manton	81d5870154	Include Wear device idle settings ... am: 1ac3a1f3fc Change-Id: Iea4eb54b1baa1df7a7eb680bd51db8bbdb237ce4	2017-02-03 00:00:35 +00:00
Android Build Merger (Role)	5ddc00fa5b	Merge "Merge "Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master" am: d26b43b4d5 am: 84cde9eb08 am: 289e9873ea am: 615b8de254"	2017-02-02 16:50:04 +00:00
Marco Nelissen	88a89e50a4	Merge "Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master" am: d26b43b4d5 am: 84cde9eb08 am: 289e9873ea ... am: 615b8de254 Change-Id: I7f305217fbdc23092d6b70efe553d5648fb60e50	2017-02-02 16:49:38 +00:00
Android Build Merger (Role)	b81e65e206	Merge "Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master am: 8653b32a48 am: bce78b316b am: 6b68e48c46 am: 4c45dd89df"	2017-02-02 16:49:25 +00:00
Marco Nelissen	d3f9fb62fe	Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master am: 8653b32a48 am: bce78b316b am: 6b68e48c46 ... am: 4c45dd89df Change-Id: I41707e5666b7c86e629bec80a69a900d6bc510b4	2017-02-02 16:49:04 +00:00
The Android Automerger	b1a558197e	Manually merge commit '4c45dd89df' ... * commit '4c45dd89df': BUG:34928041	2017-02-02 16:47:01 +00:00
Marco Nelissen	615b8de254	Merge "Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master" am: d26b43b4d5 am: 84cde9eb08 ... am: 289e9873ea Change-Id: I7471a5ba1d531b118a26545c7d1fc4dc538a1507	2017-02-02 03:31:01 +00:00
Marco Nelissen	4c45dd89df	Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master am: 8653b32a48 am: bce78b316b ... am: 6b68e48c46 Change-Id: Ic3c51b17d6425ec27f43a2fb486602c3da03a872	2017-02-02 03:30:26 +00:00
Marco Nelissen	289e9873ea	Merge "Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master" am: d26b43b4d5 ... am: 84cde9eb08 Change-Id: Ie189450dabdb837096872b54c425458d9eeb7726	2017-02-02 03:27:55 +00:00
Marco Nelissen	6b68e48c46	Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master am: 8653b32a48 ... am: bce78b316b Change-Id: I45c0a02a71c774ae16420bc9d1edf5785b496a41	2017-02-02 03:27:24 +00:00
Marco Nelissen	84cde9eb08	Merge "Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master" ... am: d26b43b4d5 Change-Id: I3c9a96bd2f82c4261f235f77dccd3878682d1dca	2017-02-02 03:22:29 +00:00
Marco Nelissen	bce78b316b	Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master ... am: 8653b32a48 Change-Id: I4fe72e7f2d6d8ed75ce8f36234c89cc8f7306ed1	2017-02-02 03:22:24 +00:00
Marco Nelissen	d26b43b4d5	Merge "Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master"	2017-02-02 03:18:14 +00:00
Geoffrey Pitsch	d5eadafa77	All cts uses notification channels and new Builder constructor ... Test: ran cts for all *Test.java files in CL Change-Id: I62f6eae53b539a1cfc79a05a2aa4070bf30fbfc0	2017-01-31 16:02:32 -05:00
Chris Manton	1ac3a1f3fc	Include Wear device idle settings ... Certain tests interacting with device idle must set correctly both the normal and wear device idle setting space. Bug: 32183373 Test: Run on wear device and Nexus6P run cts --skip-device-info -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testDozeModeMetered_enabledButWhitelistedOnNotificationAction run cts --skip-device-info -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testDozeModeNonMetered_enabledButWhitelistedOnNotificationAction Change-Id: I6a53d29021a7d4a257b102a4d3bd5d2cc845c16f	2017-01-30 12:26:09 -08:00
Paul Stewart	d4b573d247	Merge "Add CTS test for client certificate chains" am: 1663359290 am: 15504e6509 am: 59f642b278 ... am: e951221c2c Change-Id: I524bb68f330aadfa2a4dda5b7b4857fd4a715576	2017-01-30 18:22:46 +00:00
Paul Stewart	e951221c2c	Merge "Add CTS test for client certificate chains" am: 1663359290 am: 15504e6509 ... am: 59f642b278 Change-Id: I24d7855dd2f90cd68592c3ae2465cd0c664a7cc1	2017-01-30 18:19:15 +00:00
Paul Stewart	59f642b278	Merge "Add CTS test for client certificate chains" am: 1663359290 ... am: 15504e6509 Change-Id: Iaf3cc041583a5dbc15130e795289aabbca912b8f	2017-01-30 18:15:14 +00:00
Treehugger Robot	1663359290	Merge "Add CTS test for client certificate chains"	2017-01-30 18:08:27 +00:00
Roshan Pius	e94eb6df5c	Merge "WifiManagerTest: |disableOthers| flag change" am: aaaca1cfc8 am: 76b4b52522 am: d434b47f1e ... am: 9574de7d88 Change-Id: I2071a0e4939c39b2f2defa4cdd8452d9cc2c87c7	2017-01-27 23:44:36 +00:00