summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix AudioPolicyManager dynamic policy initializationJean-Michel Trivi2015-04-083-31/+31
* am e5eda367: (-s ours) am afc7b857: am e849af87: Cherry-pick two BufferItem c...Dan Stoza2015-04-070-0/+0
|\
| * am afc7b857: am e849af87: Cherry-pick two BufferItem changesDan Stoza2015-04-0712-27/+28
| |\
| | * am e849af87: Cherry-pick two BufferItem changesDan Stoza2015-04-0712-27/+28
| | |\
| | | * Cherry-pick two BufferItem changesDan Stoza2015-04-0712-27/+28
* | | | Merge "Camera2Client: support HAL version 3.3"Zhijun He2015-04-071-1/+2
|\ \ \ \
| * | | | Camera2Client: support HAL version 3.3Zhijun He2015-04-071-1/+2
* | | | | Merge "stagefright: add new MediaCodec callback CB_RESOURCE_RECLAIMED."Ronghua Wu2015-04-071-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | stagefright: add new MediaCodec callback CB_RESOURCE_RECLAIMED.Ronghua Wu2015-03-191-0/+1
* | | | | am 514c8ffc: (-s ours) am 0ffe8f97: am 39a8a377: (-s ours) am ddd1c72b: (-s o...Lajos Molnar2015-04-070-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 0ffe8f97: am 39a8a377: (-s ours) am ddd1c72b: (-s ours) Merge "DO NOT MERG...Lajos Molnar2015-04-070-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | am 39a8a377: (-s ours) am ddd1c72b: (-s ours) Merge "DO NOT MERGE: mediaplaye...Lajos Molnar2015-04-060-0/+0
| | |\ \ \ | | | | |/ | | | |/|
| | | * | am ddd1c72b: (-s ours) Merge "DO NOT MERGE: mediaplayer: ensure secure decode...Lajos Molnar2015-04-060-0/+0
| | | |\ \
| | | | * \ Merge "DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated bef...Lajos Molnar2015-04-065-14/+111
| | | | |\ \
| | | | | * | DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated before sta...Lajos Molnar2015-04-035-14/+111
* | | | | | | audiopolicy: add support for parsing AUDIO_FORMAT_DTSPhil Burk2015-04-061-0/+2
* | | | | | | am 3248cb7d: (-s ours) am af69e818: am 4ea8ecf7: (-s ours) am f7f62b7e: (-s o...Chong Zhang2015-04-030-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am af69e818: am 4ea8ecf7: (-s ours) am f7f62b7e: (-s ours) Merge "nuplayer: d...Chong Zhang2015-04-030-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 4ea8ecf7: (-s ours) am f7f62b7e: (-s ours) Merge "nuplayer: do not use cac...Chong Zhang2015-04-030-0/+0
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am f7f62b7e: (-s ours) Merge "nuplayer: do not use cached source for wvm cont...Chong Zhang2015-04-030-0/+0
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge "nuplayer: do not use cached source for wvm content -- DO NOT MERGE"Chong Zhang2015-04-031-23/+32
| | | | |\ \ \ | | | | | |/ / | | | | |/| |
| | | | | * | nuplayer: do not use cached source for wvm content -- DO NOT MERGEChong Zhang2015-04-031-23/+32
| | | | |/ /
* | | | | | Merge "ESQueue:use 0x000001 instead of 0x00000001 as sync word in H264/MPEG_V...Robert Shih2015-04-031-2/+2
|\ \ \ \ \ \
| * | | | | | ESQueue:use 0x000001 instead of 0x00000001 as sync word in H264/MPEG_VIDEORobert Shih2015-04-011-2/+2
* | | | | | | Merge "HLS: misc bug fixes"Chong Zhang2015-04-0313-282/+311
|\ \ \ \ \ \ \
| * | | | | | | HLS: misc bug fixesChong Zhang2015-04-0213-282/+311
* | | | | | | | Merge "AudioPolicy: remove extraneous parentheses"Jean-Michel Trivi2015-04-031-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | AudioPolicy: remove extraneous parenthesesJean-Michel Trivi2015-04-031-1/+1
* | | | | | | | | Merge "nuplayer: Has video hint for offload"Ronghua Wu2015-04-032-1/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | nuplayer: Has video hint for offloadHaynes Mathew George2015-04-022-1/+6
* | | | | | | | | | IAudioFlinger: add checks on binder callsEric Laurent2015-04-021-10/+36
* | | | | | | | | | Merge "Merge commit 'a8f3cafa4f81e3c38c4d0882031a246a36be1299' into merge"Etan Cohen2015-04-020-0/+0
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge commit 'a8f3cafa4f81e3c38c4d0882031a246a36be1299' into mergeEtan Cohen2015-03-310-0/+0
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ am c42c4b52: (-s ours) am 424324b3: am 2fdd16b3: DO NOT MERGE - audio policy ...Eric Laurent2015-03-250-0/+0
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ am c42c4b52: (-s ours) am 424324b3: am 2fdd16b3: DO NOT MERGE - audio policy ...Eric Laurent2015-03-250-0/+0
| | | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Camera: plumbing rotation field throughYin-Chia Yeh2015-03-2328-65/+196
| | * | | | | | | | | | | | Camera: Wire up dataSpace, clean up ICameraDeviceUserEino-Ville Talvala2015-03-2325-67/+95
| | * | | | | | | | | | | | camera: implement flashlight for HAL v1 devicesChien-Yu Chen2015-03-179-23/+322
| | * | | | | | | | | | | | camera: fix flashlight implementation for HAL v2Chien-Yu Chen2015-03-176-210/+443
| | * | | | | | | | | | | | Camera: Remove RAW_SENSOR in favor of RAW16Eino-Ville Talvala2015-03-174-6/+6
| | * | | | | | | | | | | | CameraService: fix invalid access of camera metadataYin-Chia Yeh2015-03-171-8/+7
| | * | | | | | | | | | | | Look up user-specific device policy for disabling cameraAmith Yamasani2015-03-171-1/+5
| | * | | | | | | | | | | | camera: implement flashlight controlChien-Yu Chen2015-03-1710-3/+965
| | * | | | | | | | | | | | CameraService: intercept Camera moduleYin-Chia Yeh2015-03-1721-61/+259
| | * | | | | | | | | | | | camera2: fix various BpCameraDeviceUser methods to return correct result.John Lin2015-03-171-4/+4
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | audio port: support multiple clientsEric Laurent2015-04-012-27/+77
| |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge "Updates to AudioPolicyManager refactor"Jean-Michel Trivi2015-04-015-13/+21
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Updates to AudioPolicyManager refactorJean-Michel Trivi2015-04-015-13/+21
* | | | | | | | | | | | | Merge "Split ManagerDefault into manager and engine"Jean-Michel Trivi2015-04-0116-908/+1754
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Split ManagerDefault into manager and engineFrançois Gaffie2015-04-0116-908/+1754