summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | am 4379c034: Merge "Fix tee sink" into lmp-devGlenn Kasten2014-09-291-3/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '4379c03433e4613c417998ca7917059ef17dc3a9': Fix tee sink
| * | | Merge "Fix tee sink" into lmp-devGlenn Kasten2014-09-291-3/+5
| |\ \ \ | | |/ / | |/| |
| | * | Fix tee sinkGlenn Kasten2014-09-281-3/+5
| | |/ | | | | | | | | | | | | | | | | | | Note: this does not fix the bug below, but it helps to investigate the bug. Bug: 17578238 Change-Id: I0fd27a477b73ba0e1c5a658bdfad17c500f5dc67
* | | am dc2e6ddc: Camera2Client: Revert HALv2 device behavior back to MR2Eino-Ville Talvala2014-09-292-47/+69
|\ \ \ | |/ / | | | | | | | | | * commit 'dc2e6ddc933e40632e79a866d9ece870db1a975e': Camera2Client: Revert HALv2 device behavior back to MR2
| * | Camera2Client: Revert HALv2 device behavior back to MR2Eino-Ville Talvala2014-09-282-47/+69
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | - Do not idle device before video snapshot stream configuration, to avoid deadlock during waiting. - Do not tear down ZSL stream - Don't refresh ZSL stream after deletion was requested. The v2 HAL implementations really don't like the ZSL stream being touched ever. Bug: 17634430 Bug: 17628507 Change-Id: I36b44a395e697be9802c4bd917a82b77c8d04be2
* | am a67ced97: Merge "CameraService: API1: Fix flash mode" into lmp-devEino-Ville Talvala2014-09-271-1/+1
|\ \ | |/ | | | | | | * commit 'a67ced9746e6f0d4e03ff8007682091afea71f6c': CameraService: API1: Fix flash mode
| * Merge "CameraService: API1: Fix flash mode" into lmp-devEino-Ville Talvala2014-09-271-1/+1
| |\
| | * CameraService: API1: Fix flash modeEino-Ville Talvala2014-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Sometimes it's useful to ensure variables are initialized in all code paths. Bug: 17680416 Change-Id: I9bed8a3bcb94417384bf0551fe1c0eee6cc49577
* | | am a8a4eeb9: Merge "audio policy: favor mixed over direct output for PCM ↵Eric Laurent2014-09-261-1/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | format" into lmp-dev * commit 'a8a4eeb95988e6bb73f7a742c8dd238c1f96c5c4': audio policy: favor mixed over direct output for PCM format
| * | Merge "audio policy: favor mixed over direct output for PCM format" into lmp-devEric Laurent2014-09-261-1/+11
| |\ \
| | * | audio policy: favor mixed over direct output for PCM formatEric Laurent2014-09-261-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modify getOutputForDevice() to skip direct output selection if the request can obviously be attached to a mixed output This prevents from selecting a direct output profile that can manage stereo PCM format if a mixer output is available to reach the same device. Bug: 17628413. Change-Id: I02e9a0b02c9ae5f44ff5768ac4ed02ce84d521c5
* | | | am 504de531: Merge "audio: fix stream type for accessibility usage" into lmp-devEric Laurent2014-09-264-1/+18
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '504de531a08facd130fa00f64fdc00521a975175': audio: fix stream type for accessibility usage
| * | | Merge "audio: fix stream type for accessibility usage" into lmp-devEric Laurent2014-09-264-1/+18
| |\ \ \ | | |_|/ | |/| |
| | * | audio: fix stream type for accessibility usageEric Laurent2014-09-254-1/+18
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Make sure that accessibility prompts are heard when a ringtone is active by forcing stream type to AUDIO_STREAM_RING when phone state is AUDIO_MODE_RINGTONE. Bug: 17558149. Change-Id: Ia3bead8052fca5cbf282c267f7b9b06014fef628
* | | am c53b98f3: am 6cd6792a: Merge "Allow building on clang without ↵Ian Rogers2014-09-261-1/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | __builtin_assume_aligned" * commit 'c53b98f3773299ca26acbe5c4a56450a76c2ecf9': Allow building on clang without __builtin_assume_aligned
| * | Allow building on clang without __builtin_assume_alignedBernhard Rosenkraenzer2014-09-191-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Clang versions up to and including 3.5 don't have __builtin_assume_aligned. Define it to a reasonable approximation when building with those. Change-Id: I223ccfda6e6ae55ce29dda5e4cacc1b162728b2c Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
| * | Remove 64-bit android_atomic uses from StateQueue.Hans Boehm2014-07-232-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use stdatomic.h instead. We're trying to remove android_atomic use wherever possible. The 64-bit uses seem easiest to remove first. This cleans up the code, though not as much as C++ <atomic> would, if it worked everywhere. Change-Id: I3c29bdbd5915cb9d47118834a3a742fe296cf87f
* | | Camera1 shim: If there's no flash, the keys need to be null.Eino-Ville Talvala2014-09-251-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we set FLASH_MODE_OFF for FLASH_MODE when a flash unit isn't available. However, per the API documentation, the key has to be null instead. - Make sure that the flash mode and supported flash mode keys are null if there's no flash unit on start - Don't set flash mode in later setParameters calls if there is no flash unit - Map NULL value for flash mode key to FLASH_MODE_OFF for internal consistency. Bug: 17660716 Change-Id: I3033682f0b882b8c2004114e2afef31662caebda
* | | camera: add traces for KPI measurementRuchit Sharma2014-09-252-2/+16
| |/ |/| | | | | | | Bug: 17658101 Change-Id: I1d8035c4a8fba7b88a87f205ce57c13d812e9df5
* | Merge "audio policy: add hw hotword flag for inputs" into lmp-devEric Laurent2014-09-242-31/+69
|\ \
| * | audio policy: add hw hotword flag for inputsEric Laurent2014-09-192-31/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Audio input profiles can indicate flag AUDIO_INPUT_FLAG_HW_HOTWORD meaning they allow capture from the same source as HW hotword detection. When a client requests capture with this flag, the policy will try to find an input profile matching this request first and fallback to a regular input if not found. Bug: 17575019. Change-Id: Ia463211597d7fa363527d776389f2257f0ced9a2
* | | Camera2Client: log an error when autoFocus is called in wrong stateZhijun He2014-09-231-0/+2
| | | | | | | | | | | | | | | Bug: 17555612 Change-Id: Ife33da712fbc8dc44d81e1e869fc75fb21026204
* | | Merge "API1: ZSL buffers should be skipped for manual AF mode" into lmp-devZhijun He2014-09-201-0/+5
|\ \ \
| * | | API1: ZSL buffers should be skipped for manual AF modeZhijun He2014-09-191-0/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | ZSL counts on good auto focus (CAF). It is really tricky to enable ZSL for manual focus mode. as it is bascically a locked focus mode, you can not tell if the focus is good or not by reading the afstate. Bug: 17577928 Change-Id: I68ff7d143e7d56f942bb00a8da6a9faea57b52a0
* | | Merge "CameraService: Add client name/pid to device open/close logging." ↵Eino-Ville Talvala2014-09-192-2/+10
|\ \ \ | |/ / |/| | | | | into lmp-dev
| * | CameraService: Add client name/pid to device open/close logging.Eino-Ville Talvala2014-09-182-2/+10
| | | | | | | | | | | | | | | Bug: 15672812 Change-Id: I1162c6d9d0a1eea1dd32949a04c295b4941d2602
* | | Merge "CameraService: Fix dump methods for two clients" into lmp-devEino-Ville Talvala2014-09-182-7/+19
|\ \ \ | |/ /
| * | CameraService: Fix dump methods for two clientsEino-Ville Talvala2014-09-182-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | Actually write dump text into the provided FD, and add a bit more dump data into CameraDeviceClient. Bug: 17570762 Change-Id: I37b1db85188855d4e89c8050c4b13f0d22e07e0c
* | | Merge "audioflinger: remove debug log." into lmp-devEric Laurent2014-09-171-2/+0
|\ \ \
| * | | audioflinger: remove debug log.Eric Laurent2014-09-171-2/+0
| |/ / | | | | | | | | | | | | | | | | | | Remove debug log left by commit ab5cdbaf. bug: 17537746. Change-Id: I10f672f607f8e87caaa8228fc05eff8aee7dfa15
* | | audio policy: fix attached devices validationEric Laurent2014-09-161-76/+94
|/ / | | | | | | | | | | | | | | | | | | | | | | Consider all supported devices in an io profile and not only the first one when looking for a match with attached devices. Failing to do so would cause the device validation to fail if supported devices are not declared in a specific order in the io profile descriptor in audio_policy.conf Bug: 17532764. Change-Id: Id27c9192e21de7f075076e17eb8c48e7e42847f6
* | Merge "Camera2: handle one more videosnapshot failure" into lmp-devYin-Chia Yeh2014-09-151-13/+7
|\ \
| * | Camera2: handle one more videosnapshot failureYin-Chia Yeh2014-09-151-13/+7
| | | | | | | | | | | | | | | | | | | | | | | | Handle one more corner case. Also remove redundant re-try path. Bug: 17484683 Change-Id: I0b3e1223f4f28022e7ec6abe028ca3c2623829de
* | | Merge "audioflinger: fix pre processing effect leak" into lmp-devEric Laurent2014-09-158-37/+133
|\ \ \
| * | | audioflinger: fix pre processing effect leakEric Laurent2014-09-158-37/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a capture thread was closed, the effects attached to this thread were left dangling and the associated effect chain destroyed. When their last client was disconnected, the effects were not released properly from the effect library because the destruction process could not be completed without the effect being attached to a thread. A similar problem prevented a RecordTrack to be properly released if its client was destroyed after the capture thread. The fix consists in allowing the effect or record track to be properly released even if its parent thread cannot be promoted. Also save any effect chain still present on a closed capture thread in case a new client wants to reuse the effects on the same session later. Bug: 17110064. Change-Id: I5cd644daa357afd1f3548f9bcb28e6152d95fdb8
* | | | Merge "Camera3Device: Treat failure to idle as an error" into lmp-devEino-Ville Talvala2014-09-151-0/+4
|\ \ \ \
| * | | | Camera3Device: Treat failure to idle as an errorEino-Ville Talvala2014-09-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16899526 Change-Id: Ia995aac6360c9c41ed654af5a7052480f23903d8
* | | | | Merge "audioflinger: send mic mute command to all audio HALs" into lmp-devEric Laurent2014-09-151-2/+7
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | audioflinger: send mic mute command to all audio HALsEric Laurent2014-09-151-2/+7
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mic mute should be sent to all audio HALs, not only the primary HAL as telephony can use capture devices on other HALs (e.g USB) Bug: 17321604. Change-Id: I658f6084d5b5cdc5a70784661d5cea0b6f81c3a9
* | | | Merge "Camera1: Validate scene mode override AF mode" into lmp-devEino-Ville Talvala2014-09-141-0/+14
|\ \ \ \ | | |/ / | |/| |
| * | | Camera1: Validate scene mode override AF modeEino-Ville Talvala2014-09-131-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't allow uncalibrated cameras to list a fixed focus mode for variable-focus cameras, since uncalibrated cameras cannot do INFINITY focus. Bug: 17492043 Change-Id: I5835efd6f21be0ebb74a9b7ea3ef5b2e7cf63e7a
* | | | Camera3: Update ZSL post-processing tagsZhijun He2014-09-144-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update ZSL processing tags according the still capture template Also cache the request template to avoid extra cost of querying into HAL every time. Bug: 17463102 Change-Id: I2eeffefb0a4131c99a85dd3e4484cc6f0f025efa
* | | | Merge "audio policy: fix relative priorities of PHONE and ENFORCED_AUDIBLE" ↵Eric Laurent2014-09-141-7/+15
|\ \ \ \ | |_|/ / |/| | | | | | | into lmp-dev
| * | | audio policy: fix relative priorities of PHONE and ENFORCED_AUDIBLEJon Eklund2014-09-121-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ENFORCED_AUDIBLE should only be highest priority if system tones are being forced. Otherwise it should behave like SONIFICATION. Bug: 17474485. Change-Id: Ia651779870d51100cc3179c96fa09694bc691ba7
* | | | Merge "Camera: Allow larger preview resolutions in API1 for >= HALv2 ↵Eino-Ville Talvala2014-09-132-4/+29
|\ \ \ \ | | |/ / | |/| | | | | | devices" into lmp-dev
| * | | Camera: Allow larger preview resolutions in API1 for >= HALv2 devicesEino-Ville Talvala2014-09-132-4/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit preview resolutions to a max of 1920x1920 instead of 1920x1080p, so that any aspect ratio with a 1920 as the larger dimension can be used. Also improve the initial preview/video size selection logic, to ensure that the selected size is both a valid preview and video size, and not too large. Bug: 17458832 Change-Id: Iea006fadb5fbf0f03d23c3c5babb5b3611469688
* | | | Merge "Camera2: fix 4K recording" into lmp-devZhijun He2014-09-134-18/+111
|\ \ \ \ | |_|/ / |/| | |
| * | | Camera2: fix 4K recordingYin-Chia Yeh2014-09-134-18/+111
| |/ / | | | | | | | | | | | | Bug: 17484683 Change-Id: I09bb12698057555329286c777102b9b310452fb3
* | | Merge "audio policy: fix check in creaateAudioPatch()" into lmp-devEric Laurent2014-09-131-3/+3
|\ \ \
| * | | audio policy: fix check in creaateAudioPatch()Eric Laurent2014-09-121-3/+3
| | | | | | | | | | | | | | | | | | | | Bug: 17488759. Change-Id: I9dd2c3ca7f83de4b3573f4fb0e9934e1bc37c3bc