summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am 0fd52ac2: am 6eac9e2f: Merge "Camera2Client: flush requests in stopPreview...Chien-Yu Chen2014-12-161-0/+9
|\
| * Camera2Client: flush requests in stopPreviewLRuchit Sharma2014-12-151-0/+9
* | am 23085662: am c73ca6ef: audio policy: fix remote mic captureEric Laurent2014-12-132-17/+43
|\ \ | |/
| * audio policy: fix remote mic captureEric Laurent2014-12-122-17/+43
* | 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 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 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 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
* | | | 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 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 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
| | |/ / /
* | | | | 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 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 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 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 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 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 94d91778: am 18f2f90c: [FM] Fix Buganizer ID: 18456930 - FM radio audio g...Hochi Huang2014-12-051-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | [FM] Fix Buganizer ID: 18456930 - FM radio audio got routed to loudspeaker u...Hochi Huang2014-12-041-1/+1
| |/ / /
* | | | am eb05bacc: am b0eb7b0a: Merge "__ARM_HAVE_HALFWORD_MULTIPLY is always true ...Elliott Hughes2014-12-031-4/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | __ARM_HAVE_HALFWORD_MULTIPLY is always true for __arm__.Elliott Hughes2014-12-021-4/+1
* | | | am 390ef843: am f20c4356: Merge "AudioRecord: use audio attributes instead of...Eric Laurent2014-11-276-94/+99
|\ \ \ \ | | |/ / | |/| |
| * | | AudioRecord: use audio attributes instead of audio source.Eric Laurent2014-11-256-94/+99
* | | | am 5bf757cf: am 087eb332: Merge "audio policy: do not route accessibility pro...Eric Laurent2014-11-261-0/+15
|\ \ \ \ | |/ / /
| * | | Merge "audio policy: do not route accessibility prompts to compressed output"...Eric Laurent2014-11-261-0/+15
| |\ \ \
| | * | | audio policy: do not route accessibility prompts to compressed outputEric Laurent2014-11-251-0/+15
* | | | | am bf14c62e: am 72bf901c: Merge "audio policy: new getOutputForAttr() prototy...Eric Laurent2014-11-269-97/+222
|\ \ \ \ \ | |/ / / /