summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* wifi: Remove obsolete driver_nl80211.hDmitry Shmidt2015-01-051-225/+0
| | | | | | | Mainstream wpa_supplicant now has common driver_nl80211.h Change-Id: I6d886daf39110969b2442c3943806364e63a5d04 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* Fix wifi_hal.h and gscan.h to compile for c projects.Amarnath Hullur Subramanyam2014-12-082-9/+13
| | | | | | | | | When the wifi_hal.h is included as part of the c source code files some of the functions are not exported. The const variable as an index to an array is causing compiler error. The changes are to address these issues. Change-Id: Ia2dbd7a87315cee8d0246a8ac6539c9b4b22ffd4
* New Additions to WifiScanner APIsVinit Deshpande2014-12-031-3/+17
| | | | | | | | | | | Added single shot scan, and maxScansToCache. Also fixed getScanResults() to report scan results to listeners. Bug: 18087596 Bug: 17694040 Bug: 18059273 Change-Id: I8a6da5426561e22e72d1e99c5537205b893077dd
* am 27b9f4b5: am e714af92: audio policy: use legacy stream type definitionsEric Laurent2014-11-262-3/+3
|\ | | | | | | | | * commit '27b9f4b5bd44ef658c771cd4fb137c321c3527c6': audio policy: use legacy stream type definitions
| * am e714af92: audio policy: use legacy stream type definitionsEric Laurent2014-11-262-3/+3
| |\ | | | | | | | | | | | | * commit 'e714af927c1e87a488178315b78b0c12c0ec9db9': audio policy: use legacy stream type definitions
| | * audio policy: use legacy stream type definitionsEric Laurent2014-11-112-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | New stream types have been added, so make sure that legacy implementation uses legacy stream definitions Bug: 18067208 Change-Id: I8042ebe9ac3e7eda380b8c91650f2ac16b44bc34
* | | am e88fe446: am b4b0608b: Merge "legacy audio policy: check string ↵Glenn Kasten2014-11-071-0/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | parameters before use" into lmp-mr1-dev * commit 'e88fe4462e186f82f519e115a1d19d6f0089012a': legacy audio policy: check string parameters before use
| * | am b4b0608b: Merge "legacy audio policy: check string parameters before use" ↵Glenn Kasten2014-11-071-0/+9
| |\ \ | | |/ | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'b4b0608b0560a7cad27aeec0af8b1728b971aa3a': legacy audio policy: check string parameters before use
| | * Merge "legacy audio policy: check string parameters before use" into lmp-mr1-devGlenn Kasten2014-11-071-0/+9
| | |\
| | | * legacy audio policy: check string parameters before useGlenn Kasten2014-11-061-0/+9
| | | | | | | | | | | | | | | | | | | | Bug: 18262893 Change-Id: Iee6e59db7ffae5612256ba1f74aba62bc8cf12db
* | | | am 7124b707: am 69f48b86: [AU]Buganizer ID: 17182487, sprout audio HAL ↵Hochi Huang2014-10-281-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | should mute all audio output with property ro.audio.silent set to true * commit '7124b707bb87d000997fd6705d8596a42d803b5e': [AU]Buganizer ID: 17182487, sprout audio HAL should mute all audio output with property ro.audio.silent set to true
| * | | am 69f48b86: [AU]Buganizer ID: 17182487, sprout audio HAL should mute all ↵Hochi Huang2014-10-281-0/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | audio output with property ro.audio.silent set to true * commit '69f48b86d78ac8968ccafc6287eed3079f1cb56e': [AU]Buganizer ID: 17182487, sprout audio HAL should mute all audio output with property ro.audio.silent set to true
| | * | [AU]Buganizer ID: 17182487, sprout audio HAL should mute all audio output ↵Hochi Huang2014-10-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with property ro.audio.silent set to true Signed-off-by: Hochi Huang <hochi.huang@mediatek.com> Change-Id: I1bda15838da409d08f9ed0e8023b93023109cb2d (cherry picked from commit a9a3b5d93ee90c21619ddb6a606d24325109e914)
* | | | am 1d9e2d64: am 62e06c83: am e96b538e: Merge "Wifi Hal: Extend feature set ↵Vinit Deshpande2014-10-270-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | to advertise link layer stats support" into lmp-dev * commit '1d9e2d64b843247238bb6a68140a4b2cb3cbb7ea':
| * | | am 62e06c83: am e96b538e: Merge "Wifi Hal: Extend feature set to advertise ↵Vinit Deshpande2014-10-270-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | link layer stats support" into lmp-dev * commit '62e06c838de988286d5d4ddd1d8a30f8af980139':
| | * \ \ am e96b538e: Merge "Wifi Hal: Extend feature set to advertise link layer ↵Vinit Deshpande2014-09-231-0/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stats support" into lmp-dev * commit 'e96b538e168846a31edd7c608267d79f3f30b871': Wifi Hal: Extend feature set to advertise link layer stats support
* | | \ \ \ am 39652b00: am 8d15568d: am 2a441bce: Revert "Wifi Hal: Nan Header file"Amarnath Hullur Subramanyam2014-10-270-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | * commit '39652b00b9bde8b39bf2a4d1a9bb4d8f06ace5b9':
| * | | | | am 8d15568d: am 2a441bce: Revert "Wifi Hal: Nan Header file"Amarnath Hullur Subramanyam2014-10-270-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | * commit '8d15568df598b1a9ca5059ba8de7ec398fdfc241':
| | * | | | am 2a441bce: Revert "Wifi Hal: Nan Header file"Amarnath Hullur Subramanyam2014-09-232-878/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2a441bce2825f1c186071af55c1807e1688f9d3b': Revert "Wifi Hal: Nan Header file"
* | | \ \ \ \ am 4dcc860c: am 67741614: wifi: Sync with wpa_supplicant 9ead16e (d5fe4e6)Dmitry Shmidt2014-10-081-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '4dcc860c6b8772268321d339004ce1039efb25ee': wifi: Sync with wpa_supplicant 9ead16e (d5fe4e6)
| * | | | | | am 67741614: wifi: Sync with wpa_supplicant 9ead16e (d5fe4e6)Dmitry Shmidt2014-10-081-1/+1
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | * commit '677416147e3b2b398db45d2194cd8a2c396410ce': wifi: Sync with wpa_supplicant 9ead16e (d5fe4e6)
| | * | | | | wifi: Sync with wpa_supplicant 9ead16e (d5fe4e6)Dmitry Shmidt2014-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iee4aabf0a8259bb74bacde1c7045cfa2468035a7 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | | | | am f0bc19a5: am 9dd37a67: wifi: Sync with wpa_supplicant commit 661b4f7 ↵Dmitry Shmidt2014-10-071-0/+9
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (a313d17) * commit 'f0bc19a509ccd1448b0f266d0f7c984a16e450b5': wifi: Sync with wpa_supplicant commit 661b4f7 (a313d17)
| * | | | | | am 9dd37a67: wifi: Sync with wpa_supplicant commit 661b4f7 (a313d17)Dmitry Shmidt2014-10-061-0/+9
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '9dd37a671485efd40db73335ba2f0f5a87555e46': wifi: Sync with wpa_supplicant commit 661b4f7 (a313d17)
| | * | | | | wifi: Sync with wpa_supplicant commit 661b4f7 (a313d17)Dmitry Shmidt2014-10-061-0/+9
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17882233 Change-Id: I32d93380f6fb80409e45e6ec9983bb2f381c2319 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | | | am 38eac43c: am 8ddf81e2: [AU] Update volume setting and Audio Device API 3.0Hochi Huang2014-09-251-0/+17
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '38eac43c27afaef74831e5a24654c9b68691e415': [AU] Update volume setting and Audio Device API 3.0
| * | | | | am 8ddf81e2: [AU] Update volume setting and Audio Device API 3.0Hochi Huang2014-09-251-0/+17
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '8ddf81e20fd514907de51ec82a617143d2e35276': [AU] Update volume setting and Audio Device API 3.0
| | * | | | [AU] Update volume setting and Audio Device API 3.0Hochi Huang2014-09-241-0/+17
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | Change-Id: I772584ae05e6a8d2fdc8c4a52e44ad80c3c1a4a7 Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
* | | | | am ef401f0c: am e96b538e: Merge "Wifi Hal: Extend feature set to advertise ↵Vinit Deshpande2014-09-231-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | link layer stats support" into lmp-dev * commit 'ef401f0c6db514a38e58c4d6f72f8616dceb3e8c': Wifi Hal: Extend feature set to advertise link layer stats support
| * | | | am e96b538e: Merge "Wifi Hal: Extend feature set to advertise link layer ↵Vinit Deshpande2014-09-231-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | stats support" into lmp-dev * commit 'e96b538e168846a31edd7c608267d79f3f30b871': Wifi Hal: Extend feature set to advertise link layer stats support
| | * | | Merge "Wifi Hal: Extend feature set to advertise link layer stats support" ↵Vinit Deshpande2014-09-231-0/+1
| | |\ \ \ | | | |_|/ | | |/| | | | | | | into lmp-dev
| | | * | Wifi Hal: Extend feature set to advertise link layer stats supportAmarnath Hullur Subramanyam2014-09-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a new macro in feature set to indicate wifihal support for link layer stats collection. Bug: 17359758 Change-Id: I3f8ecce67430bd8270fb157a4e6cd246503a3d9f
* | | | | am cef88a35: am 2a441bce: Revert "Wifi Hal: Nan Header file"Amarnath Hullur Subramanyam2014-09-232-878/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'cef88a353b6ed1730b9486328d306186573157c2': Revert "Wifi Hal: Nan Header file"
| * | | | am 2a441bce: Revert "Wifi Hal: Nan Header file"Amarnath Hullur Subramanyam2014-09-232-878/+0
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | * commit '2a441bce2825f1c186071af55c1807e1688f9d3b': Revert "Wifi Hal: Nan Header file"
| | * | Revert "Wifi Hal: Nan Header file"Amarnath Hullur Subramanyam2014-09-192-878/+0
| | |/ | | | | | | | | | | | | | | | | | | | | | This reverts commit 5f11341f2f5165f25e108d9519f08d78704b8ae7. Bug: 17359758 Change-Id: I5f2b94d2288e1400558c1de8a2ab25f05155aca8
* | | am bc4828d2: (-s ours) am b111e7ec: DO NOT MERGE - openOutputStreamWithFlags ↵Qiming Shi2014-09-080-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | should be declared as abstract function * commit 'bc4828d232b82237fb1b9d040999d7223fb2c0eb': DO NOT MERGE - openOutputStreamWithFlags should be declared as abstract function
| * | am b111e7ec: DO NOT MERGE - openOutputStreamWithFlags should be declared as ↵Qiming Shi2014-09-080-0/+0
| |\ \ |/ / / | | _ | | | | | | | | abstract function * commit 'b111e7ecc6789dade2818782da6b33e1d187e344': DO NOT MERGE - openOutputStreamWithFlags should be declared as abstract function
| * DO NOT MERGE - openOutputStreamWithFlags should be declared as abstract functionQiming Shi2014-09-081-1/+1
| | | | | | | | | | | | | | Bug: 17416117. Change-Id: Ia9150944977560ea296c46ddf75da960d6a3e541 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
* | am fddda3f9: wifi: hal: Add wifi_set_nodfs_flag() functionDmitry Shmidt2014-08-261-0/+2
|\ \ | |/ | | | | | | * commit 'fddda3f935c6eb21c70eede106baa9c85cc5bfdb': wifi: hal: Add wifi_set_nodfs_flag() function
| * wifi: hal: Add wifi_set_nodfs_flag() functionDmitry Shmidt2014-08-251-0/+2
| | | | | | | | | | | | | | Bug: 17181998 Change-Id: Iac431c2804e8252273e00c7b490c955f5528c83e Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | am d83e4abc: wifi: Sync with wpa_supplicant commit 0365883 (4aa9c15)Dmitry Shmidt2014-08-151-0/+1
|\ \ | |/ | | | | | | * commit 'd83e4abc7fb074e4f9bfe685128a19b7785ae635': wifi: Sync with wpa_supplicant commit 0365883 (4aa9c15)
| * wifi: Sync with wpa_supplicant commit 0365883 (4aa9c15)Dmitry Shmidt2014-08-141-0/+1
| | | | | | | | | | | | | | Bug: 17027752 Change-Id: Ibf1a23a6750ec041ec068070791037fdc538b13e Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | am 726b5dad: PNO MAC rotation + Hotlist LOST eventAshwin2014-08-122-0/+7
|\ \ | |/ | | | | | | * commit '726b5dada8055f705bb1ffb67d9acc3cad99457d': PNO MAC rotation + Hotlist LOST event
| * PNO MAC rotation + Hotlist LOST eventAshwin2014-08-112-0/+7
| | | | | | | | | | | | | | modified: include/hardware_legacy/gscan.h modified: include/hardware_legacy/wifi_hal.h Change-Id: I0ad599a20210081ffd05040fbb810f1ec1f9dd62
* | am 4c20a09e: Merge "openOutputStreamWithFlags should be declared as abstract ↵Eric Laurent2014-07-291-1/+1
|\ \ | | | | | | | | | | | | | | | | | | function" * commit '4c20a09e8684657448f0bc97a2da4e56c94d484e': openOutputStreamWithFlags should be declared as abstract function
| * \ Merge "openOutputStreamWithFlags should be declared as abstract function"Eric Laurent2014-07-251-1/+1
| |\ \
| | * | openOutputStreamWithFlags should be declared as abstract functionQiming Shi2014-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia9150944977560ea296c46ddf75da960d6a3e541 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
* | | | am a311a983: audio HAL: add parameters to open stream functionsEric Laurent2014-07-281-2/+5
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * commit 'a311a983eb4035b272033105119cb44d814fb2db': audio HAL: add parameters to open stream functions
| * | | audio HAL: add parameters to open stream functionsEric Laurent2014-07-271-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass device address (and audio source for inputs) to open_output_stream() and open_input_stream() audio HAL functions. Bug: 14815883. Change-Id: Ib1c3e98518733fa5eab54cbca4220e388d3f6211
* | | | am 39b3abc0: Merge "audio: add mechanism to re-route nullified audio"Eric Laurent2014-07-232-1/+18
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit '39b3abc0ca227d72f66bb47a75cec2acfb4d6de0': audio: add mechanism to re-route nullified audio