Commit Graph

1496 Commits

Author SHA1 Message Date
Hridya Valsaraju
a7c7253bf3 Merge "Modify method to get MQDescriptor for unsynchronized FMQ." am: 02f3f834fc am: f869630d3b
am: 02bcec2054

Change-Id: I7f19f01e1434b507af6af5fa41b58617018f8b3e
2017-02-16 02:06:29 +00:00
Hridya Valsaraju
02bcec2054 Merge "Modify method to get MQDescriptor for unsynchronized FMQ." am: 02f3f834fc
am: f869630d3b

Change-Id: I3f32ced1c079671db27be1e8d63af620d5bbc440
2017-02-16 02:02:54 +00:00
Hridya Valsaraju
f869630d3b Merge "Modify method to get MQDescriptor for unsynchronized FMQ."
am: 02f3f834fc

Change-Id: I1ecbf5eee1c298405c3385e320a61577fafdb18e
2017-02-16 01:58:57 +00:00
Treehugger Robot
02f3f834fc Merge "Modify method to get MQDescriptor for unsynchronized FMQ." 2017-02-16 01:48:07 +00:00
mukesh agrawal
3dbc0add6a wifi(vts): simplify HIDL calls am: 90f321722c am: c5aeaa22fc
am: 39d8cb99a4

Change-Id: Ic9f63abc2e508f8dfef5520d3e6aec4e54e58853
2017-02-15 22:42:51 +00:00
mukesh agrawal
39d8cb99a4 wifi(vts): simplify HIDL calls am: 90f321722c
am: c5aeaa22fc

Change-Id: I8ed6215038c2d04dcfde349f651e54d0589366c2
2017-02-15 22:38:38 +00:00
mukesh agrawal
c5aeaa22fc wifi(vts): simplify HIDL calls
am: 90f321722c

Change-Id: Ideb1faa2adfc47831e5e4b94b9961c7e91702b18
2017-02-15 22:31:08 +00:00
mukesh agrawal
90f321722c wifi(vts): simplify HIDL calls
Presently, the core of the Wifi test logic is
obscured by the boilerplate required to create
a callback.

This CL provides some utilities to simplify
the creation of a HIDL result callback, and
migrates existing Wifi code to use the new
utilities.

Along the way: add a .clang-format file, so
that I don't misformat code with 2-space
indents (the Google default).

Bug: 34817351
Test: vts-tradefed run commandAndExit vts --module=HalWifiHidlTargetTest
Change-Id: Id2c728f96c3369c74adc8dfce7228b0a15a0781e
2017-02-15 12:47:02 -08:00
Etan Cohen
00536359a3 Merge "[AWARE] Correct comment on Discovery Window usage" am: 751dc694a4 am: 224d83b432
am: a0e225ec89

Change-Id: Ic43f3be2129e6e6da66850486123a39e48bee571
2017-02-15 15:05:07 +00:00
Etan Cohen
a0e225ec89 Merge "[AWARE] Correct comment on Discovery Window usage" am: 751dc694a4
am: 224d83b432

Change-Id: I59901d50215f7362f5769b4c9ae8225921e6d643
2017-02-15 15:01:36 +00:00
Etan Cohen
224d83b432 Merge "[AWARE] Correct comment on Discovery Window usage"
am: 751dc694a4

Change-Id: I96a0b00713d01cb4a587a8ba44833c2a5f1a2cf0
2017-02-15 14:58:06 +00:00
Etan Cohen
751dc694a4 Merge "[AWARE] Correct comment on Discovery Window usage" 2017-02-15 14:52:54 +00:00
Dan Willemsen
bca7f2db08 Merge "Remove --coverage in Android.bp" am: 8cd0125d2e am: 6439f344ad
am: b7046d211d

Change-Id: I29044eba5da1c72a5e8a14d97617a1d1db3b0adc
2017-02-15 05:17:30 +00:00
Dan Willemsen
b7046d211d Merge "Remove --coverage in Android.bp" am: 8cd0125d2e
am: 6439f344ad

Change-Id: I8a5f2071751984ff0ce400968d49781b247a5977
2017-02-15 05:14:30 +00:00
Dan Willemsen
6439f344ad Merge "Remove --coverage in Android.bp"
am: 8cd0125d2e

Change-Id: I64c14bbb96b132b3b26d6d61a11e4c8cf84bd161
2017-02-15 05:11:30 +00:00
Treehugger Robot
8cd0125d2e Merge "Remove --coverage in Android.bp" 2017-02-15 05:08:19 +00:00
Etan Cohen
06cd8de39e [AWARE] Correct comment on Discovery Window usage
Clarify that DW period specification on discovery session
does not override the overall system DW period specification
(if one is provided).

Bug: 35040192
Test: none - comment fix
Change-Id: Ia7c495f1cd50a4bce0ffbaf242e52bc4f110eef2
2017-02-14 13:51:11 -08:00
Myles Watson
93df786d5e Merge "Bluetooth: Add CHECK and move ASSERT" am: b835ea3f11 am: 028ce01354
am: 4bbcb8f41e

Change-Id: Id503d07ba2adeef890882df2f686635abc7749d9
2017-02-14 02:20:43 +00:00
Myles Watson
4bbcb8f41e Merge "Bluetooth: Add CHECK and move ASSERT" am: b835ea3f11
am: 028ce01354

Change-Id: Ia432ecc1676f926a157eb6b978990c19814f2aa4
2017-02-14 02:18:43 +00:00
Myles Watson
028ce01354 Merge "Bluetooth: Add CHECK and move ASSERT"
am: b835ea3f11

Change-Id: I37ab797a98e3b126771de6aa6104b65dd3cab55a
2017-02-14 02:16:43 +00:00
Treehugger Robot
b835ea3f11 Merge "Bluetooth: Add CHECK and move ASSERT" 2017-02-14 02:10:00 +00:00
Steven Moreland
88db3fc412 Move hidl shims to the vendor partition. am: 46c0b94992 am: 0a9133b271
am: 0c5f363811

Change-Id: Icdf33f1473013ecba1d70ebcb1d85641024b3213
2017-02-14 01:19:15 +00:00
Steven Moreland
0c5f363811 Move hidl shims to the vendor partition. am: 46c0b94992
am: 0a9133b271

Change-Id: Ibe01a4a070c612b86fb31c0543695df5da924624
2017-02-14 01:17:16 +00:00
Steven Moreland
0a9133b271 Move hidl shims to the vendor partition.
am: 46c0b94992

Change-Id: I9f508ce24e07a1d78eac3bea94a21a45a8b2cd81
2017-02-14 01:15:08 +00:00
Hridya Valsaraju
c3db9c8142 Modify method to get MQDescriptor for unsynchronized FMQ.
The modified method adds a new parameter specifying
if a new unsynchronized FMQ needs to be set up by the server
or if it is to return an MQDescriptor to
an unsynchronized FMQ that has already been configured
by the server(if one exists)

Bug: 35319190
Test: FMQ unit tests
Change-Id: I64a5b356a2761faaeeea6fdd2c3a7da9b60f0016
2017-02-13 15:50:40 -08:00
Steven Moreland
46c0b94992 Move hidl shims to the vendor partition.
We need google shims on the vendor partition because they are providing
an implementation of a vendor defined interface. They were written by
google just as a courtesy/to make the transition easier. They're
basically a set for vendors to assemble their hal implementations
from.

Bug: 34135607
Test: marlin persist.hal.binderization on/off

Merged-In: I3f86c77c147514fe470f08088a66de312ae32d4e
Change-Id: I3f86c77c147514fe470f08088a66de312ae32d4e
2017-02-13 23:14:38 +00:00
Roshan Pius
4ffdf9c3a0 Merge changes Ieee26013,I275bba11,I7e7258e7,I88111181 am: 3646298ab6 am: b853615e6e
am: f404487631

Change-Id: I29a4bb5ff276182e2864a29daabec396c2df8ee0
2017-02-13 21:38:54 +00:00
Roshan Pius
f404487631 Merge changes Ieee26013,I275bba11,I7e7258e7,I88111181 am: 3646298ab6
am: b853615e6e

Change-Id: Id42bcb5657613884386b1b978d6931511425c49e
2017-02-13 21:36:24 +00:00
Roshan Pius
b853615e6e Merge changes Ieee26013,I275bba11,I7e7258e7,I88111181
am: 3646298ab6

Change-Id: Ica61adc41d15404f2998002f4c950a0b3ddc8296
2017-02-13 21:33:59 +00:00
Roshan Pius
3646298ab6 Merge changes Ieee26013,I275bba11,I7e7258e7,I88111181
* changes:
  supplicant(interface): Remove redundant callbacks
  wifi(implementation): Copy the user complete callback by value
  wifi(implementation): Add status check for all cb invocation
  wifi(implementation): Add global lock
2017-02-13 21:25:39 +00:00
Roshan Pius
2ca2a529b9 supplicant(interface): Remove redundant callbacks
The information broadcast via these callbacks are already available via
other callbacks.

1. All of the onProvisionDiscovery* callback data can be retrieved via the
|onProvisionDiscoveryCompleted| callback.
2. OnAssociated & onConnected callbacks data can retrieved via the
onStateChanges callback.

Bug: 34221586
Test: ./hardware/interfaces/update-makefiles.sh

Change-Id: Ieee26013dfda7a9be41a80e98ff1537da16b3466
2017-02-13 13:25:16 -08:00
Roshan Pius
742bb97769 wifi(implementation): Copy the user complete callback by value
The callback object may go out of scope by the time it's invoked. So,
make a copy of it. We're doing the same for the other user callbacks
received in this class.

Bug: 34930275
Test: Compiles
Change-Id: I275bba11ae8735a21514d871e8aa473f92f0fd7d
2017-02-13 13:25:15 -08:00
Myles Watson
dbbdf3e5bc Bluetooth: Add CHECK and move ASSERT
Test: bluetooth_hidl_hal_test passes
Change-Id: Ib857265204d39ffb54afc6f589fdc1b852362a97
2017-02-13 19:54:54 +00:00
Zhuoyao Zhang
47497a0536 Merge "Update vts files on aosp." am: 248e3932fe am: 848e5db57f
am: 832e7bd89a

Change-Id: If86e71c6f1d99c3a4cd37adf320c2598621c30e9
2017-02-13 19:17:51 +00:00
Zhuoyao Zhang
832e7bd89a Merge "Update vts files on aosp." am: 248e3932fe
am: 848e5db57f

Change-Id: Ie29071455c9ca3cf1a7293972347cbc6c9a9f9f1
2017-02-13 19:15:20 +00:00
Zhuoyao Zhang
848e5db57f Merge "Update vts files on aosp."
am: 248e3932fe

Change-Id: I147799a7b93d100a5340aa0150540f6b6142e72e
2017-02-13 19:12:36 +00:00
Amit Mahajan
f6f5316460 Merge "Add missing response function." am: 6267062af5 am: b3e6021641
am: 63ab2b318b

Change-Id: I4c499d60c5ac213fe6d351dce98f4d587d6bccdf
2017-02-13 19:09:54 +00:00
Zhuoyao Zhang
248e3932fe Merge "Update vts files on aosp." 2017-02-13 19:09:48 +00:00
Amit Mahajan
63ab2b318b Merge "Add missing response function." am: 6267062af5
am: b3e6021641

Change-Id: I0ee6a5540ccbd40c6c11b4f42b8d6cae26629da4
2017-02-13 19:06:53 +00:00
Amit Mahajan
b3e6021641 Merge "Add missing response function."
am: 6267062af5

Change-Id: I47995ad80fe34a54a7346a92957a3d3219842188
2017-02-13 19:04:24 +00:00
Amit Mahajan
6267062af5 Merge "Add missing response function." 2017-02-13 19:00:20 +00:00
Zhuoyao Zhang
65c99d7f08 Update vts files on aosp.
* Based on the latest hidl-gen and .hal files.

Test: mma
      make vts.

Change-Id: I4765450d985afd552fe720d91b9ab3422f5b7a47
2017-02-12 13:51:06 -08:00
Roshan Pius
bc662205c6 wifi(implementation): Add status check for all cb invocation
Bug: 34820508
Test: Compiles
Change-Id: I7e7258e782142bae7373fa0543e6c17184b043a9
2017-02-10 22:03:40 -08:00
Roshan Pius
091e1c1f3a wifi(implementation): Add global lock
Add a global lock to address synchronization issues between the main
HIDL method servicing thread and the legacy HAL's event loop thread.

Also, added some documentation for the threading model used.

Bug: 34261034
Test: Compiles
Change-Id: I881111814ff5ebd601d6a4c85cf284b30ae47ed3
2017-02-10 22:03:40 -08:00
Etan Cohen
8330ff9553 Merge "[WIFI] Update VTS generated file" am: 96518722ee am: 189e70056b
am: 7a93784f05

Change-Id: Iee6d5141fd406484b789be5d4387251851ca8312
2017-02-11 04:47:01 +00:00
Etan Cohen
7a93784f05 Merge "[WIFI] Update VTS generated file" am: 96518722ee
am: 189e70056b

Change-Id: I8e825299c906dc23383bf6ea8d9758aff40a043c
2017-02-11 04:44:53 +00:00
Etan Cohen
189e70056b Merge "[WIFI] Update VTS generated file"
am: 96518722ee

Change-Id: I7b5b59f05b422d8f453fe89162908f4340b211a6
2017-02-11 04:42:01 +00:00
Etan Cohen
96518722ee Merge "[WIFI] Update VTS generated file" 2017-02-11 04:38:06 +00:00
Etan Cohen
ff7aac5a5a [WIFI] Update VTS generated file
Large churn in files - seems to be mostly driven
by changes in generated code as opposed to HAL
changes.

Bug: 33459306
Test: build + vts-tradefed run commandAndExit vts --module=HalWifiHidlTargetTest
Change-Id: I1762a24108f9119dbc9c6807d6a2870f016a26d9
2017-02-10 18:14:02 -08:00
Amit Mahajan
0de66edb93 Add missing response function.
Test: None; only interface change.
Bug: 32020264
Merged-in: I28638f9371a6b09d72862a13a15d5f7e319d9337
Change-Id: I28638f9371a6b09d72862a13a15d5f7e319d9337
2017-02-11 01:58:53 +00:00