Android Build Merger (Role)
8741fa86a2
Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 4b6d85e98c am: 6dd1ce66c9 am: 546530a93b am: 1919b19cbe" into nyc-mr1-dev-plus-aosp am: c3db5d5c66" into nyc-mr2-dev-plus-aosp
2017-02-03 17:52:52 +00:00
Android Build Merger (Role)
6a33b69f00
Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 4b6d85e98c am: 6dd1ce66c9 am: 546530a93b am: 1919b19cbe am: 1291cc7fa9" into nyc-mr2-dev-plus-aosp
2017-02-03 17:52:39 +00:00
bohu
e5197c114d
Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 4b6d85e98c am: 6dd1ce66c9 am: 546530a93b am: 1919b19cbe" into nyc-mr1-dev-plus-aosp
...
am: c3db5d5c66
2017-02-03 17:52:16 +00:00
bohu
5a8fa3366d
CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 4b6d85e98c am: 6dd1ce66c9 am: 546530a93b am: 1919b19cbe
...
am: 1291cc7fa9
2017-02-03 17:52:13 +00:00
Android Build Merger (Role)
ce8f12cab7
Merge "Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb" am: 1b9c5a00a4 am: 65617d384d am: b84c9d675a" into nyc-mr2-dev-plus-aosp
2017-02-03 17:51:23 +00:00
bohu
973b1fe2fc
Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb" am: 1b9c5a00a4 am: 65617d384d
...
am: b84c9d675a
2017-02-03 17:51:01 +00:00
bohu
869f74f726
Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" into nyc-mr1-dev am: 5913ea0554 am: 5dd794162b
...
am: ee65b88295
Change-Id: I828c8dcc087a1af805bef5f0b4acacaf7db676c6
2017-02-03 17:50:35 +00:00
bohu
397ef33200
CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4 am: d8667fc889 am: a8d9471bb9
...
am: 100c1a535e
Change-Id: I616840b16ee787da38ac0c1ad47cc8ec61e6c216
2017-02-03 17:50:03 +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
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
2017-02-03 17:47:05 +00:00
Android Build Merger (Role)
c3db5d5c66
Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 4b6d85e98c am: 6dd1ce66c9 am: 546530a93b am: 1919b19cbe" into nyc-mr1-dev-plus-aosp
2017-02-03 17:45:18 +00:00
bohu
1291cc7fa9
CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 4b6d85e98c am: 6dd1ce66c9 am: 546530a93b
...
am: 1919b19cbe
2017-02-03 17:44:57 +00:00
bohu
b84c9d675a
Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb" am: 1b9c5a00a4
...
am: 65617d384d
2017-02-03 17:44:21 +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
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
2017-02-03 17:43:14 +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
bohu
65617d384d
Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb"
...
am: 1b9c5a00a4
2017-02-03 17:38:27 +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
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
2017-02-03 17:37:45 +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
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
Android Merger
1b9c5a00a4
Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb"
2017-02-03 17:32:08 +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
2017-02-03 17:31:54 +00:00
bohu
5e6a02e4a3
CTS: skip wifi related net test if no such feature am: 2fa6e7ce43
...
am: 40f71feca4
2017-02-03 17:31:52 +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
0af233b4b9
Include Wear device idle settings am: 1ac3a1f3fc am: 3af55efe11 am: 9096c0a7db
...
am: c83638d68c
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
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
2017-02-03 00:25:54 +00:00
Chris Manton
9096c0a7db
Include Wear device idle settings am: 1ac3a1f3fc
...
am: 3af55efe11
2017-02-03 00:20:04 +00:00
Chris Manton
f8cd2e64be
Merge "Include Wear device idle settings am: 1ac3a1f3fc" am: afae7a6e23
...
am: f60a65f816
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
2017-02-03 00:05:39 +00:00
Chris Manton
81d5870154
Include Wear device idle settings
...
am: 1ac3a1f3fc
2017-02-03 00:00:35 +00:00
Marco Nelissen
615b8de254
Merge "Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master" am: d26b43b4d5 am: 84cde9eb08
...
am: 289e9873ea
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
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
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
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
2017-02-02 03:22:29 +00:00
Marco Nelissen
bce78b316b
Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master
...
am: 8653b32a48
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
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
