Bjoern Johansson
9e8f4da975
Merge "resolve merge conflicts of b0dcfcc14c to nyc-mr1-dev" into nyc-mr1-dev am: a888e825f7 am: 11076c3eba am: 5717d105fb
...
am: 6a0c8bc950
2017-02-16 23:33:57 +00:00
Bjoern Johansson
6a0c8bc950
Merge "resolve merge conflicts of b0dcfcc14c to nyc-mr1-dev" into nyc-mr1-dev am: a888e825f7 am: 11076c3eba
...
am: 5717d105fb
Change-Id: Ibb393dbff3b7c1534958312c4bcd31ddb155dbde
2017-02-16 23:28:30 +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
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
Sudheer Shanka
e66cee4861
Update network tests to make sure app has connectivity on start.
...
In the tests, we check the ouput from "am get-uid-state" command to see
if the app is coming to foreground and check for network access. But the
command gives internal uid state info in AMS and it's possible that the
activity/service is not started yet. Update this behavior so that we check
for network access only after the activity/service is started.
Bug: 27803922
Test: cts-tradefed run singleCommand cts-dev --module CtsHostsideNetworkTests
Change-Id: Ic0d94a585439c1d8629a897a8b56bcbf178a4371
2017-02-13 12:52:13 -08:00
Paul Duffin
51d07a361b
Merge "Prepare for removal of legacy-test from default targets" into nyc-mr2-dev-plus-aosp
...
am: bd014fb0e2 -s ours
Change-Id: Iebf87cf7d5fc62ce8c02e479455a04241c186c87
2017-02-13 13:41:50 +00:00
Paul Duffin
e098c1804d
Prepare for removal of legacy-test from default targets
...
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.
Bug: 30188076
Test: make checkbuild
Change-Id: I2bbe603b1344d3eef4b48c498311f91b756b85e3
Merged-In: I0f34fe97154240e8f8eef6816df1c794da60351e
2017-02-10 10:35:05 +00:00
bohu
892ca03290
Merge "Merge "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 am: 12bd64c6fe" into nyc-mr1-dev-plus-aosp am: 8cb528be24" into nyc-mr2-dev-plus-aosp
...
am: d3f34832ff
2017-02-03 18:27:49 +00:00
bohu
4374f1b7f7
Merge "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 am: 12bd64c6fe" into nyc-mr1-dev-plus-aosp am: 8cb528be24
...
am: d12df4a355
2017-02-03 18:27:45 +00:00
bohu
4f0029f5df
Merge "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 am: 12bd64c6fe am: 438edd0637" into nyc-mr2-dev-plus-aosp
...
am: b652f8e29c
2017-02-03 18:26:48 +00:00
bohu
83364214d1
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 am: 12bd64c6fe am: 438edd0637
...
am: 01aa7f9669
2017-02-03 18:26:43 +00:00
bohu
31b0bf0ca2
Merge "Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb am: b2435d99d4 am: 462d211655" into nyc-mr1-dev-plus-aosp am: 1921ef39f7" into nyc-mr2-dev-plus-aosp
...
am: 57399eed91
2017-02-03 18:25:42 +00:00
bohu
7a8822eff5
Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb am: b2435d99d4 am: 462d211655" into nyc-mr1-dev-plus-aosp am: 1921ef39f7
...
am: 5abe1fc6b2
2017-02-03 18:25:38 +00:00
bohu
cbe6bc789c
Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb am: b2435d99d4 am: 462d211655 am: 4771c1e74a" into nyc-mr2-dev-plus-aosp
...
am: 669273873e
2017-02-03 18:24:44 +00:00
bohu
b9bfa6b6cb
Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb am: b2435d99d4 am: 462d211655 am: 4771c1e74a
...
am: b002d878e1
2017-02-03 18:24:40 +00:00
bohu
fb5ac46c89
Merge "Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" into nyc-mr1-dev am: 5913ea0554 am: 5dd794162b" into nyc-mr1-dev-plus-aosp am: d1b373f42e" into nyc-mr2-dev-plus-aosp
...
am: 8d5c4e3319
2017-02-03 18:16:56 +00:00
bohu
d32a481a67
Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" into nyc-mr1-dev am: 5913ea0554 am: 5dd794162b" into nyc-mr1-dev-plus-aosp am: d1b373f42e
...
am: 8bb6b8d5f7
2017-02-03 18:16:53 +00:00
bohu
5e473a594e
Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" into nyc-mr1-dev am: 5913ea0554 am: 5dd794162b am: a48efa4889" into nyc-mr2-dev-plus-aosp
...
am: caafc3465e
2017-02-03 18:14:55 +00:00
bohu
6a490eab0c
Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" into nyc-mr1-dev am: 5913ea0554 am: 5dd794162b am: a48efa4889
...
am: fc141742c3
2017-02-03 18:14:49 +00:00
bohu
e7c76c106d
Merge "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 am: 12bd64c6fe am: 01feb9d59e" into nyc-mr2-dev-plus-aosp
...
am: 66508658d1
2017-02-03 18:09:49 +00:00
bohu
4059735ff2
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 am: 12bd64c6fe am: 01feb9d59e
...
am: 9c22e70bd9
2017-02-03 18:09:44 +00:00
bohu
fe2f5d195a
Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4 am: d8667fc889 am: a8d9471bb9" into nyc-mr1-dev-plus-aosp am: ce6fcf4e16" into nyc-mr2-dev-plus-aosp
...
am: 680ed52d75
2017-02-03 18:08:47 +00:00
bohu
17ce5db3b4
Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4 am: d8667fc889 am: a8d9471bb9" into nyc-mr1-dev-plus-aosp am: ce6fcf4e16
...
am: 43677291ac
2017-02-03 18:08:42 +00:00
bohu
3354fc9272
Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4 am: d8667fc889 am: a8d9471bb9 am: ebfbb5ebef" into nyc-mr2-dev-plus-aosp
...
am: 15e1fdc45c
2017-02-03 18:07:47 +00:00
bohu
015d29d3a4
CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4 am: d8667fc889 am: a8d9471bb9 am: ebfbb5ebef
...
am: 1a5e97ac18
2017-02-03 18:07:42 +00:00
bohu
a5fad393c1
Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb am: b2435d99d4 am: 462d211655 am: 6277bfdd4c
...
am: 716764c177
2017-02-03 18:06:43 +00:00
Android Build Merger (Role)
d3f34832ff
Merge "Merge "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 am: 12bd64c6fe" into nyc-mr1-dev-plus-aosp am: 8cb528be24" into nyc-mr2-dev-plus-aosp
2017-02-03 18:01:32 +00:00
Android Build Merger (Role)
b652f8e29c
Merge "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 am: 12bd64c6fe am: 438edd0637" into nyc-mr2-dev-plus-aosp
2017-02-03 18:01:19 +00:00
bohu
d12df4a355
Merge "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 am: 12bd64c6fe" into nyc-mr1-dev-plus-aosp
...
am: 8cb528be24
2017-02-03 18:00:57 +00:00
bohu
01aa7f9669
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 am: 12bd64c6fe
...
am: 438edd0637
2017-02-03 18:00:55 +00:00
bohu
4524983bcf
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
...
am: 8741fa86a2
2017-02-03 18:00:53 +00:00
bohu
3fa68cbbc6
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
...
am: e5197c114d
2017-02-03 18:00:50 +00:00
Android Build Merger (Role)
57399eed91
Merge "Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb am: b2435d99d4 am: 462d211655" into nyc-mr1-dev-plus-aosp am: 1921ef39f7" into nyc-mr2-dev-plus-aosp
2017-02-03 18:00:36 +00:00
Android Build Merger (Role)
669273873e
Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb am: b2435d99d4 am: 462d211655 am: 4771c1e74a" into nyc-mr2-dev-plus-aosp
2017-02-03 18:00:23 +00:00
bohu
b852a1aa40
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
...
am: 6a33b69f00
2017-02-03 18:00:02 +00:00
bohu
5abe1fc6b2
Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb am: b2435d99d4 am: 462d211655" into nyc-mr1-dev-plus-aosp
...
am: 1921ef39f7
2017-02-03 17:59:58 +00:00
bohu
e72da692ca
CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 4b6d85e98c am: 6dd1ce66c9 am: 546530a93b am: 1919b19cbe am: 1291cc7fa9
...
am: 5a8fa3366d
2017-02-03 17:59:58 +00:00
bohu
b002d878e1
Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb am: b2435d99d4 am: 462d211655
...
am: 4771c1e74a
2017-02-03 17:59:57 +00:00
bohu
5ea0afb6e8
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
...
am: ce8f12cab7
2017-02-03 17:57:06 +00:00
bohu
7361be3388
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
...
am: 973b1fe2fc
2017-02-03 17:57:02 +00:00
Android Build Merger (Role)
8d5c4e3319
Merge "Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" into nyc-mr1-dev am: 5913ea0554 am: 5dd794162b" into nyc-mr1-dev-plus-aosp am: d1b373f42e" into nyc-mr2-dev-plus-aosp
2017-02-03 17:56:50 +00:00
Android Build Merger (Role)
caafc3465e
Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" into nyc-mr1-dev am: 5913ea0554 am: 5dd794162b am: a48efa4889" into nyc-mr2-dev-plus-aosp
2017-02-03 17:56:38 +00:00
bohu
9a53219d59
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
...
am: 869f74f726
2017-02-03 17:56:21 +00:00
bohu
8bb6b8d5f7
Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" into nyc-mr1-dev am: 5913ea0554 am: 5dd794162b" into nyc-mr1-dev-plus-aosp
...
am: d1b373f42e
2017-02-03 17:56:16 +00:00
bohu
fc141742c3
Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" into nyc-mr1-dev am: 5913ea0554 am: 5dd794162b
...
am: a48efa4889
2017-02-03 17:56:13 +00:00
bohu
53d54c7c77
CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4 am: d8667fc889 am: a8d9471bb9 am: 100c1a535e
...
am: 397ef33200
2017-02-03 17:55:41 +00:00
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
2017-02-03 17:55:09 +00:00
