summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* audio: several fixes in audio routing callbacksEric Laurent2015-07-107-45/+66
* audio policy: session route: move SessionRoute to commonFrançois Gaffie2015-07-095-179/+244
* Merge "audio policy: add support for device combo with speaker safe" into mnc...Eric Laurent2015-07-092-4/+12
|\
| * audio policy: add support for device combo with speaker safeEric Laurent2015-07-072-4/+12
* | Merge "SoftAVCDec: fail gracefully in onQueueFilled" into mnc-devRobert Shih2015-07-092-15/+50
|\ \
| * | SoftAVCDec: fail gracefully in onQueueFilledHamsalekha S2015-07-092-15/+50
| |/
* | Merge "MPEG4Source::fragmentedRead: check range before writing into buffers" ...Robert Shih2015-07-081-8/+40
|\ \
| * | MPEG4Source::fragmentedRead: check range before writing into buffersRobert Shih2015-07-071-8/+40
* | | Merge "AudioFlinger: reset frame position on standby" into mnc-devPhil Burk2015-07-084-67/+87
|\ \ \ | |_|/ |/| |
| * | AudioFlinger: reset frame position on standbyPhil Burk2015-07-074-67/+87
* | | Merge "NuPlayer: disable pre-start preview for audio only sources" into mnc-devRobert Shih2015-07-072-9/+22
|\ \ \
| * | | NuPlayer: disable pre-start preview for audio only sourcesRobert Shih2015-07-072-9/+22
| |/ /
* | | Merge "camera2: Fix native binder interface and add tests." into mnc-devRuben Brunk2015-07-079-16/+514
|\ \ \
| * | | camera2: Fix native binder interface and add tests.Ruben Brunk2015-07-069-16/+514
* | | | Merge "CameraModule: fix getCameraInfo()" into mnc-devChien-Yu Chen2015-07-072-6/+15
|\ \ \ \
| * | | | CameraModule: fix getCameraInfo()Chien-Yu Chen2015-07-062-6/+15
* | | | | audio: Do not delete PatchRecord before Peer is stoppedEric Laurent2015-07-061-3/+12
* | | | | Merge "audio policy: fix regression in incall notification management" into m...Eric Laurent2015-07-061-2/+5
|\ \ \ \ \
| * | | | | audio policy: fix regression in incall notification managementEric Laurent2015-07-021-2/+5
* | | | | | Merge "audio: add definitions for devices connected over IP" into mnc-devEric Laurent2015-07-062-0/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | audio: add definitions for devices connected over IPEric Laurent2015-07-062-0/+6
| |/ / / /
* | | | | Fix build warningGlenn Kasten2015-07-061-0/+1
* | | | | Merge "audiopolicy: Update flag enum tables for the new flags" into mnc-devGlenn Kasten2015-07-061-0/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | audiopolicy: Update flag enum tables for the new flagsRavi Kumar Alamanda2015-07-021-0/+4
* | | | | Merge "stagefright: prevent allocating stale buffers for OMX decoders" into m...Lajos Molnar2015-07-014-12/+33
|\ \ \ \ \
| * | | | | stagefright: prevent allocating stale buffers for OMX decodersLajos Molnar2015-07-014-12/+33
* | | | | | stagefright: fix deadlock and NPE in GraphicBufferSourceLajos Molnar2015-07-013-10/+15
* | | | | | am 907d0c52: (-s ours) am 9cc01515: am 4e2a1310: am fc9c5e60: am d5d23f64: am...Eric Laurent2015-07-010-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ am 9cc01515: am 4e2a1310: am fc9c5e60: am d5d23f64: am 36d73eab: am 0e35e4f9:...Eric Laurent2015-06-300-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ am 4e2a1310: am fc9c5e60: am d5d23f64: am 36d73eab: am 0e35e4f9: am c655561b:...Eric Laurent2015-06-300-0/+0
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ am fc9c5e60: am d5d23f64: am 36d73eab: am 0e35e4f9: am c655561b: (-s ours) am...Eric Laurent2015-06-300-0/+0
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ am d5d23f64: am 36d73eab: am 0e35e4f9: am c655561b: (-s ours) am 29b83cbb: DO...Eric Laurent2015-06-300-0/+0
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ am 36d73eab: am 0e35e4f9: am c655561b: (-s ours) am 29b83cbb: DO NOT MERGE - ...Eric Laurent2015-06-300-0/+0
| | | | | |\ \ \ \ \ \
| | | | | | * \ \ \ \ \ am 0e35e4f9: am c655561b: (-s ours) am 29b83cbb: DO NOT MERGE - audio effects...Eric Laurent2015-06-300-0/+0
| | | | | | |\ \ \ \ \ \
| | | | | | | * \ \ \ \ \ am c655561b: (-s ours) am 29b83cbb: DO NOT MERGE - audio effects: fix heap ov...Eric Laurent2015-06-300-0/+0
| | | | | | | |\ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ am 29b83cbb: DO NOT MERGE - audio effects: fix heap overflowEric Laurent2015-06-236-154/+103
| | | | | | | | |\ \ \ \ \ \
| | | | | | | | | * | | | | | DO NOT MERGE - audio effects: fix heap overflowEric Laurent2015-06-236-154/+103
* | | | | | | | | | | | | | | resolved conflicts for merge of ca12af3f to mnc-devWei Jia2015-07-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am 2d80c0a1: am a549658b: am 7397892d: am 402eaab9: am 370290f4: am bcd5edf9:...Wei Jia2015-06-301-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am a549658b: am 7397892d: am 402eaab9: am 370290f4: am bcd5edf9: am 13c925ca:...Wei Jia2015-06-301-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | am 7397892d: am 402eaab9: am 370290f4: am bcd5edf9: am 13c925ca: am 6ff53b96:...Wei Jia2015-06-301-0/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / /
| | | | * | | | | | | | | | | am 402eaab9: am 370290f4: am bcd5edf9: am 13c925ca: am 6ff53b96: Merge "Preve...Wei Jia2015-06-301-0/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / /
| | | | | * | | | | | | | | | am 370290f4: am bcd5edf9: am 13c925ca: am 6ff53b96: Merge "Prevent integer ov...Wei Jia2015-06-301-0/+4
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / /
| | | | | | * | | | | | | | | am bcd5edf9: am 13c925ca: am 6ff53b96: Merge "Prevent integer overflow when p...Wei Jia2015-06-301-0/+4
| | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / /
| | | | | | | * | | | | | | | am 13c925ca: am 6ff53b96: Merge "Prevent integer overflow when processing cov...Wei Jia2015-06-301-0/+4
| | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / /
| | | | | | | | * | | | | | | am 6ff53b96: Merge "Prevent integer overflow when processing covr MPEG4 atoms...Wei Jia2015-06-051-0/+4
| | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | |/ / / / / /
| | | | | | | | | * | | | | | Merge "Prevent integer overflow when processing covr MPEG4 atoms" into klp-devWei Jia2015-06-051-0/+4
| | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | * | | | | | Prevent integer overflow when processing covr MPEG4 atomsJoshua J. Drake2015-06-031-0/+4
* | | | | | | | | | | | | | | | Merge "Camera3-Device: Fix AE lock available" into mnc-devChien-Yu Chen2015-07-012-16/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Camera3-Device: Fix AE lock availableChien-Yu Chen2015-06-302-16/+16
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |