summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* Force fixed volume for TTS streamEric Laurent2015-09-111-4/+4
| | | | | | | | Always play Transmitted Through Speaker stream at max volume instead of tracking media stream volume. Bug: 23729461. Change-Id: I61021f59617bb851a4cd7da80924e587029e96a3
* Merge "Revert "Do not acknowledge flush() on start() for static tracks"" ↵Eric Laurent2015-09-091-6/+3
|\ | | | | | | into mnc-dr-dev
| * Revert "Do not acknowledge flush() on start() for static tracks"Eric Laurent2015-09-091-6/+3
| | | | | | | | | | | | | | This reverts commit cafe86a9cb6625bb1ec6383e16e28e4c9e455f87. Bug: 23924093. Change-Id: I186d1013b06a286eca93c30bb9b3545dc36695ff
* | CameraService: Add more systracing, fix module init orderEino-Ville Talvala2015-09-092-14/+84
|/ | | | | | | | | | | | Improve debugging of performance of concurrent calls to the service. - Add ATRACE calls to camera service entry points - Add ATRACE calls for camera HAL module calls - Ensure that camera module init method is called before all others Bug: 23718257 Bug: 23933447 Change-Id: I2a025866ab39eda3962877120cab13a063c7727e
* Merge "Do not acknowledge flush() on start() for static tracks" into mnc-dr-devAndy Hung2015-09-081-3/+6
|\
| * Do not acknowledge flush() on start() for static tracksAndy Hung2015-08-241-3/+6
| | | | | | | | | | Bug: 22938515 Change-Id: I1de653de169a3fbbaa693da6057897ea57772447
* | Merge "CameraService: Link to client binder death at end of connect" into ↵Eino-Ville Talvala2015-09-052-8/+11
|\ \ | | | | | | | | | mnc-dr-dev
| * | CameraService: Link to client binder death at end of connectEino-Ville Talvala2015-09-042-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If, within a binder Looper thread, a Binder object death notifier is registered, and then a nested Binder transaction is begun, that transaction may process a death notification callback for the just-registered object, if it was dead at the time of registration. This can lead to an unexpected nested call into the service, and cause deadlock. To avoid this, move the death notifier registration to the end of handling the connect transaction. Also remove one extra bit of disconnect logging. Bug: 23525545 Change-Id: If01cbaf42704f55134118afefc9a8f7bdb014e09
* | | Merge "Camera3Device: Clean up next request batch variable" into mnc-dr-devChien-Yu Chen2015-09-052-52/+41
|\ \ \ | |/ / |/| |
| * | Camera3Device: Clean up next request batch variableChien-Yu Chen2015-09-042-52/+41
| | | | | | | | | | | | | | | | | | | | | | | | Make the Vector of next requests a RequestThread member variable to avoid memory allocation in every threadloop. Bug: 23360060 Change-Id: I4f33e5c49f0f4deb1f9f45bada0909da748849e4
* | | Merge "Camera3Device: Support batch requests" into mnc-dr-devChien-Yu Chen2015-09-048-199/+387
|\ \ \ | |/ /
| * | Camera3Device: Support batch requestsChien-Yu Chen2015-09-038-199/+387
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor request threadLoop to three parts: waiting for next batch of requests, preparing HAL requests and output buffers for next batch of requests, and submitting the batch of requests to HAL. Set the batch size to the size of the request list if it's a video recording request in a high speed video configuration. Add a flush lock so that HAL's flush() won't be called while submitting a batch of requests. Bug: 23360060 Change-Id: Icd395b1f955a9b336eec6fa5aff6b17741ce08c7
* | | CameraService: Treat TOP_SLEEPING same as TOP for priority.Eino-Ville Talvala2015-09-032-0/+7
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | When arbitrating between camera clients, treat processes in the TOP_SLEEPING state with the same high priority as processes in the TOP state. This resolves race conditions during lock screen handoffs between clients such as face unlock (a bound foreground process) and a secure camera app (the topmost activity, but transitioning from TOP_SLEEPING to TOP asynchronously from the activity lifecycle callbacks). Bug: 23731720 Change-Id: I92c3f8f561c7725627826c0ba3dc926e99af746c
* | am fe751bea: Camera: Fix flashlight deadlockChien-Yu Chen2015-09-022-3/+5
|\ \ | | | | | | | | | | | | * commit 'fe751bea0d3eedd6e817aebf4e457425b82e7117': Camera: Fix flashlight deadlock
| * | Camera: Fix flashlight deadlockChien-Yu Chen2015-09-012-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Use a dedicated mutex for torch UID map so it won't cause a deadlock after flashlight app gets killed while the torch is on. Bug: 23722318 Change-Id: I228377aa0412052d56b6b948361d9abaecbbc686
* | | Camera3Device: Don't hold mutex during HAL device close.Eino-Ville Talvala2015-08-281-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | The HAL device shutdown will likely need to wait on various events and queues to drain, and holding the mutex will prevent, for example, error notifications from being processed. This can lead to deadlocks. Bug: 23501571 Change-Id: I873ac23ef30545adf533e7839445448573ab5048
* | | CameraService: Notify camera service proxy of device statusEino-Ville Talvala2015-08-218-6/+74
| |/ |/| | | | | | | | | | | | | Send the camera proxy service in system server updates to camera device state: opened/closed/active/idle. Bug: 23393557 Change-Id: Id7c70f134821efa34af8f6e7b4caa4c2ab128ebc
* | am e857d28d: Merge "TimestretchBufferProvider: getNextBuffer should follow ↵Andy Hung2015-08-211-23/+26
|\ \ | |/ | | | | | | | | | | API" into mnc-dev * commit 'e857d28d48e6088d4cf5fcbed7f411c73622b388': TimestretchBufferProvider: getNextBuffer should follow API
| * Merge "TimestretchBufferProvider: getNextBuffer should follow API" into mnc-devAndy Hung2015-08-211-23/+26
| |\
| | * TimestretchBufferProvider: getNextBuffer should follow APIAndy Hung2015-08-211-23/+26
| | | | | | | | | | | | | | | | | | | | | If no data, should return 0 frame count and NULL ptr. Bug: 23293002 Change-Id: Ib5364e5bceb15c2dddc4a16e85299b409cf4e137
* | | Merge "Add experimental camera session prepare API." into mnc-dr-devRuben Brunk2015-08-1710-13/+103
|\ \ \
| * | | Add experimental camera session prepare API.Ruben Brunk2015-08-1410-13/+103
| | | | | | | | | | | | | | | | | | | | Bug: 18949148 Change-Id: I8f73e68ea2e3acc60d98954106f364d13f439a82
* | | | am bad4358c: Camera: Add camera type to ICameraService.getNumberOfCameras.Eino-Ville Talvala2015-08-162-14/+96
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit 'bad4358c83c7daaf9eeb8542c15eea4f473c884c': Camera: Add camera type to ICameraService.getNumberOfCameras.
| * | | Camera: Add camera type to ICameraService.getNumberOfCameras.Eino-Ville Talvala2015-08-142-14/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also determine the number of 'normal' cameras present on camera service startup, and ensure that all normal cameras have IDs lower than the 'strange' cameras. Bug: 23194168 Change-Id: I1f7b14825cb52707de698a955f85da1eaa932663
* | | | am 3ba0c6ec: Merge "Fix deadlock conditions in Camera3Device." into mnc-devRuben Brunk2015-08-132-20/+54
|\ \ \ \ | |/ / / | | / / | |/ / |/| | * commit '3ba0c6ec009aa675d3433cd6c12af173874787bd': Fix deadlock conditions in Camera3Device.
| * | Merge "Fix deadlock conditions in Camera3Device." into mnc-devRuben Brunk2015-08-132-20/+54
| |\ \
| | * | Fix deadlock conditions in Camera3Device.Ruben Brunk2015-08-122-20/+54
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Potential deadlock conditions this addresses, include: - Not waking up waiting threads for several situations where the status had been updated. - Not waking up all waiting thread when status had been updated (only one thread was awoken due to use of signal). - Threads clear status transitions before other waiting threads have a chance to examine them. Bug: 22448586 Change-Id: I53ba669d333a83d2bfa1ca3170d34acc6d8fe6e3
* | | Merge "audio policy: refine TTS stream mute management" into mnc-dr-devEric Laurent2015-08-132-2/+16
|\ \ \ | |/ / |/| |
| * | audio policy: refine TTS stream mute managementEric Laurent2015-08-122-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | Do not mute the TTS stream if a dedicated output for TTS is available. Bug: 22100304. Change-Id: Ic126100ce1144f765bc0ae42c8ea87fa47cfb822
* | | Merge "Camera3Device: Relax InFlightMap size check" into mnc-devChien-Yu Chen2015-08-132-2/+8
|\ \ \ | |_|/ |/| |
| * | Camera3Device: Relax InFlightMap size checkChien-Yu Chen2015-08-122-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | Relax InFlightMap size check for high speed configurations to allow more pending capture requests. Bug: 23162274 Change-Id: I955fe9a0754f0daed001f4a2b34ccb50f2465a11
* | | Merge "Camera: Allocate correctly-sized buffers for DEPTH_POINT_CLOUD" into ↵Eino-Ville Talvala2015-08-122-7/+31
|\ \ \ | |/ / |/| | | | | mnc-dev
| * | Camera: Allocate correctly-sized buffers for DEPTH_POINT_CLOUDEino-Ville Talvala2015-08-112-7/+31
| |/ | | | | | | | | Bug: 20537722 Change-Id: I9fa2fcdcfd41cd3370732c70414914993d3dc94e
* | audio policy: protect capture from telephony RX path.Eric Laurent2015-08-073-0/+5
|/ | | | | | | | Add permission check if the capture device selected is telephony RX path. Bug: 23017158. Change-Id: Iaa34d836e6cf46b7cbbf2483fcd4306dcd27ce90
* audio policy: populate attributes for attached capture devicesEric Laurent2015-08-061-2/+6
| | | | | | | | | | Populate supported sampling rates, channel masks and formats when enumerating attached build in capture devices. Having this information for build-in mic is important for some applications. Bug: 22729461. Change-Id: I93f03296447a87c10f2615fa1b1c45e9879b4aa7
* AudioFlinger: tell HAL the PCM is non-audioPhil Burk2015-08-041-1/+2
| | | | | | | | | | | Add a bit to tell the HAL that the PCM data is really encoded audio wrapped in a data burst. Otherwise the device may try to play the encoded data directly which will sound like modulated white noise. Bug: 22576112 Change-Id: Ib140da96876e849023858fe2510612310501d1ee Signed-off-by: Phil Burk <philburk@google.com>
* Merge "Fix capture overruns at non-primary sample rate" into mnc-devGlenn Kasten2015-07-243-20/+7
|\
| * Fix capture overruns at non-primary sample rateGlenn Kasten2015-07-223-20/+7
| | | | | | | | | | | | | | | | | | and small buffer size. Also: Pull out the magic number "12 ms" to a named constant. Remove obsolete AudioFlinger::mPrimaryOutputSampleRate. Bug: 22662814 Change-Id: I261f75a222c4505a84aad2493d251bd2dea59f68
* | Merge "Fix record memory buffer allocation for legacy upmix/downmix" into ↵Andy Hung2015-07-231-1/+1
|\ \ | | | | | | | | | mnc-dev
| * | Fix record memory buffer allocation for legacy upmix/downmixAndy Hung2015-07-221-1/+1
| |/ | | | | | | | | Bug: 22173057 Change-Id: I8f5056ff5a1252c71a3d3b354440551bcd9fd466
* | Prevent notifications from muting accessibility promptsJean-Michel Trivi2015-07-211-6/+6
|/ | | | | | | | | | | | | | | When evaluating on which device a sound is to be played, the policy must consider which current routing strategy, if any, has priority for overriding the choice. Here the playback of notifications, when duplicated over speaker and headphones, was causing the accessibility prompt to be muted because the it was of a higher priority, and incompatible with the accessibility routing. The fix consists in assigning a higher priority to the accessbility routing strategy over the notification routing strategy. Bug 18834451 Change-Id: I8228b30a7d80bd61d1c223afb030d9421d4f33cf
* Merge "mediaresourcemanager: add pid to removeResource method" into mnc-devRonghua Wu2015-07-183-27/+33
|\
| * mediaresourcemanager: add pid to removeResource methodRonghua Wu2015-07-173-27/+33
| | | | | | | | | | Bug: 22496209 Change-Id: I73311573e8d1ac15fec668a9ef6e6af7a07a1d30
* | Merge "Fix UAF error in CameraModule." into mnc-devRuben Brunk2015-07-181-2/+3
|\ \
| * | Fix UAF error in CameraModule.Ruben Brunk2015-07-171-2/+3
| | | | | | | | | | | | | | | Bug: 22542551 Change-Id: I2fe5791a6554a8e2f7fd94593d552d8af18257db
* | | Merge "AudioFlinger: fix repeated underruns for compressed audio" into mnc-devPhil Burk2015-07-175-16/+79
|\ \ \
| * | | AudioFlinger: fix repeated underruns for compressed audioPhil Burk2015-07-175-16/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AudioFlinger kept pausing the audio when playing compressed AC3 or DTS. This caused pause/resume loops that were hard to break out of. The AudioFlinger was thinking that the compressed audio was PCM because the HAL was in PCM mode playing SPDIF data bursts. It also thought that EAC3 was at 192000 Hz instead of 48000 Hz because the data bursts are played at a higher rate. This CL adds more calls to the shim that separates the AudioFlinger. Now the AudioFlinger gets information about the HAL sample rate, channel masks and format from the shim instead of calling the HAL directly. The AudioFlinger now uses a different threshold for detecting underruns when the audio is compressed. Bug: 19938315 Bug: 20891646 Change-Id: Ib16f539346d1c7a273ea4feb3d3afcc3dc60237d Signed-off-by: Phil Burk <philburk@google.com>
* | | | Merge "Camera2Client: handle slower jpeg stream sensor" into mnc-devYin-Chia Yeh2015-07-175-18/+154
|\ \ \ \
| * | | | Camera2Client: handle slower jpeg stream sensorYin-Chia Yeh2015-07-165-18/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If largest jpeg stream cannot sustain 30 FPS, don't create jpeg stream until takePicture is called and remove it after still capture is done. Also, disable video snapshot for such sensors so video snapshot won't slow down video recording. Bug: 22231605 Change-Id: I2b34d2537c224694ae10f2006b5a46be45a1b1a6
* | | | | Merge "Camera: Add hidden experimental tearDown method." into mnc-devEino-Ville Talvala2015-07-1710-1/+164
|\ \ \ \ \ | |_|/ / / |/| | | |