summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Camera2: Add basic concurrency guards.Eino-Ville Talvala2012-06-072-3/+49
* Camera2: Add internal parameter state to dump.Eino-Ville Talvala2012-06-072-1/+165
* Camera2: Use new param structure, improve static camera info queriesEino-Ville Talvala2012-06-072-253/+400
* Merge "Camera2: Switch to using ATRACE"Eino-Ville Talvala2012-06-011-25/+30
|\
| * Camera2: Switch to using ATRACEEino-Ville Talvala2012-05-311-25/+30
* | am c9bdf9b4: am dadc0ddb: Part of fix for double spins & faster startupJeff Tinker2012-06-011-8/+12
|\ \
| * \ am dadc0ddb: Part of fix for double spins & faster startupJeff Tinker2012-06-011-8/+12
| |\ \
| | * | Part of fix for double spins & faster startupJeff Tinker2012-05-311-8/+12
* | | | am 721e18b7: am 27d33134: Merge "Do not keep audio wake lock when apps underr...Eric Laurent2012-05-311-14/+24
|\ \ \ \ | |/ / /
| * | | am 27d33134: Merge "Do not keep audio wake lock when apps underrun." into jb-devEric Laurent2012-05-311-14/+24
| |\ \ \ | | |/ /
| | * | Merge "Do not keep audio wake lock when apps underrun." into jb-devEric Laurent2012-05-311-14/+24
| | |\ \
| | | * | Do not keep audio wake lock when apps underrun.Eric Laurent2012-05-311-14/+24
* | | | | Merge "Camera service: Minimally functional preview for camera 2 devices."Eino-Ville Talvala2012-05-314-56/+629
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Camera service: Minimally functional preview for camera 2 devices.Eino-Ville Talvala2012-05-314-56/+629
* | | | | am 386f04ea: am cafc53c0: Fix another buffer overflow issueJames Dong2012-05-311-60/+72
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am cafc53c0: Fix another buffer overflow issueJames Dong2012-05-311-60/+72
| |\ \ \ | | |/ /
| | * | Fix another buffer overflow issueJames Dong2012-05-311-60/+72
| | |/
* | | Add basic Camera2Client dump, minor fixes to CameraService dump.Eino-Ville Talvala2012-05-312-14/+14
* | | am 3fc87370: am 83410a85: Avoid prematurely terminating parsing when some tra...James Dong2012-05-301-0/+22
|\ \ \ | |/ /
| * | am 83410a85: Avoid prematurely terminating parsing when some track only has a...James Dong2012-05-301-0/+22
| |\ \ | | |/
| | * Avoid prematurely terminating parsing when some track only has a single acces...James Dong2012-05-301-0/+22
* | | am 8c07f759: am 3bdb4fbf: Merge "audioflinger: fix effect problem during unde...Eric Laurent2012-05-302-2/+37
|\ \ \ | |/ /
| * | am 3bdb4fbf: Merge "audioflinger: fix effect problem during underrun" into jb...Eric Laurent2012-05-302-2/+37
| |\ \ | | |/
| | * Merge "audioflinger: fix effect problem during underrun" into jb-devEric Laurent2012-05-302-2/+37
| | |\
| | | * audioflinger: fix effect problem during underrunEric Laurent2012-05-302-2/+37
* | | | am 3878fbed: am cc9833b5: Only send port settings changed if the number of ch...James Dong2012-05-301-6/+12
|\ \ \ \ | |/ / /
| * | | am cc9833b5: Only send port settings changed if the number of channels and sa...James Dong2012-05-301-6/+12
| |\ \ \ | | |/ /
| | * | Only send port settings changed if the number of channels and sample rate are...James Dong2012-05-301-6/+12
* | | | Merge "Camera service: Initialization for camera2 clients and devices"Eino-Ville Talvala2012-05-309-61/+1135
|\ \ \ \
| * | | | Camera service: Initialization for camera2 clients and devicesEino-Ville Talvala2012-05-299-61/+1135
* | | | | am 7cc5eddc: Reconcile with jb-releaseThe Android Open Source Project2012-05-300-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Reconcile with jb-releaseThe Android Open Source Project2012-05-300-0/+0
| |\ \ \ \
| | * \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-300-0/+0
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Added some informational log messages to track down ANR related issuesJames Dong2012-05-291-2/+3
* | | | | | am 16c4cc1e: am 4364d2d1: Merge "Precautionary logging to identify a potenti...Dave Burke2012-05-291-0/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 4364d2d1: Merge "Precautionary logging to identify a potential infinite l...Dave Burke2012-05-291-0/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Precautionary logging to identify a potential infinite loop." into jb...Dave Burke2012-05-291-0/+3
| | |\ \ \ \
| | | * | | | Precautionary logging to identify a potential infinite loop.Dave Burke2012-05-291-0/+3
* | | | | | | am c5a5ebde: am c558fa89: Added some informational log messages to track down...James Dong2012-05-291-2/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | |
| * | | | | am c558fa89: Added some informational log messages to track down ANR related ...James Dong2012-05-291-2/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | Added some informational log messages to track down ANR related issuesJames Dong2012-05-291-2/+3
* | | | | | am 89b7f7ff: (-s ours) am 0bbf868d: Merge "DO NOT MERGE: Minimal fix for take...Eino-Ville Talvala2012-05-290-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 0bbf868d: Merge "DO NOT MERGE: Minimal fix for takePicture/previewCallback...Eino-Ville Talvala2012-05-292-18/+45
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "DO NOT MERGE: Minimal fix for takePicture/previewCallback deadlock" in...Eino-Ville Talvala2012-05-292-18/+45
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | DO NOT MERGE: Minimal fix for takePicture/previewCallback deadlockEino-Ville Talvala2012-05-292-18/+45
* | | | | | am aeb1ce5f: am 91b0d43a: Merge "Unwedge ACodec if allocating output buffers ...Andreas Huber2012-05-291-5/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 91b0d43a: Merge "Unwedge ACodec if allocating output buffers fails while r...Andreas Huber2012-05-291-5/+8
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Unwedge ACodec if allocating output buffers fails while reconfiguring....Andreas Huber2012-05-291-5/+8
| | |\ \ \ \
| | | * | | | Unwedge ACodec if allocating output buffers fails while reconfiguring.Andreas Huber2012-05-291-5/+8
| | | |/ / /
* | | | | | am 35a14476: am 40fe18f2: Force shutdown of the omx decoder even if it\'s in ...Andreas Huber2012-05-291-7/+31
|\ \ \ \ \ \ | |/ / / / /