summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am d7986933: am 0cbeaf83: am 8cffa91a: Merge "audio policy: suppport for dyna...Eric Laurent2014-12-122-48/+101
|\
| * am 0cbeaf83: am 8cffa91a: Merge "audio policy: suppport for dynamic source" i...Eric Laurent2014-12-122-48/+101
| |\
| | * Merge "audio policy: suppport for dynamic source" into lmp-mr1-devEric Laurent2014-12-112-48/+101
| | |\
| | | * audio policy: suppport for dynamic sourceEric Laurent2014-12-102-48/+101
* | | | am 7b2b2675: am 67c93ad7: am f1b12df3: Merge "Trigger error only when a templ...Chih-Hung Hsieh2014-12-121-6/+3
|\ \ \ \ | |/ / /
| * | | am 67c93ad7: am f1b12df3: Merge "Trigger error only when a template is instan...Chih-Hung Hsieh2014-12-121-6/+3
| |\ \ \
| | * | | Trigger error only when a template is instantiated.Chih-Hung Hsieh2014-12-111-6/+3
* | | | | am 2592184c: am 6baa8fe7: am 94a92c69: Merge "[audio][audioflinger] Consume a...Phil Burk2014-12-111-2/+7
|\ \ \ \ \ | |/ / / /
| * | | | am 6baa8fe7: am 94a92c69: Merge "[audio][audioflinger] Consume all frames whe...Phil Burk2014-12-111-2/+7
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "[audio][audioflinger] Consume all frames when a DirectThread is done."...Phil Burk2014-12-111-2/+7
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | [audio][audioflinger] Consume all frames when a DirectThread is done.Phil Burk2014-12-101-2/+7
* | | | | am bd9df749: am 1546028a: am 1767df77: AudioPolicyManager: distinguish betwee...Jean-Michel Trivi2014-12-102-2/+8
|\ \ \ \ \ | |/ / / /
| * | | | am 1546028a: am 1767df77: AudioPolicyManager: distinguish between mirroring a...Jean-Michel Trivi2014-12-102-2/+8
| |\ \ \ \ | | |/ / /
| | * | | AudioPolicyManager: distinguish between mirroring and reroutingJean-Michel Trivi2014-12-092-2/+8
* | | | | am 66b17e9d: Merge commit \'f5a968a0\' into mmGlenn Kasten2014-12-104-1/+30
|\ \ \ \ \ | |/ / / /
| * | | | Merge commit 'f5a968a0' into mmGlenn Kasten2014-12-104-1/+30
| |\ \ \ \ | | |/ / /
| | * | | Merge "audio policy: binder calls for dynamic audio policy mixes" into lmp-mr...Eric Laurent2014-12-104-1/+30
| | |\ \ \
| | | * | | audio policy: binder calls for dynamic audio policy mixesEric Laurent2014-12-094-1/+30
* | | | | | am b279f5ad: am c49d9cda: am 2dda40d6: Merge "audio policy: add support for c...Eric Laurent2014-12-103-104/+440
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am c49d9cda: am 2dda40d6: Merge "audio policy: add support for custom mixes" ...Eric Laurent2014-12-103-104/+440
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "audio policy: add support for custom mixes" into lmp-mr1-devEric Laurent2014-12-103-104/+440
| | |\ \ \ \ | | | |/ / /
| | | * | | audio policy: add support for custom mixesEric Laurent2014-12-093-104/+440
* | | | | | am f44bdeb7: am 61697a5c: am 9cea7aa4: Merge "Camera3Device: support shutter ...Chien-Yu Chen2014-12-102-141/+234
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 61697a5c: am 9cea7aa4: Merge "Camera3Device: support shutter after result"...Chien-Yu Chen2014-12-102-141/+234
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Camera3Device: support shutter after result" into lmp-mr1-devChien-Yu Chen2014-12-092-141/+234
| | |\ \ \ \
| | | * | | | Camera3Device: support shutter after resultChien-Yu Chen2014-12-092-141/+234
| | | |/ / /
* | | | | | am 3b46819e: Merge commit \'2340e5a8\' into manualmergeRuben Brunk2014-12-102-4/+81
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge commit '2340e5a8' into manualmergeRuben Brunk2014-12-092-4/+81
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Camera2: Round unsupported surface sizes in configure." into lmp-mr1-devRuben Brunk2014-12-092-4/+81
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Camera2: Round unsupported surface sizes in configure.Ruben Brunk2014-12-052-4/+81
* | | | | | am b156888d: am 427aca5b: am 18265202: Merge "audio policy: fix inifinite loo...Eric Laurent2014-12-091-5/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 427aca5b: am 18265202: Merge "audio policy: fix inifinite loop in clearAud...Eric Laurent2014-12-081-5/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "audio policy: fix inifinite loop in clearAudioPatches()" into lmp-mr1-devEric Laurent2014-12-061-5/+2
| | |\ \ \ \
| | | * | | | audio policy: fix inifinite loop in clearAudioPatches()Eric Laurent2014-12-051-5/+2
* | | | | | | am c12caed1: am a9450bbc: am cbbe1ccc: Merge "audio policy: fix AudioPort par...Eric Laurent2014-12-091-0/+20
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am a9450bbc: am cbbe1ccc: Merge "audio policy: fix AudioPort parameter checks...Eric Laurent2014-12-081-0/+20
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "audio policy: fix AudioPort parameter checks" into lmp-mr1-devEric Laurent2014-12-051-0/+20
| | |\ \ \ \ \
| | | * | | | | audio policy: fix AudioPort parameter checksEric Laurent2014-12-041-0/+20
* | | | | | | | am f3376bdb: am 668b0550: am 597ce69a: Merge "Camera: Add support for SCENE_M...Eino-Ville Talvala2014-12-091-0/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 668b0550: am 597ce69a: Merge "Camera: Add support for SCENE_MODE_HDR for n...Eino-Ville Talvala2014-12-081-0/+6
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Camera: Add support for SCENE_MODE_HDR for newer HALs" into lmp-mr1-devEino-Ville Talvala2014-12-051-0/+6
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | Camera: Add support for SCENE_MODE_HDR for newer HALsEino-Ville Talvala2014-12-051-0/+6
| | | | |/ / / | | | |/| | |
* | | | | | | am e9011c22: am 07e19019: am 9257000c: camera: fix logging in ZslProcessor to...Ruchit Sharma2014-12-091-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 07e19019: am 9257000c: camera: fix logging in ZslProcessor to avoid spamRuchit Sharma2014-12-081-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | camera: fix logging in ZslProcessor to avoid spamRuchit Sharma2014-12-051-1/+1
| | |/ / / /
* | | | | | am 900f6535: am 561f50de: am db995fe3: Merge "Fix getTimestamp if offload thr...Andy Hung2014-12-091-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 561f50de: am db995fe3: Merge "Fix getTimestamp if offload thread is not in...Andy Hung2014-12-081-1/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Fix getTimestamp if offload thread is not initialized." into lmp-mr1-devAndy Hung2014-12-051-1/+2
| | |\ \ \ \
| | | * | | | Fix getTimestamp if offload thread is not initialized.Andy Hung2014-12-031-1/+2
| | | |/ / /
* | | | | | am 9f104ea6: am 94d91778: am 18f2f90c: [FM] Fix Buganizer ID: 18456930 - FM ...Hochi Huang2014-12-051-1/+1
|\ \ \ \ \ \ | |/ / / / /