summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | Merge "audio policy: do not route accessibility prompts to compressed ↵Eric Laurent2014-11-261-0/+15
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | output" into lmp-mr1-dev
| | | * | | | audio policy: do not route accessibility prompts to compressed outputEric Laurent2014-11-251-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a digital output (HDMI or S/PDIF) is configured with a non linear PCM audio format it is likely that the audio HAL or HW will not be able to mix other sounds with the main media stream being played. In this case, do not condider HDMI or S/PDIF as a valid route for accessibilty strategy so that accessibility prompts are always audible. Bug: 18067208. Change-Id: If20603a1dc1dc470f206f841308bed2b87daf21c
* | | | | | | am 121143d5: am bf14c62e: am 72bf901c: Merge "audio policy: new ↵Eric Laurent2014-11-269-97/+222
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getOutputForAttr() prototype." into lmp-mr1-dev * commit '121143d5242a790d0bd01fe1b9cec5d28a1ba1d7': audio policy: new getOutputForAttr() prototype.
| * | | | | | am bf14c62e: am 72bf901c: Merge "audio policy: new getOutputForAttr() ↵Eric Laurent2014-11-269-97/+222
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prototype." into lmp-mr1-dev * commit 'bf14c62e7973ed793a3b00c2c67beca4484c1c7a': audio policy: new getOutputForAttr() prototype.
| | * | | | | Merge "audio policy: new getOutputForAttr() prototype." into lmp-mr1-devEric Laurent2014-11-269-97/+222
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | audio policy: new getOutputForAttr() prototype.Eric Laurent2014-11-259-97/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update getOutputForAttr() prototype and group all logic dealing with audio attributes to stream type conversion in audio policy manager. getOutputForAttr(): - specifies the audio session (for future use) - returns a status code - receives either stream type (for legacy) or audio attributes - returns an updated streamtype Remove logic dealing with legacy stream types to attributes conversion from AudioTrack. Use correct type for audio sessions in other APIs (startOutput() ...). releaseOutput() specifies the audio session (for future use). Bug: 18067208. Change-Id: I1bfbe9626c04c7955d77f8a70aecfad2cb204817
* | | | | | | am d802d071: am ec7b26f0: am 512dd849: Merge "camera: fix frame deletion ↵Zhijun He2014-11-261-2/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | logic in mInFlightMap" into lmp-mr1-dev * commit 'd802d0718d7639da1bef1128a840cfd05200af55': camera: fix frame deletion logic in mInFlightMap
| * | | | | | am ec7b26f0: am 512dd849: Merge "camera: fix frame deletion logic in ↵Zhijun He2014-11-261-2/+6
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mInFlightMap" into lmp-mr1-dev * commit 'ec7b26f06f7b1b6334ef1139ac33548ed0510284': camera: fix frame deletion logic in mInFlightMap
| | * | | | | Merge "camera: fix frame deletion logic in mInFlightMap" into lmp-mr1-devZhijun He2014-11-251-2/+6
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | camera: fix frame deletion logic in mInFlightMapRuchit Sharma2014-11-251-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For per-frame error notifications, camera3.h requirements state that all the buffer handles for a failed frame capture must be returned via process_capture_result() call(s). Hence, Camera3Device needs to ensure that the frame entry is not deleted from mInFlightMap until all buffers for that frame have been returned by HAL. Bug: 17757940 Change-Id: I2579ca7980d2fd67d53abc530e2706538f7d3d3a
* | | | | | | am e0f44009: am fcf39e22: am 0f78eabb: fix the build.Eric Laurent2014-11-261-8/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'e0f440094345e1e7c3836fe29d3fa34d84e43aee': fix the build.
| * | | | | | am fcf39e22: am 0f78eabb: fix the build.Eric Laurent2014-11-261-8/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'fcf39e226ce318ae1e4bc042379aae1ecff560a6': fix the build.
| | * | | | | fix the build.Eric Laurent2014-11-251-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iab6b65327ae1adbf0b3a6da5a23b8107468f533e
* | | | | | | am 72215491: am 1a475921: am 223fd5c9: audio: new routing strategies and ↵Eric Laurent2014-11-2611-53/+170
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stream types * commit '72215491c60fbcdb9a2f0be782e24e39cca249c5': audio: new routing strategies and stream types
| * | | | | | am 1a475921: am 223fd5c9: audio: new routing strategies and stream typesEric Laurent2014-11-2611-53/+170
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '1a475921c0577a4650d1bbe40a85b732d1766939': audio: new routing strategies and stream types
| | * | | | | audio: new routing strategies and stream typesEric Laurent2014-11-2111-53/+170
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new routing strategies and stream type for internal use by audio policy manager and audio flinger: - One for accessibility to allow different routing than media - One for re-routing (remote submix) in preparation of dynamic policies - Added stream type for "internal" audio flinger tracks used for audio patches and duplication. Bug: 18067208. Change-Id: I88f884b552e51e4a49c29125e5a1204cf58ff434
* | | | | | am ffa3e71e: am bc0f452b: Merge "Camera2: Fix CameraParameters parse ↵Ruben Brunk2014-11-211-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | segfault." into lmp-mr1-dev automerge: 6b6d8a7 * commit '6b6d8a79ef821541a7687ed924959369f73fc977': Camera2: Fix CameraParameters parse segfault.
| * | | | | am ffa3e71e: am bc0f452b: Merge "Camera2: Fix CameraParameters parse ↵Ruben Brunk2014-11-211-0/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | segfault." into lmp-mr1-dev * commit 'ffa3e71e47215b68fe4ae0b7a3f976db648d63d3': Camera2: Fix CameraParameters parse segfault.
| | * | | | Merge "Camera2: Fix CameraParameters parse segfault." into lmp-mr1-devRuben Brunk2014-11-211-0/+1
| | |\ \ \ \
| | | * | | | Camera2: Fix CameraParameters parse segfault.Ruben Brunk2014-11-201-0/+1
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | Bug: 18331142 Change-Id: I41feec93f753f97b3e6bf963deb4a42b73406421
| * | | | | am 30dee177: am 8052d933: Merge "SoundTrigger: allow sound model reloading" ↵Eric Laurent2014-11-212-0/+19
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '30dee177d25bf75f8b3fb8a70573de2c04306759': SoundTrigger: allow sound model reloading
| * | | | | am d48f1b68: am f50db74f: Merge "Fix format conversion in DuplicatingThread" ↵Glenn Kasten2014-11-211-8/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'd48f1b68b2b824ffcfdbf6aa67ad4696020a8a11': Fix format conversion in DuplicatingThread
* | \ \ \ \ \ am 58cc16ef: am 8052d933: Merge "SoundTrigger: allow sound model reloading" ↵Eric Laurent2014-11-212-0/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: 30dee17 * commit '58cc16ef6b3a6d0e26566203cc6c094a8c036bc7': SoundTrigger: allow sound model reloading
| * \ \ \ \ \ \ am 8052d933: Merge "SoundTrigger: allow sound model reloading" into lmp-mr1-devEric Laurent2014-11-212-0/+19
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 30dee17 * commit '30dee177d25bf75f8b3fb8a70573de2c04306759': SoundTrigger: allow sound model reloading
| | * | | | | | Merge "SoundTrigger: allow sound model reloading" into lmp-mr1-devEric Laurent2014-11-202-0/+19
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | SoundTrigger: allow sound model reloadingEric Laurent2014-11-202-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow reloading a sound model without unloading it before. Bug: 18308781. Change-Id: I31c83b81a03ee1c1e80f4339ca62e6d06fb1a33b
* | | | | | | | am c63c0973: am f50db74f: Merge "Fix format conversion in DuplicatingThread" ↵Glenn Kasten2014-11-211-8/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: d48f1b6 * commit 'c63c09738772133e9b20a7c8576ad116ff855ee2': Fix format conversion in DuplicatingThread
| * | | | | | | am f50db74f: Merge "Fix format conversion in DuplicatingThread" into lmp-mr1-devGlenn Kasten2014-11-211-8/+8
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | / / / / | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | automerge: d48f1b6 * commit 'd48f1b68b2b824ffcfdbf6aa67ad4696020a8a11': Fix format conversion in DuplicatingThread
| | * | | | | Fix format conversion in DuplicatingThreadHaynes Mathew George2014-11-201-8/+8
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DuplicatingThread converts PCM data from the format of the source thread to PCM_16BIT before writing to all connected output tracks. This needs to be done just once before writing to all tracks. Bug: 18461844 Change-Id: If05254f87f9198e09a0fa3c4e857afbb53ae7073
* | | | | | am 568689b1: am 3a2a32b5: Merge "AudioSystem: fix cross deadlock" into ↵Eric Laurent2014-11-212-8/+11
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: c9769c5 * commit 'c9769c557e202df671e35196c8c735b49257be7d': AudioSystem: fix cross deadlock
| * | | | | am 568689b1: am 3a2a32b5: Merge "AudioSystem: fix cross deadlock" into ↵Eric Laurent2014-11-212-8/+11
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '568689b169d8b0ae2cc252b88602db5e5acaa604': AudioSystem: fix cross deadlock
| | * | | | AudioSystem: fix cross deadlockEric Laurent2014-11-202-8/+11
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not hold gLockAPS when calling AudioPolicyService::registerClient() in get_audio_policy_service(). registerClient() will need to acquire the AudioPolicyService mutex and if at the same time a method called from AudioPolicyService (with mutex held) calls back into AudioSystem and get_audio_policy_service() a cross deadlock occurs. Same preventive fix for get_audio_flinger(). Use a separate mutex for notification client list in AudioPolicyService. This prevents deadlocking if registerClient() is called as a consequence of AudioFlinger calling back into AudioPolicyManager while executing a method with AudioPolicyService locked Bug: 18403952. Bug: 18450065. Change-Id: Ia832e41aede8bc6c843fc615508fbdd74e0863b5
* | | | | am d0e12a16: am 902dc42d: am 07715ac3: Merge "C++11 compatibility."Dan Albert2014-11-206-15/+21
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'd0e12a161471823d1ab269cb608be3f3b0a71ed1': C++11 compatibility.
| * | | | am 902dc42d: am 07715ac3: Merge "C++11 compatibility."Dan Albert2014-11-206-15/+21
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '902dc42d79b075395d484ce1c71f215b199aaa2a': C++11 compatibility.
| | * | | C++11 compatibility.Dan Albert2014-11-206-15/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix string literal concatenation to not be interpreted as UD literals. * Add constexpr compatibility for non-integral static members. * Use __typeof__ instead of typeof (should become decltype once this actually becomes C++11). * Add an appropriate cast for atomic_uintptr_t, since moving to C++11 means moving from <stdatomic.h> to <atomic>, which has better typechecking (hooray for not macros!). Bug: 18466763 Change-Id: I9561dcb2526578687819ff85421ba80d8e1a9694
* | | | | am a848844f: am cb79b3db: am 03181012: Merge "Camera2Client: remove ↵Yin-Chia Yeh2014-11-193-7/+56
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | recording stream if necessary" into lmp-mr1-dev * commit 'a848844f5451d8e01c00b613daccbb901372779d': Camera2Client: remove recording stream if necessary
| * | | | am cb79b3db: am 03181012: Merge "Camera2Client: remove recording stream if ↵Yin-Chia Yeh2014-11-193-7/+56
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | necessary" into lmp-mr1-dev * commit 'cb79b3dbd377b1a3b6da2f58dfa49050400815ae': Camera2Client: remove recording stream if necessary
| | * | | Merge "Camera2Client: remove recording stream if necessary" into lmp-mr1-devYin-Chia Yeh2014-11-193-7/+56
| | |\ \ \
| | | * | | Camera2Client: remove recording stream if necessaryYin-Chia Yeh2014-11-183-7/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17495165 Change-Id: I11b763fde8f9448f4bddec3fe6c81581e7699edb
* | | | | | Merge "Fix AudioMixer floating interaction with downmixer"Andy Hung2014-11-194-56/+136
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Fix AudioMixer floating interaction with downmixerAndy Hung2014-11-074-56/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously _if_ the full floating point mixer is enabled, a downmixer would force the mixer input for a session submix to integer, breaking other mixer inputs to the same submix that were in float. Use another ReformatBufferProvider after the downmixer to solve this issue. Update the test-mixer app and the mixer_to_wave_tests shell script to detect this issue. Bug: 17363939 Change-Id: I74a56333f9ee75ddde39a75392c021c5eebddbef
* | | | | | Merge "Move AudioMixer buffer provider preparation into track"Andy Hung2014-11-192-74/+66
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Move AudioMixer buffer provider preparation into trackAndy Hung2014-11-072-74/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17363939 Change-Id: I1f0f597b008f7369df87ba369fabaa93dec08ea1
* | | | | | am 640228b8: am 9b323821: am e4044209: Merge "Disable clang++ due to ↵Chih-Hung Hsieh2014-11-192-0/+12
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | compiler error." * commit '640228b8e0e537a527f2bb63a4f4d4b5a1ef29cd': Disable clang++ due to compiler error.
| * | | | | am 9b323821: am e4044209: Merge "Disable clang++ due to compiler error."Chih-Hung Hsieh2014-11-192-0/+12
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | * commit '9b3238218cf24c75f92c5174e3a4edb8aff17047': Disable clang++ due to compiler error.
| | * | | | Merge "Disable clang++ due to compiler error."Chih-Hung Hsieh2014-11-182-0/+12
| | |\ \ \ \
| | | * | | | Disable clang++ due to compiler error.Chih-Hung Hsieh2014-11-142-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang++ chokes on AudioMixer.cpp. It does not know "how to split this operator." BUG: 18373866 Change-Id: I3d588d44596c7c3b6f97e5f822545e015b074206
* | | | | | | am 9544a8e9: am bfa77b5c: am 8cd37d67: Merge "audio policy: do not prevent ↵Eric Laurent2014-11-181-4/+12
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | routing to A2DP when suspended." into lmp-mr1-dev * commit '9544a8e904955f4b96ec9f2d6f4edc2a72afd270': audio policy: do not prevent routing to A2DP when suspended.
| * | | | | | am bfa77b5c: am 8cd37d67: Merge "audio policy: do not prevent routing to ↵Eric Laurent2014-11-181-4/+12
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A2DP when suspended." into lmp-mr1-dev * commit 'bfa77b5c687f217e26267693306aaa6cc8a63672': audio policy: do not prevent routing to A2DP when suspended.
| | * | | | | Merge "audio policy: do not prevent routing to A2DP when suspended." into ↵Eric Laurent2014-11-181-4/+12
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
generated by cgit v1.1 at 2025-09-15 19:29:53 +0000