Etan Cohen
a8824acb8c
Merge changes I8c2d29be,Ibbc58c3e
...
am: 831196440e
2017-03-07 04:40:34 +00:00
Etan Cohen
831196440e
Merge changes I8c2d29be,Ibbc58c3e
...
* changes:
[AWARE] CTS for attaching to session + MAC address
[AWARE] Initial CTS: availability API + broadcast
2017-03-07 04:37:19 +00:00
Etan Cohen
08a2758524
[AWARE] CTS for attaching to session + MAC address
...
Add CTS to verify initial session attach:
- Basic attach
- Attach with identity callback: use to verify MAC
address change on subsequent attach.
Bug: 30556108
Test: CTS tests pass/fail per expectations
Change-Id: I8c2d29be81bef600a2c9eac99868326473d72b6e
2017-03-06 13:45:49 -08:00
Etan Cohen
5dc4e9b091
[AWARE] Initial CTS: availability API + broadcast
...
Initial CTS tests for Wi-Fi Aware:
- Add CTS test class for Wi-Fi Aware
- Setup/initialize
- Test the availablity API + broadcast
Bug: 30556108
Test: builds, CTS runs (test fails as expected)
Change-Id: Ibbc58c3ed7a9ad7312864d038fd34c7202222e82
2017-03-06 13:44:50 -08:00
Peter Qiu
8376afc701
Merge "wifi: add CTS tests for Passpoint parsing APIs"
...
am: 66d2bf1fe9
Change-Id: I5425769dded37bf0f12e3f7622df17a2f69feb18
2017-03-06 00:11:49 +00:00
Peter Qiu
bf9f0f98b6
Merge "WifiManagerTest: add tests for verifying Passpoint configuration management APIs"
...
am: c0d0ca8fe0
Change-Id: I07dfbfdb705efbf8070a3282bbb31d909698512a
2017-03-03 17:26:06 +00:00
Peter Qiu
24a0a8e643
wifi: add CTS tests for Passpoint parsing APIs
...
Added a test for PPS MO (PerProviderSubscription Management Object)
tree parsing API and a test for Release 1 installation file
parsing API.
Bug: 35756298
Test: run the newly added PpsMoParserTest and ConfigParserTest
Change-Id: I6da40bef9609830afb80d8562e5bfb051920b541
2017-02-28 13:43:45 -08:00
Peter Qiu
485adf65b6
WifiManagerTest: add tests for verifying Passpoint configuration management APIs
...
Bug: 35756298
Test: run WifiManagerTest
Change-Id: I3d106ca9dd4ea74de91c6553eb285534a7856363
2017-02-27 13:57:55 -08:00
Bjoern Johansson
250da2bafd
Merge "Merge "resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev" into nougat-mr1-cts-dev am: 4acb742c40"
...
am: e8fc6640f0
2017-02-21 19:19:36 +00:00
Android Merger
e8fc6640f0
Merge "Merge "resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev" into nougat-mr1-cts-dev am: 4acb742c40"
2017-02-21 19:13:04 +00:00
Bjoern Johansson
e711648651
Merge "resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev" into nougat-mr1-cts-dev
...
am: 4acb742c40
Change-Id: I06e42332244bdec51588491d73a0f78950e546a8
2017-02-21 19:12:57 +00:00
Bjoern Johansson
067cdc6be2
Merge "resolve merge conflicts of b0dcfcc14c to nyc-mr1-dev" into nyc-mr1-dev am: a888e825f7 am: 11076c3eba
...
am: 5b0a9ff797
2017-02-16 23:29:24 +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
5b0a9ff797
Merge "resolve merge conflicts of b0dcfcc14c to nyc-mr1-dev" into nyc-mr1-dev am: a888e825f7
...
am: 11076c3eba
2017-02-16 23:19:31 +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
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
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
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
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
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
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
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
Android Build Merger (Role)
66508658d1
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
2017-02-03 17:54:57 +00:00
Android Build Merger (Role)
680ed52d75
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
2017-02-03 17:54:52 +00:00
Android Build Merger (Role)
15e1fdc45c
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
2017-02-03 17:54:41 +00:00
bohu
9c22e70bd9
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
Change-Id: I62cd0356fe430cc82736eaed467e49b78d80ca75
2017-02-03 17:54:34 +00:00
bohu
43677291ac
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
2017-02-03 17:54:12 +00:00
bohu
1a5e97ac18
CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4 am: d8667fc889 am: a8d9471bb9
...
am: ebfbb5ebef
2017-02-03 17:54:09 +00:00
bohu
716764c177
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
Change-Id: I4d7d0d5e6c5b0e009ff385e8594129854b0a7d4d
2017-02-03 17:54:02 +00:00
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
Android Build Merger (Role)
8cb528be24
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
2017-02-03 17:48:43 +00:00
