summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use audio_in_acoustics_t consistently"Glenn Kasten2012-02-034-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Use audio_in_acoustics_t consistentlyGlenn Kasten2012-01-274-4/+4
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | am 7490f9bf: am b4ff7281: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | am b4ff7281: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Use audio_source_t consistentlyGlenn Kasten2012-01-261-2/+2
| |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use audio_format_t consistently"Glenn Kasten2012-01-204-20/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Use audio_format_t consistentlyGlenn Kasten2012-01-124-20/+22
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Audio policy HAL set_ringer_mode is deprecated"Glenn Kasten2012-01-204-17/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Audio policy HAL set_ringer_mode is deprecatedGlenn Kasten2012-01-184-17/+2
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typosGlenn Kasten2012-01-182-6/+7
|/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "audio policy manager: stream volume per device"Eric Laurent2012-01-174-50/+177
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | audio policy manager: stream volume per deviceEric Laurent2012-01-174-50/+177
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use audio_mode_t consistently"Glenn Kasten2012-01-172-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Use audio_mode_t consistentlyGlenn Kasten2012-01-122-4/+6
| |/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | Use audio_stream_type_t consistentlyGlenn Kasten2012-01-121-2/+2
|/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Fix monitor socket pollIrfan Sheriff2012-01-111-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-087-45/+45
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-054-47/+47
* | | | | | | | | | | | | | | | | | | | | | | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-041-5/+5
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-034-12/+12
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Add support for p2p socket communicationIrfan Sheriff2011-12-282-113/+137
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | am af9565aa: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | audio policy manager: remove ringer mode dumpEric Laurent2011-12-081-2/+3
* | | | | | | | | | | | | | | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | am c16ac09f: Force camera shutter sound to speaker in Japan.Eric Laurent2011-11-022-12/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Force camera shutter sound to speaker in Japan.Eric Laurent2011-11-012-12/+42
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-10-310-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | merge in ics-release history after reset to masterThe Android Automerger2011-10-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | merge in ics-release history after reset to masterThe Android Automerger2011-10-190-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | merge in ics-release history after reset to masterThe Android Automerger2011-10-090-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | merge in ics-release history after reset to masterThe Android Automerger2011-10-060-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | |
| | | | | * | | | | | | | | | merge in ics-release history after reset to masterThe Android Automerger2011-09-280-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | |
| | | | | | * | | | | | | | | merge in ics-release history after reset to masterThe Android Automerger2011-09-200-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|_|/ / / | | | | | | |/| | | | | | | |
| | | | | | | * | | | | | | | merge in ics-release history after reset to masterThe Android Automerger2011-09-130-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | |_|_|_|_|/ / / | | | | | | | |/| | | | | | |
| | | | | | | | * | | | | | | merge in ics-release history after reset to masterThe Android Automerger2011-09-110-0/+0
| | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | |_|_|/ / / / | | | | | | | | |/| | | | | |
| | | | | | | | | * | | | | | merge in ics-release history after reset to masterThe Android Automerger2011-08-300-0/+0
| | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | |_|/ / / / | | | | | | | | | |/| | | | |
| | | | | | | | | | * | | | | merge in ics-release history after reset to masterThe Android Automerger2011-08-300-0/+0
| | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | |/ / / / / | | | | | | | | | |/| / / / / | | | | | | | | | | |/ / / /
* | | | | | | | | | | | | | Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGESteve Block2011-10-256-110/+110
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Fix music heard in speaker before notifications.Eric Laurent2011-10-201-1/+3
|/ / / / / / / / / / / /
* | | | | | | | | | | | Fix issue 5440852: Youtube volume is too small ...Eric Laurent2011-10-182-29/+135
|/ / / / / / / / / / /
* | | | | | | | | | | Merge "wifi: Fix entropy file size"Dmitry Shmidt2011-10-061-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | wifi: Fix entropy file sizeDmitry Shmidt2011-10-061-4/+4
| |/ / / / / / / / /
* | | | | | | | | | fix build: method needs to be pure virtual, otherwise needs to be defined.Olivier Bailly2011-10-051-1/+1
|/ / / / / / / / /
* | | | | | | | | wifi: Change pipe to socket pair in termination of monitor thread codeDmitry Shmidt2011-09-271-20/+25
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-09-220-0/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-09-210-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
* | | | | | | | Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-09-210-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /