summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * am a5b275c3: Merge "Changes to restart supplicant on crash"Dmitry Shmidt2014-05-151-5/+27
| | |\
| | | * Merge "Changes to restart supplicant on crash"Dmitry Shmidt2014-05-151-5/+27
| | | |\
| | | | * Changes to restart supplicant on crashMahesh2014-05-151-5/+27
* | | | | am 384bd5d6: am 7b11946c: am 9739aeb2: Merge "Indicate WPA_EVENT_TERMINATING ...Dmitry Shmidt2014-05-141-4/+8
|\ \ \ \ \ | |/ / / /
| * | | | am 7b11946c: am 9739aeb2: Merge "Indicate WPA_EVENT_TERMINATING event on prim...Dmitry Shmidt2014-05-131-4/+8
| |\ \ \ \ | | |/ / /
| | * | | am 9739aeb2: Merge "Indicate WPA_EVENT_TERMINATING event on primary interface."Dmitry Shmidt2014-05-131-4/+8
| | |\ \ \ | | | |/ /
| | | * | Merge "Indicate WPA_EVENT_TERMINATING event on primary interface."Dmitry Shmidt2014-05-131-4/+8
| | | |\ \ | | | | |/
| | | | * Indicate WPA_EVENT_TERMINATING event on primary interface.Mahesh2014-05-131-4/+8
* | | | | am 62038fc4: am 2c388a44: am 8eb3354a: Merge "Audio: add an openOutputStreamW...Eric Laurent2014-05-083-1/+20
|\ \ \ \ \ | |/ / / /
| * | | | am 2c388a44: am 8eb3354a: Merge "Audio: add an openOutputStreamWithFlags API"Eric Laurent2014-05-073-1/+20
| |\ \ \ \ | | |/ / /
| | * | | am 8eb3354a: Merge "Audio: add an openOutputStreamWithFlags API"Eric Laurent2014-05-073-1/+20
| | |\ \ \ | | | |/ /
| | | * | Merge "Audio: add an openOutputStreamWithFlags API"Eric Laurent2014-05-073-1/+20
| | | |\ \
| | | | * | Audio: add an openOutputStreamWithFlags APIDavid Wagner2014-04-233-1/+20
* | | | | | Introduce on_full_scan_result event in WifiHalVinit Deshapnde2014-05-071-1/+9
* | | | | | Moving Wifi HAL to hardwareVinit Deshapnde2014-05-074-0/+4337
* | | | | | Merge "Update policy handling for USB inputs"Paul McLean2014-04-302-40/+280
|\ \ \ \ \ \
| * | | | | | Update policy handling for USB inputsPaul McLean2014-04-252-40/+280
* | | | | | | am 7ba0162d: am af477302: Merge commit \'50a76b9727c876405e59d61e082b4be0abeb...Bill Yi2014-04-300-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | am af477302: Merge commit \'50a76b9727c876405e59d61e082b4be0abebab4b\' into HEADBill Yi2014-04-300-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge commit '50a76b9727c876405e59d61e082b4be0abebab4b' into HEADBill Yi2014-04-290-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | am 60089828: Merge "Audio policy is 32-bit only"Glenn Kasten2014-03-171-0/+3
| | | |\ \ \ | | | | |/ /
| | | * | | am be39c1e4: Merge "audio policy : add AUDIO_DEVICE_IN_USB_DEVICE to sDeviceN...Glenn Kasten2014-03-171-0/+1
| | | |\ \ \
| | | * \ \ \ am eaf44380: Merge "Wi-Fi HAL: fix supplicant start failed issue"Narayan Kamath2014-03-171-6/+10
| | | |\ \ \ \
| | | * \ \ \ \ am c32be36f: Merge "wifi: check if supplicant is running before starting it"Dmitry Shmidt2014-03-111-1/+1
| | | |\ \ \ \ \
* | | | \ \ \ \ \ resolved conflicts for merge of 75402fdb to masterColin Cross2014-04-242-16/+19
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 64527db9: Merge "audio: allow compiling for 64-bit"Colin Cross2014-04-242-16/+19
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "audio: allow compiling for 64-bit"Colin Cross2014-04-232-16/+19
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | / | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | audio: allow compiling for 64-bitColin Cross2014-04-182-16/+19
| | |/ / / / /
* | | | | | | Merge "wifi: Sync with wpa_supplicant commit 7dba0e5 (bacb984)"Dmitry Shmidt2014-04-141-1/+5
|\ \ \ \ \ \ \
| * | | | | | | wifi: Sync with wpa_supplicant commit 7dba0e5 (bacb984)Dmitry Shmidt2014-04-141-1/+5
* | | | | | | | Initial implementation of USB Audio output.Paul McLean2014-03-281-73/+85
|/ / / / / / /
* | | | | | | am fa8ad9fb: am 60089828: Merge "Audio policy is 32-bit only"Glenn Kasten2014-03-171-0/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 60089828: Merge "Audio policy is 32-bit only"Glenn Kasten2014-03-171-0/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Audio policy is 32-bit only"Glenn Kasten2014-03-171-0/+3
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Audio policy is 32-bit onlyGlenn Kasten2014-03-171-0/+3
| | |/ / / /
* | | | | | am e6c7127e: am be39c1e4: Merge "audio policy : add AUDIO_DEVICE_IN_USB_DEVIC...Glenn Kasten2014-03-171-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am be39c1e4: Merge "audio policy : add AUDIO_DEVICE_IN_USB_DEVICE to sDeviceN...Glenn Kasten2014-03-171-0/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "audio policy : add AUDIO_DEVICE_IN_USB_DEVICE to sDeviceNameToEnumTable"Glenn Kasten2014-03-171-0/+1
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | audio policy : add AUDIO_DEVICE_IN_USB_DEVICE to sDeviceNameToEnumTablePeter Yoon2014-03-171-0/+1
| | |/ / /
* | | | | am bfad19d2: am eaf44380: Merge "Wi-Fi HAL: fix supplicant start failed issue"Narayan Kamath2014-03-171-6/+10
|\ \ \ \ \ | |/ / / /
| * | | | am eaf44380: Merge "Wi-Fi HAL: fix supplicant start failed issue"Narayan Kamath2014-03-171-6/+10
| |\ \ \ \ | | |/ / /
| | * | | Merge "Wi-Fi HAL: fix supplicant start failed issue"Narayan Kamath2014-03-171-6/+10
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Wi-Fi HAL: fix supplicant start failed issuejiaguo2014-03-131-6/+10
| | |/ /
* | | | Add more PCM formats to audio_policy.conf parserGlenn Kasten2014-03-071-0/+4
* | | | Rename setStreamOutput to invalidateStreamGlenn Kasten2014-02-284-11/+6
* | | | am e5a16307: am c32be36f: Merge "wifi: check if supplicant is running before ...Dmitry Shmidt2014-02-241-1/+1
|\ \ \ \ | |/ / /
| * | | am c32be36f: Merge "wifi: check if supplicant is running before starting it"Dmitry Shmidt2014-02-241-1/+1
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Merge "wifi: check if supplicant is running before starting it"Dmitry Shmidt2014-02-241-1/+1
| | |\
| | | * wifi: check if supplicant is running before starting itJonathan DE CESCO2013-01-071-1/+1
* | | | wifi: Sync with wpa_supplicant commit bd14a57Dmitry Shmidt2014-02-181-1/+1