Commit Graph

1174 Commits

Author SHA1 Message Date
Lorenzo Colitti
3232d55bdf Merge "Dup fds to stop finalizers from invalidating them."
am: d7a02820ac

Change-Id: Ia0aedcf2cd8d56f8a8c31b3af95ae8a2ae0dedd0
2017-03-16 03:33:04 +00:00
Lorenzo Colitti
d7a02820ac Merge "Dup fds to stop finalizers from invalidating them." 2017-03-16 03:27:14 +00:00
Lorenzo Colitti
a7ec8300d9 Dup fds to stop finalizers from invalidating them.
The hostside VPN tests were failing because finalizers were
closing the ParcelFileDescriptors that we use to get socekt fds.
The close operations were causing the fds to be marked as invalid
(i.e., -1), causing the tests' system calls on them to fail with
EBADF.

Fix this by dup(2)ing the fds and closing the original objects.

Also, add some asserts to debug this sort of failure.

Fix: 35927643
Test: HostsideVpnTests passed 20/20 times on bullhead
Change-Id: If88530b5bd32622bd4726cd6f0907f731209bb43
2017-03-16 08:25:55 +09:00
Peter Qiu
4f8b0abd52 Merge "wifi: update callsite for Passpoint configuration management APIs"
am: c77019853f

Change-Id: If3aadefde81b4998f2c86a5bc3e074aa3a8582b2
2017-03-14 16:17:27 +00:00
Peter Qiu
154dea6b60 wifi: update callsite for Passpoint configuration management APIs
The APIs are updated to not return a boolean status based on
the API Councils comment.  So update the callsite accordingly.

Bug: 35858311
Test: make -j32
Change-Id: Ie9106ecddb2b15178ad37ec6f014d5cc7ce77c43
Merged-In: Ie9106ecddb2b15178ad37ec6f014d5cc7ce77c43
2017-03-13 10:35:44 -07:00
Etan Cohen
fc1043e9ba Merge "[AWARE] Update network creation tests open/encrypted API"
am: 148f767737

Change-Id: Ib53b7a4c921c56c69402fc7be9440cefb064e92b
2017-03-10 17:12:07 +00:00
Etan Cohen
9602110a36 [AWARE] Update network creation tests open/encrypted API
Updated/add CTS tests to validate createNetworkSpecifierXxx
API for open and passphrase modules. As these are (still)
single-ended CTS tests - they validate failure.

Bug: 26564544
Test: CTS passing
Change-Id: I07b76bee5a9b73780d341ac8511a2738ded751ca
2017-03-08 09:08:00 -08:00
Etan Cohen
5191f48899 Merge "[AWARE] CTS for Aware data-path creation"
am: 8ee5d70b27

Change-Id: Ia9e4190416c8a93a62678e32d59daf9602da748f
2017-03-07 23:44:19 +00:00
Etan Cohen
3ceb23d6ca Merge "[AWARE] CTS for failure mode of send message API"
am: f138c95d1f

Change-Id: Ia317d9c3cadbe8d42ce7f26b0f1e96665611ffe4
2017-03-07 23:43:48 +00:00
Etan Cohen
0d96fc6fd5 Merge "[AWARE] CTS tests for publish/subscribe discovery"
am: 32e2012c2a

Change-Id: Ib7856de088d229ee6346bd94c279000ce041cb74
2017-03-07 23:43:18 +00:00
Etan Cohen
8ee5d70b27 Merge "[AWARE] CTS for Aware data-path creation" 2017-03-07 23:36:19 +00:00
Etan Cohen
f138c95d1f Merge "[AWARE] CTS for failure mode of send message API" 2017-03-07 23:35:47 +00:00
Etan Cohen
32e2012c2a Merge "[AWARE] CTS tests for publish/subscribe discovery" 2017-03-07 23:35:32 +00:00
Etan Cohen
12be803cce [AWARE] CTS for Aware data-path creation
Test Aware data-path creation API flow - failure.

Note: testing limited to failure since single device
testing doesn't have a peer

Bug: 30556108
Test: CTS tests pass
Change-Id: Ie15ad57d7331b21fbb6706091691bd5f87e1264e
2017-03-07 09:41:04 -08:00
Etan Cohen
ab5186e4f6 [AWARE] CTS for failure mode of send message API
Test that sending a message with invalid peer handle (null)
fails as expected.

Note: limited testing
- Single device testing doesn't have a peer
- Cannot create an invalid peer handle since opaque object

Bug: 30556108
Test: CTS tests pass
Change-Id: I72f4b67ea3c3dfc00aa48f6601d064b406dabde7
2017-03-07 09:33:00 -08:00
Etan Cohen
a9f33d578d [AWARE] CTS tests for publish/subscribe discovery
Validate the SUCCESS case of publish and subscribe
discovery sessions.

Bug: 30556108
Test: CTS tests pass
Change-Id: Ib88606cdf662560258890e2f274c85c3a8818206
2017-03-07 09:32:56 -08:00
Etan Cohen
766fa1f462 Merge "[CM] CTS tests for requestNetwork APIs"
am: b9af841386

Change-Id: I167c41950ed8a7d267965088a391b7f503decd0d
2017-03-07 16:48:44 +00:00
Etan Cohen
b9af841386 Merge "[CM] CTS tests for requestNetwork APIs" 2017-03-07 16:40:27 +00:00
Etan Cohen
87b18c3df1 [CM] CTS tests for requestNetwork APIs
Add CTS tests for:
- requestNetwork API: test onAvailable
- requestNetwork with timeout API: test onUnavailable (failure)

Bug: 31399536
Test: CTS tests passing
Change-Id: I3565ef375ec90f90b2c76aabee14bf993251eeef
2017-03-06 20:45:13 -08:00
Etan Cohen
a8824acb8c Merge changes I8c2d29be,Ibbc58c3e
am: 831196440e

Change-Id: I076e52cdf6e46f1df055de0bfe9583d72f3fd181
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

Change-Id: Id93567f78ce4490b1c015d65246b88f4f82f7f9a
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

Change-Id: Ie27b0e3835ccd22ad8a96a86ddb71da0134e9372
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

Change-Id: I77e30b9ff5bc30869c40a03c6655fd6471caa37c
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

Change-Id: I7ff23d2936d7e9e21eaf8909b2e07c5c816cc32c
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

Change-Id: I608aa117861ce6100b90032f1f9ba50d53234a00
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

Change-Id: I624e19ef338c626dde03e552dbd150d52fbb8a6a
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

Change-Id: I994a7dab9317f5f1c952e29bbae440d74aeb8a2e
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

Change-Id: If12a59940db8afbdcba11c8b04756b36997048ad
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