summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am 0c282de7: am 77658a06: Merge "AudioPolicyService: malloc/delete pair"Glenn Kasten2014-03-181-1/+1
|\
| * am 77658a06: Merge "AudioPolicyService: malloc/delete pair"Glenn Kasten2014-03-181-1/+1
| |\
| | * Merge "AudioPolicyService: malloc/delete pair"Glenn Kasten2014-03-181-1/+1
| | |\
| | | * AudioPolicyService: malloc/delete pairYou Kim2013-09-121-1/+1
* | | | Merge "audioflinger: OffloadThread fix for resume underrun"Eric Laurent2014-03-182-21/+27
|\ \ \ \
| * | | | audioflinger: OffloadThread fix for resume underrunHaynes Mathew George2014-03-172-21/+27
* | | | | Merge "AudioFlinger: Change track ready condition in STOPPING_1 state"Eric Laurent2014-03-181-2/+4
|\ \ \ \ \ | |/ / / /
| * | | | AudioFlinger: Change track ready condition in STOPPING_1 stateEric Laurent2014-03-171-2/+4
* | | | | Merge "audioflinger: Handle pause /resume in stopping state"Eric Laurent2014-03-183-4/+37
|\ \ \ \ \ | |/ / / /
| * | | | audioflinger: Handle pause /resume in stopping stateKrishnankutty Kolathappilly2014-03-173-4/+37
* | | | | Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-03-186-18/+30
|\ \ \ \ \
| * | | | | Remove deprecated BufferQueue constructorDan Stoza2014-03-126-18/+30
* | | | | | Merge "audio policy: renamed AudioPolicyManagerBase to AudioPolicyManager"Eric Laurent2014-03-182-158/+153
|\ \ \ \ \ \
| * | | | | | audio policy: renamed AudioPolicyManagerBase to AudioPolicyManagerEric Laurent2014-03-112-158/+153
* | | | | | | Merge "audio policy: remove dependency from AudioSystemLegacy"Eric Laurent2014-03-183-243/+252
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | audio policy: remove dependency from AudioSystemLegacyEric Laurent2014-03-113-243/+252
* | | | | | | Merge "audio policy: import audio policy manager from hardware legacy"Eric Laurent2014-03-183-0/+4939
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | audio policy: import audio policy manager from hardware legacyEric Laurent2014-03-113-0/+4939
* | | | | | | Merge "audio policy: split implementation"Eric Laurent2014-03-184-642/+784
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | audio policy: split implementationEric Laurent2014-03-114-642/+784
* | | | | | am 557847ee: am a6ca0acf: am bd3e2e03: camera2: Fix segfault when using null ...Igor Murashkin2014-03-181-0/+10
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am a6ca0acf: am bd3e2e03: camera2: Fix segfault when using null availability ...Igor Murashkin2014-03-181-0/+10
| |\ \ \ \ \
| | * \ \ \ \ am bd3e2e03: camera2: Fix segfault when using null availability listenerIgor Murashkin2014-03-171-0/+10
| | |\ \ \ \ \
| | | * | | | | camera2: Fix segfault when using null availability listenerIgor Murashkin2014-03-171-0/+10
* | | | | | | | Merge "move audio policy service to a separate library"Eric Laurent2014-03-184-3/+43
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | move audio policy service to a separate libraryEric Laurent2014-03-114-3/+43
* | | | | | | | camera3: Remove old vendor tag ops dependencies.Ruben Brunk2014-03-172-15/+0
* | | | | | | | camera2: Don't log vendor tag errors when camera HAL too oldIgor Murashkin2014-03-171-1/+1
* | | | | | | | Make error handling more similar for output and captureGlenn Kasten2014-03-142-40/+43
* | | | | | | | Make error handling for audio driver initCheck more similarGlenn Kasten2014-03-141-8/+6
* | | | | | | | Make session ID code similar between output and captureGlenn Kasten2014-03-141-5/+5
* | | | | | | | Move declarations to where neededGlenn Kasten2014-03-141-5/+2
* | | | | | | | Remove name output parameter from createTrackGlenn Kasten2014-03-142-5/+0
* | | | | | | | Replace if/else by switchGlenn Kasten2014-03-141-3/+11
* | | | | | | | Whitespace and commentsGlenn Kasten2014-03-143-5/+4
* | | | | | | | Prepare for additional capture formatsGlenn Kasten2014-03-141-3/+3
* | | | | | | | resolved conflicts for merge of 3c780188 to masterGlenn Kasten2014-03-143-0/+4
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 089affb6: Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-143-0/+4
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | mediaserver and associated services are 32-bit onlyGlenn Kasten2014-03-123-0/+4
| | * | | | | | audioflinger: Fix for a deadlock in track creationHaynes Mathew George2014-03-062-2/+5
| * | | | | | | am f0fb921c: am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when ...Zhijun He2014-03-111-0/+16
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size ...Zhijun He2014-03-111-0/+16
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | DO NOT MERGE: Camera: delete preview callback when preview size is changedZhijun He2014-03-101-0/+16
| * | | | | | | am 47ef192f: am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into kl...Eino-Ville Talvala2014-03-073-55/+66
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-devEino-Ville Talvala2014-03-073-55/+66
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-devEino-Ville Talvala2014-03-073-55/+66
| | | |\ \ \ \ \
| | | | * | | | | DO NOT MERGE: Camera: fix focusArea wrong indexing issueZhijun He2014-03-051-14/+14
| | | | * | | | | DO NOT MERGE: camera2: Fix race with stream deletion during disconnect.Ruben Brunk2014-03-051-6/+8
| | | | * | | | | DO NOT MERGE: camera2/3: Add protection for still capture pathZhijun He2014-03-051-35/+44
| | | * | | | | | Increase kFastTrackMultiplier from 1 to 2Glenn Kasten2014-03-051-7/+7