summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add a per-thread heap that is read-only to clients"Glenn Kasten2014-05-082-0/+19
|\
| * Add a per-thread heap that is read-only to clientsGlenn Kasten2014-05-072-0/+19
* | Merge "audio policy: cleanup AudioPolicyService destructor"Eric Laurent2014-05-081-3/+1
|\ \ | |/ |/|
| * audio policy: cleanup AudioPolicyService destructorEric Laurent2014-05-071-3/+1
* | Merge "Fix a couple of fast capture typo bugs"Glenn Kasten2014-05-071-2/+2
|\ \
| * | Fix a couple of fast capture typo bugsGlenn Kasten2014-05-071-2/+2
* | | audio policy: fix typo in AudioPolicyManager constructorEric Laurent2014-05-071-6/+6
| |/ |/|
* | Merge "audio policy: update from libhardware_legacy"Eric Laurent2014-05-072-108/+349
|\ \ | |/ |/|
| * audio policy: update from libhardware_legacyEric Laurent2014-05-062-108/+349
* | Merge "Camera3: fix missing string in logging code"Zhijun He2014-05-061-1/+1
|\ \ | |/ |/|
| * Camera3: fix missing string in logging codeZhijun He2014-05-061-1/+1
* | am 71171988: am f655acf1: am 8fb04d47: Merge "Fix memory leak when filtering ...Eric Laurent2014-05-062-10/+27
|\ \
| * \ am 8fb04d47: Merge "Fix memory leak when filtering commands in insertCommand_...Eric Laurent2014-05-062-10/+27
| |\ \
| | * \ Merge "Fix memory leak when filtering commands in insertCommand_l()"Eric Laurent2014-05-062-10/+27
| | |\ \
| | | * | Fix memory leak when filtering commands in insertCommand_l()Jesper Tragardh2014-04-112-10/+27
| * | | | Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEADBill Yi2014-04-297-102/+217
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/r...Igor Murashkin2014-03-252-44/+121
| | |\ \ \
| | * \ \ \ am 4f53fe74: Merge "CameraService: deadlock fix"Eino-Ville Talvala2014-03-251-0/+1
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | resolved conflicts for merge of 3d7c5002 to klp-dev-plus-aospColin Cross2014-03-2120-70/+80
| | |\ \ \ \
| | * \ \ \ \ am 36817364: Merge "Add libaudioresampler"Glenn Kasten2014-03-191-11/+18
| | |\ \ \ \ \
| | * \ \ \ \ \ am 77658a06: Merge "AudioPolicyService: malloc/delete pair"Glenn Kasten2014-03-181-1/+1
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ am bd3e2e03: camera2: Fix segfault when using null availability listenerIgor Murashkin2014-03-171-0/+10
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ am 089affb6: Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-143-0/+4
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size ...Zhijun He2014-03-101-0/+16
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-devEino-Ville Talvala2014-03-073-55/+66
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"Narayan Kamath2014-03-0717-58/+73
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ am 5930e8eb: Merge "AudioFlinger: Remove code for supporting resampling in fa...Glenn Kasten2014-03-074-26/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ am 4361749d: Merge "AudioTrack: Never try to use the fast path if resampling ...Glenn Kasten2014-03-072-5/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am d66cd743: Merge "audioflinger: conform inline ASM to UAL"Glenn Kasten2014-03-071-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Use audio_is_linear_pcm()"Glenn Kasten2014-05-051-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Use audio_is_linear_pcm()Glenn Kasten2014-05-021-2/+2
* | | | | | | | | | | | | | | | | | Merge "camera3: Update CameraMetadata vendor tag handling."Ruben Brunk2014-05-051-1/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | camera3: Update CameraMetadata vendor tag handling.Ruben Brunk2014-05-021-1/+14
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge "NULL check in ConnectPro"Natalie Silvanovich2014-05-051-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | NULL check in ConnectProNatalie Silvanovich2014-05-051-0/+5
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge "Revert "camera3: Update CameraMetadata vendor tag handling.""Ruben Brunk2014-05-031-14/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Revert "camera3: Update CameraMetadata vendor tag handling."Ruben Brunk2014-05-031-14/+1
* | | | | | | | | | | | | | | | | | Merge "camera3: Update CameraMetadata vendor tag handling."Ruben Brunk2014-05-021-1/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | camera3: Update CameraMetadata vendor tag handling.Ruben Brunk2014-05-021-1/+14
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge "Fix bug for direct track with PCM != 16-bit"Glenn Kasten2014-05-021-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fix bug for direct track with PCM != 16-bitGlenn Kasten2014-05-021-4/+2
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge "Camera3: Don't notifyError for non-fatal errors"Zhijun He2014-05-021-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Camera3: Don't notifyError for non-fatal errorsZhijun He2014-05-011-3/+0
* | | | | | | | | | | | | | | | | Merge "Start pulling bits of FastMixer up to FastThread"Glenn Kasten2014-04-2911-668/+932
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Start pulling bits of FastMixer up to FastThreadGlenn Kasten2014-04-2811-668/+932
* | | | | | | | | | | | | | | | | Camera3: scale the max jpeg buffer size based on resolutionsZhijun He2014-04-252-2/+67
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | am 7e5c6351: am 4513aa2c: Merge "AArch64: rewrite audioflinger\'s sinc resamp...Glenn Kasten2014-04-241-151/+165
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4513aa2c: Merge "AArch64: rewrite audioflinger\'s sinc resample by intrins...Glenn Kasten2014-04-241-151/+165
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | Merge "AArch64: rewrite audioflinger's sinc resample by intrinsics."Glenn Kasten2014-04-231-151/+165
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | AArch64: rewrite audioflinger's sinc resample by intrinsics.Zhongwei Yao2014-04-101-151/+165
| | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | |