Commit graph

464 commits

Author SHA1 Message Date
Treehugger Robot
e397b73792 Merge changes from topic 'nfc-style'
* changes:
  nfc: update default implementation to match style.
  nfc: reflect style guide.
2016-10-17 15:57:16 +00:00
Hridya Valsaraju
f793433313 Modify return values of read/write/config methods to bool
am: 954515f73a

Change-Id: I55725cb778a9563f2b04d569eeb81bcd8fb245d3
2016-10-15 01:44:24 +00:00
Hridya Valsaraju
954515f73a Modify return values of read/write/config methods to bool
Modify return values of read/write/config methods to bool
for the FMQ unit tests and benchmarks.

Bug: 31780470
Test: Built and ran existing FMQ unit tests and benchmarks

Change-Id: I2b7c9cf073f0c1a2908d48552e258ce21240ae64
2016-10-14 23:55:52 +00:00
Steven Moreland
a74426d691 nfc: update default implementation to match style.
Test: make android.hardware.nfc@1.0-impl
Change-Id: I00357d40df1a6b2289f86b33d7a5833e358884d6
2016-10-14 08:24:17 -07:00
Steven Moreland
cffe8d5df4 nfc: reflect style guide.
Test: make android.hardware.nfc@1.0
Change-Id: I19b5c5a8b7e6345152441be149349933774b3de0
2016-10-14 08:23:59 -07:00
Steven Moreland
7d5c0103c0 Merge "Cleanup nfc service code." am: a91254d196 am: 8c2e2ce86d
am: 79d81c4413

Change-Id: I8e569a47820801212ff45aae8cfbd72ca4af6707
2016-10-14 07:57:11 +00:00
Steven Moreland
79d81c4413 Merge "Cleanup nfc service code." am: a91254d196
am: 8c2e2ce86d

Change-Id: Iec0e3d87ce30625fb5d574817a43e67f51d0a60a
2016-10-14 07:49:48 +00:00
Steven Moreland
8c2e2ce86d Merge "Cleanup nfc service code."
am: a91254d196

Change-Id: I5bb71ea5f876bc44519200fc6e640f5cd5b61ebb
2016-10-14 07:46:18 +00:00
Treehugger Robot
a91254d196 Merge "Cleanup nfc service code." 2016-10-14 07:42:18 +00:00
Myles Watson
733adade9d Add Bluetooth HAL definition am: acfbd25247 am: 97e5e07f44
am: 51adf98706

Change-Id: Ie1370c4b0ba1526dab4b8fd3c61166ed756cdb9f
2016-10-13 22:51:49 +00:00
Myles Watson
51adf98706 Add Bluetooth HAL definition am: acfbd25247
am: 97e5e07f44

Change-Id: I1e6f52a16b0018a7f5a53a8d6af9154e37c623ee
2016-10-13 22:48:41 +00:00
Myles Watson
97e5e07f44 Add Bluetooth HAL definition
am: acfbd25247

Change-Id: I6af87217e138df95815178c0fd9c78102cac0a77
2016-10-13 22:46:41 +00:00
Myles Watson
acfbd25247 Add Bluetooth HAL definition
Test: compiles
Bug: 31972505
Change-Id: I7608b0814c9ca697b21c9e115cfcd81ab1364892
2016-10-13 22:32:38 +00:00
Steven Moreland
7573963148 Cleanup nfc service code.
Test: mma
Change-Id: Ie65c5bfde292107bec567a297e86eebf5cd7fa41
2016-10-13 09:33:18 -07:00
Steven Moreland
a8bebf4b23 Merge "Added test for overloading." am: a3ba3c359c am: 51eac9ecae
am: 0a94cf6e57

Change-Id: I79d7bc756e7f973155bfe31d06fafd9260f66850
2016-10-12 00:31:56 +00:00
Steven Moreland
0a94cf6e57 Merge "Added test for overloading." am: a3ba3c359c
am: 51eac9ecae

Change-Id: I4e57905a1d5d22759021db4412f44b635da6e494
2016-10-12 00:25:41 +00:00
Steven Moreland
51eac9ecae Merge "Added test for overloading."
am: a3ba3c359c

Change-Id: I4deea63a5191b3ca8191a59b4c48aef2c2318a54
2016-10-12 00:19:07 +00:00
Treehugger Robot
a3ba3c359c Merge "Added test for overloading." 2016-10-11 23:24:47 +00:00
Steven Moreland
86c848de0b Added test for overloading.
Test: make, hidl_test
Bug: 31758541
Change-Id: Ia0fdad2f0b0155065a7dec5526ab5d14a9ec1f52
2016-10-11 22:40:50 +00:00
Roshan Pius
182f980f9c wifi: Invoke failure callbacks am: f243631af8 am: de95c70497
am: 77b9999d20

Change-Id: Ib16c793e965993b184ee8825533164a889beb354
2016-10-11 21:02:33 +00:00
Roshan Pius
fc3862dc93 wifi: Add WifiRttController object am: 5926828728 am: 6de20076a3
am: 495ffe9bcb

Change-Id: I1707ca5f7f07236b94115e28e645ba7acce3e5f6
2016-10-11 21:02:32 +00:00
Roshan Pius
c7e7cf6683 wifi: Add Iface related method implementations in WifiChip am: 35d958c43f am: 11cbff5cee
am: 757938287e

Change-Id: I120d1ed4bdb6913b7230b0e2f62629e0c9f5ffb3
2016-10-11 21:02:30 +00:00
Roshan Pius
284a74db6d wifi: Add the various iface object implementation am: 3e2d671a4c am: 6179a92b9a
am: 53046195bf

Change-Id: I14d64f7dd2e74a4519500285612aa444d3139665
2016-10-11 21:02:29 +00:00
Roshan Pius
357eb45362 wifi: Remove "Wlan" prefix from wifi_legacy_hal public methods am: ab5c471b0b am: 638c7d6fa4
am: 06c0ff2343

Change-Id: I20fa6972e27ebf89e5ef6432bb256bd82ddc4f8b
2016-10-11 21:02:27 +00:00
Roshan Pius
778b9cede7 wifi: Add support for multiple chips in IWifi am: cd566bddd7 am: f7702fcfba
am: e8ff1680f0

Change-Id: I0eb3749ab1f13348c289fba7b4e7f43e8a49574a
2016-10-11 21:02:26 +00:00
Roshan Pius
52ecf27088 wifi(interface): Add RTT Controller object am: fcbf923d3a am: 83090ab624
am: c3b023d51a

Change-Id: Ifcf25a429a4af5c180d2d02c10bc6c1cb41630c5
2016-10-11 21:02:24 +00:00
Roshan Pius
e86e9f157a wifi(interface): Add Iface objects am: adcfba4b09 am: 68e09f0c35
am: bd0cd30d0d

Change-Id: I842340fb3b4a56c6fdd0d6a0cfbf99a4219386d8
2016-10-11 21:02:23 +00:00
Roshan Pius
77b9999d20 wifi: Invoke failure callbacks am: f243631af8
am: de95c70497

Change-Id: Id208c0abe50766311e7597f47a943873b78fdbb6
2016-10-11 20:56:47 +00:00
Roshan Pius
495ffe9bcb wifi: Add WifiRttController object am: 5926828728
am: 6de20076a3

Change-Id: I42573cf460d4a73e07ef57afdd32f59393eb0890
2016-10-11 20:56:46 +00:00
Roshan Pius
757938287e wifi: Add Iface related method implementations in WifiChip am: 35d958c43f
am: 11cbff5cee

Change-Id: I0d48778f5eb4be3ece745082b79cffa8f69a4ae8
2016-10-11 20:56:44 +00:00
Roshan Pius
53046195bf wifi: Add the various iface object implementation am: 3e2d671a4c
am: 6179a92b9a

Change-Id: I1bfed5ab6fe2e765abfdcde1b81e1127e1c964f6
2016-10-11 20:56:43 +00:00
Roshan Pius
06c0ff2343 wifi: Remove "Wlan" prefix from wifi_legacy_hal public methods am: ab5c471b0b
am: 638c7d6fa4

Change-Id: I8f2d397c50478cb65af8fae8d99fe8c76f2c8b21
2016-10-11 20:56:41 +00:00
Roshan Pius
e8ff1680f0 wifi: Add support for multiple chips in IWifi am: cd566bddd7
am: f7702fcfba

Change-Id: If6ca4867325da53ffe88f95d7046539cb903cd1c
2016-10-11 20:56:40 +00:00
Roshan Pius
c3b023d51a wifi(interface): Add RTT Controller object am: fcbf923d3a
am: 83090ab624

Change-Id: I229a08b8283a26b64244b4876e773f995c2d9062
2016-10-11 20:56:39 +00:00
Roshan Pius
bd0cd30d0d wifi(interface): Add Iface objects am: adcfba4b09
am: 68e09f0c35

Change-Id: I49a49e23c72ecd54c0283d9291a1c983bb86e745
2016-10-11 20:56:37 +00:00
Roshan Pius
de95c70497 wifi: Invoke failure callbacks
am: f243631af8

Change-Id: Ida5787f25b0ab8cfb7a42b7d02f39871771c27d2
2016-10-11 20:49:10 +00:00
Roshan Pius
6de20076a3 wifi: Add WifiRttController object
am: 5926828728

Change-Id: I9d4b29916e3873b7ddba4dbf32fa51c1ceab8c91
2016-10-11 20:49:09 +00:00
Roshan Pius
11cbff5cee wifi: Add Iface related method implementations in WifiChip
am: 35d958c43f

Change-Id: Id9009dd7b246940de52fbefeb251944d9106b8e5
2016-10-11 20:49:08 +00:00
Roshan Pius
6179a92b9a wifi: Add the various iface object implementation
am: 3e2d671a4c

Change-Id: Ibd2223e329f8fd6c00a8782581abe3d428012a60
2016-10-11 20:49:07 +00:00
Roshan Pius
638c7d6fa4 wifi: Remove "Wlan" prefix from wifi_legacy_hal public methods
am: ab5c471b0b

Change-Id: I6cad5d5a233c26aee4a8a9667354a8dfad958e82
2016-10-11 20:49:06 +00:00
Roshan Pius
f7702fcfba wifi: Add support for multiple chips in IWifi
am: cd566bddd7

Change-Id: I474546e49179f63a1e65dd6f5281c21441f5228d
2016-10-11 20:49:04 +00:00
Roshan Pius
83090ab624 wifi(interface): Add RTT Controller object
am: fcbf923d3a

Change-Id: I511b158bf8bafb7dd54fec18941e35b14cec380f
2016-10-11 20:49:03 +00:00
Roshan Pius
68e09f0c35 wifi(interface): Add Iface objects
am: adcfba4b09

Change-Id: I429ea70427a09948ded4089856bda67303b6b075
2016-10-11 20:49:02 +00:00
Roshan Pius
f243631af8 wifi: Invoke failure callbacks
Invoke the failure callbacks for |requestChipDebugInfo|,
|requestDriverDebugDump| and |requestFirmwareDebugDump| methods.

Bug: 32014425
Test: Compiles
Change-Id: I49b8ae93fe846df6d9663b10d2a70eb89bd00931
2016-10-11 07:46:24 -07:00
Roshan Pius
5926828728 wifi: Add WifiRttController object
Create the WifiRttController object and add the createRttController
method in WifiChip.

Bug: 31991232
Test: Compiles
Change-Id: I34649097c96488c660bef5acceac1a6478f80dca
2016-10-11 07:46:24 -07:00
Roshan Pius
35d958c43f wifi: Add Iface related method implementations in WifiChip
Add the iface creation/retrieval/list method implementations in WifiChip.
WifiChip does not yet support the chip mode configuration. So, all
|createIface| method calls succeed today. Once the mode configuration
changes are in place, we will deny iface creation requests depending on
the iface combination supported in the current mode.

The iface objects are all invalidated and deleted on mode switches and
when HAL is stopped.

While there,
Change the |callbacks_| member to std::vector instead of std::set. We
don't really need a set to store the list of callbacks.

Bug: 31943042
Test: Compiles
Change-Id: Ic94864c8b11aabbe569b5157d68d6056364a3c4c
2016-10-11 07:46:24 -07:00
Roshan Pius
3e2d671a4c wifi: Add the various iface object implementation
This CL adds the implementation classes for the various iface HIDL
interfaces defined. These classes implement the
|getName| & |getType| methods in the Iface HIDL interface.

Integration of these objects with WifiChip class is implemented in the
next CL.

Bug: 31943042
Test: Compiles
Change-Id: I219afd6441e15c76cf7c61f7bcd2b3568dba2b98
2016-10-11 07:46:24 -07:00
Roshan Pius
ab5c471b0b wifi: Remove "Wlan" prefix from wifi_legacy_hal public methods
All the legacy HAL API's in the function table uses the "wlan0"
interface handle for the various operations. But, this is an internal
detail that should be abstracted inside WifiLegacyHal class. So, rename
the public methods to remove the "Wlan" prefix from them.

Also, add methods to fetch the iface names to use for the various types
of HAL.

Bug: 31943042
Test: Compiles
Change-Id: I35a6cdea0ad7cff295d33c0245953258129fba43
2016-10-11 07:46:24 -07:00
Roshan Pius
cd566bddd7 wifi: Add support for multiple chips in IWifi
The modified HIDL interface supports multiple chip instances on the
device. Modify the |IWifi| interface implementation to support the new
methods.

NOTE: The legacy HAL implementation will continue to only expose 1 chip.

While there,
Change the |callbacks_| member to std::vector instead of std::set. We
don't really need a set to store the list of callbacks.

Bug: 32003988
Test: Compiles
Change-Id: I31e704100f716e223095890279bdf93d2a04377e
2016-10-11 07:46:24 -07:00
Roshan Pius
fcbf923d3a wifi(interface): Add RTT Controller object
Create a RTT controller object to use for initiating all the RTT related
HAL opertations.
Since we don't want to fix the iface on which to initiate RTT operations,
these methods will be rooted in a new standalone object |RttController|.
Framework can decide to intiate an instance of |RttController| on a
specified iface or let the implementation pick one.

Bug: 31991232
Test: Interface compiles.
Change-Id: I65f7a7babd72db26ce6549f572abd9ef73700c82
2016-10-11 07:46:24 -07:00