Sudheer Shanka
a12dbc91c5
Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours am: 8b0491eb1f am: 8be8d0d6a9 -s ours
...
am: 64c8f23d98
2017-04-14 00:30:45 +00:00
Sudheer Shanka
64c8f23d98
Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours am: 8b0491eb1f
...
am: 8be8d0d6a9
2017-04-14 00:24:47 +00:00
Sudheer Shanka
89195184af
Merge "Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours" into nougat-mr1-cts-dev am: 137a9169cf -s ours
...
am: bb6a9be084
2017-04-13 23:37:44 +00:00
Sudheer Shanka
bb6a9be084
Merge "Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours" into nougat-mr1-cts-dev
...
am: 137a9169cf
2017-04-13 23:32:26 +00:00
Sudheer Shanka
8be8d0d6a9
Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours
...
am: 8b0491eb1f
2017-04-13 23:32:16 +00:00
Sudheer Shanka
8b0491eb1f
Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev
...
am: 43a0aa48b0 -s ours
Change-Id: I7c31558b0102a8464d15121c21402f0de77c8b12
2017-04-13 23:26:10 +00:00
Android Merger
137a9169cf
Merge "Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours" into nougat-mr1-cts-dev
2017-04-13 23:20:39 +00:00
Sudheer Shanka
12160bc460
Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev
...
am: 43a0aa48b0 -s ours
Change-Id: Ibc146b186e9f9de3e6057f6fef1f1e0bbb5e0347
2017-04-13 23:20:32 +00:00
Sudheer Shanka
d69455289f
DO NOT MERGE: Skip data saver related tests if the device doesn't support it.
...
Bug: 36007771
Test: manual
Change-Id: I817d2cc23e5c8d460367ede749ff35e799f48ee0
2017-03-31 15:54:35 -07:00
Bjoern Johansson
b2ecabdbe3
Merge "resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev" into nougat-mr1-cts-dev am: 4acb742c40
...
am: 1760c2406a
2017-02-21 19:17:53 +00:00
Bjoern Johansson
1760c2406a
Merge "resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev" into nougat-mr1-cts-dev
...
am: 4acb742c40
Change-Id: I519a864a1435825f86c9c296c615061e96af2a00
2017-02-21 19:13:11 +00:00
Bjoern Johansson
11076c3eba
Merge "resolve merge conflicts of b0dcfcc14c to nyc-mr1-dev" into nyc-mr1-dev
...
am: a888e825f7
Change-Id: Ia63071dbcdd927781f9412123d065309edccb733
2017-02-16 23:11:03 +00:00
Bjoern Johansson
65085b1fcd
resolve merge conflicts of b0dcfcc14c to nyc-mr1-dev
...
Change-Id: Ic1e35bab2f426fabf4b15b1e60b186124778c9a8
2017-02-14 18:46:59 -08:00
Bjoern Johansson
959d02c19b
resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev
...
Change-Id: Ie0b71a29966154a8590b3e4749f7713acaab0325
2017-02-14 18:24:01 -08:00
Tina Zhou
b0dcfcc14c
Merge "Merge "Don't require WiFi in CtsHostsideNetworkTests" into nougat-cts-dev am: dfc0ec200f" into nyc-dev
...
am: 2be6d78c13
Change-Id: I578972101d3b4c46132fc360be18a5dd947a4113
2017-02-15 00:57:59 +00:00
Tina Zhou
6ec77dd104
Merge "Don't require WiFi in CtsHostsideNetworkTests" into nougat-cts-dev
...
am: dfc0ec200f
2017-02-15 00:54:56 +00:00
Tina Zhou
dfc0ec200f
Merge "Don't require WiFi in CtsHostsideNetworkTests" into nougat-cts-dev
2017-02-15 00:48:44 +00:00
bohu
12bd64c6fe
Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb" into nyc-mr1-dev
...
am: 62ad215942
2017-02-03 17:42:36 +00:00
bohu
462d211655
Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb
...
am: b2435d99d4
2017-02-03 17:42:33 +00:00
bohu
5dd794162b
Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" into nyc-mr1-dev
...
am: 5913ea0554
2017-02-03 17:40:53 +00:00
bohu
a8d9471bb9
CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4
...
am: d8667fc889
2017-02-03 17:40:49 +00:00
bohu
1919b19cbe
CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 4b6d85e98c am: 6dd1ce66c9
...
am: 546530a93b
2017-02-03 17:40:11 +00:00
Android Build Merger (Role)
62ad215942
Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb" into nyc-mr1-dev
2017-02-03 17:36:40 +00:00
Android Build Merger (Role)
5913ea0554
Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" into nyc-mr1-dev
2017-02-03 17:36:27 +00:00
bohu
b2435d99d4
Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev
...
am: 266d07f3cb
2017-02-03 17:36:01 +00:00
bohu
d8667fc889
CTS: skip wifi related net test if no such feature am: 2fa6e7ce43
...
am: 40f71feca4
2017-02-03 17:35:58 +00:00
bohu
546530a93b
CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 4b6d85e98c
...
am: 6dd1ce66c9
2017-02-03 17:35:43 +00:00
bohu
6dd1ce66c9
CTS: skip wifi related net test if no such feature am: 2fa6e7ce43
...
am: 4b6d85e98c
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
2017-02-03 17:29:11 +00:00
bohu
40f71feca4
CTS: skip wifi related net test if no such feature
...
am: 2fa6e7ce43
2017-02-03 17:29:09 +00:00
Chris Manton
9096c0a7db
Include Wear device idle settings am: 1ac3a1f3fc
...
am: 3af55efe11
2017-02-03 00:20:04 +00:00
Chris Manton
3af55efe11
Include Wear device idle settings
...
am: 1ac3a1f3fc
2017-02-03 00:05:39 +00: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
bohu
2fa6e7ce43
CTS: skip wifi related net test if no such feature
...
When a device does not have wifi feature,
we should skip wifi related net tests.
BUG: 31806034
Change-Id: I9867342c47499efc855a50a67a04177fa94e83e5
2017-01-19 14:07:58 -08:00
Tina Zhou
c3a819d061
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: e58548f27f -s ours
...
am: b7086e2c4f
2016-12-17 00:41:16 +00:00
Tina Zhou
b7086e2c4f
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev
...
am: e58548f27f
2016-12-17 00:32:46 +00:00
Yu Liu
d7f8755fd5
merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 73eee30ffe
...
am: 7cd9930f4b
2016-12-16 22:25:38 +00:00
Yu Liu
7cd9930f4b
merge in nyc-mr1-release history after reset to nyc-mr1-dev
...
am: 73eee30ffe
Change-Id: I32635801fa4338f313feef7655c7636253d708d3
2016-12-16 22:17:04 +00:00
Bjoern Johansson
68ec71d954
Don't require WiFi in CtsHostsideNetworkTests
...
WiFi is not a CDD requirement so these tests should not fail when the
device under test does not have WiFi. The behavior is changed so that if
there is WiFi then both metered and unmetered tests will run. If there
is no WiFi and the current connection is metered then only metered tests
will run. If there is no WiFi and the current connection is not metered
then only unmetered tests will run.
Test: Successfully ran CTS test on both emulator and shamu.
BUG: 31648368
Change-Id: Ic643d2490e0a7e69b57a44599f1a4c57c67da873
2016-12-12 19:34:04 +00:00
gitbuildkicker
e58548f27f
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev
2016-11-30 16:55:24 -08:00
Chris Manton
cafa4c9bcc
Include Wear device idle settings
...
am: c6ce1d051e
2016-11-10 23:18:13 +00:00
Chris Manton
c6ce1d051e
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
(cherry picked from commit a84bb771d1
2016-11-09 19:06:25 +00:00
Chris Manton
a84bb771d1
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
2016-11-07 13:45:48 -08:00
gitbuildkicker
0cda2916e4
merge in nyc-mr1-release history after reset to nyc-mr1-dev
2016-10-20 00:05:49 -07:00
Nicolas Boichat
ad7fdb5e34
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 5696846426 am: ffe4cefe73 am: c4df82d292 am: 3342023de9 am: d8bd696559 am: 5ee79a1d24
...
am: 1cdcb253df
2016-10-19 19:57:44 +00:00
Nicolas Boichat
1cdcb253df
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 5696846426 am: ffe4cefe73 am: c4df82d292 am: 3342023de9 am: d8bd696559
...
am: 5ee79a1d24
2016-10-19 19:39:58 +00:00
Nicolas Boichat
5ee79a1d24
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 5696846426 am: ffe4cefe73 am: c4df82d292 am: 3342023de9
...
am: d8bd696559
2016-10-19 18:04:32 +00:00
gitbuildkicker
112760739a
merge in nyc-mr1-release history after reset to nyc-mr1-dev
2016-10-18 00:05:47 -07:00
Nicolas Boichat
d8bd696559
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 5696846426 am: ffe4cefe73 am: c4df82d292
...
am: 3342023de9
Change-Id: I6c3da43716d4072e6f0beb3e3a2b5b0bffa0aba3
2016-10-18 00:17:23 +00:00
