summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Split ManagerDefault into Manager and ManagerDefinitionsFrançois Gaffie2015-04-0126-133/+235
* Audio Policy Refactor: reorganise headers inclusionFrançois Gaffie2015-04-0120-58/+159
* Revert "mediaplayer: ensure secure decoders are instantiated before starting ...Bart Sears2015-04-015-111/+14
* am 8f46a007: am 6bedacad: am d513b7da: am 31878abb: am 68fca636: mediaplayer:...Lajos Molnar2015-04-015-14/+111
|\
| * am 6bedacad: am d513b7da: am 31878abb: am 68fca636: mediaplayer: ensure secur...Lajos Molnar2015-04-015-14/+111
| |\
| | * am d513b7da: am 31878abb: am 68fca636: mediaplayer: ensure secure decoders ar...Lajos Molnar2015-04-015-14/+111
| | |\
| | | * am 31878abb: am 68fca636: mediaplayer: ensure secure decoders are instantiate...Lajos Molnar2015-04-015-14/+111
| | | |\
| | | | * am 68fca636: mediaplayer: ensure secure decoders are instantiated before star...Lajos Molnar2015-04-015-14/+111
| | | | |\
| | | | | * mediaplayer: ensure secure decoders are instantiated before starting sourceLajos Molnar2015-03-315-14/+111
* | | | | | Merge "Reject sample rate changes for fast tracks"Andy Hung2015-04-011-3/+7
|\ \ \ \ \ \
| * | | | | | Reject sample rate changes for fast tracksAndy Hung2015-03-311-3/+7
* | | | | | | Merge "camera2: Enforce client eviction on user switch."Ruben Brunk2015-03-314-19/+168
|\ \ \ \ \ \ \
| * | | | | | | camera2: Enforce client eviction on user switch.Ruben Brunk2015-03-314-19/+168
* | | | | | | | Merge "Do CRC check for MPEG2TS PSI sections"Jinsuk Kim2015-03-311-1/+112
|\ \ \ \ \ \ \ \
| * | | | | | | | Do CRC check for MPEG2TS PSI sectionsJinsuk Kim2015-03-311-1/+112
* | | | | | | | | Merge "Camera: iterate through all encoders for finding max video size"Yin-Chia Yeh2015-03-311-6/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Camera: iterate through all encoders for finding max video sizeYin-Chia Yeh2015-03-311-6/+20
* | | | | | | | | | am fadd74c3: (-s ours) am 5132e9ce: am 81e776d0: am 2a2642d8: am 42431438: DO...Eric Laurent2015-03-310-0/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | / / / / / | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | am 5132e9ce: am 81e776d0: am 2a2642d8: am 42431438: DO NOT MERGE - audio poli...Eric Laurent2015-03-311-2/+6
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | am 81e776d0: am 2a2642d8: am 42431438: DO NOT MERGE - audio policy: fix Devic...Eric Laurent2015-03-311-2/+6
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | am 2a2642d8: am 42431438: DO NOT MERGE - audio policy: fix DeviceVector::getD...Eric Laurent2015-03-311-2/+6
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | |
| | | | * | | | | am 42431438: DO NOT MERGE - audio policy: fix DeviceVector::getDevicesFromType()Eric Laurent2015-03-311-2/+6
| | | | |\ \ \ \ \ | | | | | | |_|_|/ | | | | | |/| | |
| | | | | * | | | DO NOT MERGE - audio policy: fix DeviceVector::getDevicesFromType()Eric Laurent2015-03-311-2/+6
* | | | | | | | | Merge "audio policy: fix IOProfile::isCompatibleProfile()"Eric Laurent2015-03-302-3/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | audio policy: fix IOProfile::isCompatibleProfile()Eric Laurent2015-03-302-3/+11
* | | | | | | | | | fix build break in clangChong Zhang2015-03-302-15/+26
* | | | | | | | | | Merge "audio policy: fix DeviceVector::getDevicesFromType()"Eric Laurent2015-03-301-2/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | audio policy: fix DeviceVector::getDevicesFromType()Eric Laurent2015-03-261-2/+6
| |/ / / / / / / / /
* | | | | | | | | | Merge "HLS: faster switching and pause/resume on low buffer"Chong Zhang2015-03-277-321/+945
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | HLS: faster switching and pause/resume on low bufferChong Zhang2015-03-277-321/+945
* | | | | | | | | | | am 76a19722: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.go...Martin Hibdon2015-03-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/...Martin Hibdon2015-03-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | am fb7b0f3d: (-s ours) am 9550d4f8: am 8fe49c83: am c42c4b52: am 424324b3: am...Eric Laurent2015-03-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | am 9550d4f8: am 8fe49c83: am c42c4b52: am 424324b3: am 2fdd16b3: DO NOT MERGE...Eric Laurent2015-03-270-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | am 8fe49c83: am c42c4b52: am 424324b3: am 2fdd16b3: DO NOT MERGE - audio poli...Eric Laurent2015-03-270-0/+0
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | | * | | | | | | am c42c4b52: am 424324b3: am 2fdd16b3: DO NOT MERGE - audio policy service: f...Eric Laurent2015-03-271-2/+20
| | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | |
* | | | | | | | | | Fix seek issueMarco Nelissen2015-03-261-8/+0
* | | | | | | | | | am 67b7360b: (-s ours) am 82fd850e: am 414af268: am c42c4b52: am 424324b3: am...Eric Laurent2015-03-250-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | am 82fd850e: am 414af268: am c42c4b52: am 424324b3: am 2fdd16b3: DO NOT MERGE...Eric Laurent2015-03-251-2/+20
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 414af268: am c42c4b52: am 424324b3: am 2fdd16b3: DO NOT MERGE - audio poli...Eric Laurent2015-03-251-2/+20
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | am c42c4b52: am 424324b3: am 2fdd16b3: DO NOT MERGE - audio policy service: f...Eric Laurent2015-03-251-2/+20
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| / / / / / | | | | |/ / / / /
| | | | * | | | | am 424324b3: am 2fdd16b3: DO NOT MERGE - audio policy service: fix possible m...Eric Laurent2015-03-251-2/+20
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ am 2fdd16b3: DO NOT MERGE - audio policy service: fix possible memory overflowEric Laurent2015-03-251-2/+20
| | | | | |\ \ \ \ \
| | | | | | * | | | | DO NOT MERGE - audio policy service: fix possible memory overflowEric Laurent2015-03-251-2/+20
* | | | | | | | | | | Remove deprecation FIXMEs for TRANSFER_OBTAIN modeGlenn Kasten2015-03-252-15/+4
* | | | | | | | | | | Merge "Camera: fix release fence logic"Yin-Chia Yeh2015-03-251-26/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Camera: fix release fence logicYin-Chia Yeh2015-03-241-26/+9
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge "Camera: fix metadata assertion"Yin-Chia Yeh2015-03-254-15/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Camera: fix metadata assertionYin-Chia Yeh2015-03-244-15/+12
* | | | | | | | | | | | Merge "AudioFlinger: call SPDIF wrapper from AudioFlinger"Phil Burk2015-03-2410-86/+688
|\ \ \ \ \ \ \ \ \ \ \ \