0899a9f97b
DO NOT MERGE: audiopolicy: Remove raw pointer references to AudioMix
...
AudioInputDescriptor, AudioOutputDescriptor, and AudioSession used
to reference AudioMix instances using a raw pointer. This isn't
safe as AudioMix was owned by AudioPolicyMix, which is not
referenced by descriptors.
Change AudioMix* pointers in Audio{Input|Output}Descriptor and
AudioSession to wp<AudioPolicyMix> which reflects their
relationship correctly.
To ensure that code does not operate on AudioMix instances
independently from AudioPolicyMix, and to avoid introducing
a lot of getter / setter methods into AudioPolicyMix, make
the latter to inherit AudioMix. This makes sense because
AudioPolicyMix is essentially a ref-counted version of AudioMix.
Bug: 124899895
Test: build and sanity check on marlin,
build marlin with USE_CONFIGURABLE_AUDIO_POLICY := 1
Merged-In: Ic508caedefe721ed7e7ba6ee3e9175ba9e8dc23a
Change-Id: Ic508caedefe721ed7e7ba6ee3e9175ba9e8dc23a
5 years ago
11de5b4bd6
Merge changes from topic "am-f4faa2c1-7416-4076-9f85-b0cd734dba65" into oc-dev am: 58f5458e2e
...
am: 759c3299f0
5 years ago
baee23668b
Merge changes from topic "am-99626481-1222-4690-a6c3-4a3db61755f9" into oc-dev am: eedc6cb657
...
am: d9f8d9181a
5 years ago
759c3299f0
Merge changes from topic "am-f4faa2c1-7416-4076-9f85-b0cd734dba65" into oc-dev
...
am: 58f5458e2e
5 years ago
d9f8d9181a
Merge changes from topic "am-99626481-1222-4690-a6c3-4a3db61755f9" into oc-dev
...
am: eedc6cb657
5 years ago
58f5458e2e
Merge changes from topic "am-f4faa2c1-7416-4076-9f85-b0cd734dba65" into oc-dev
...
* changes:
[automerger] AudioFlinger: Prevent multiple effect chains with same sessionId am: f963b2bfdafa4876957a982715021cd6b2f10642426b85d639f963b2bfdafa4876957a982715021cd6b2f10642f963b2bfdafa4876957a982715021cf963b2bfdafa4876957af963b2bfda
5 years ago
e6bf186f8d
[automerger] audio: ensure effect chain with specific session id is unique am: 5945746bca am: d2967d3fba am: 63539c399a am: d98b2019db am: a29ede5e56
...
Change-Id: I8e4d9f493c9d0693f85302b91e52ccc34bf1c8b2
5 years ago
a29ede5e56
[automerger] audio: ensure effect chain with specific session id is unique am: 5945746bca am: d2967d3fba am: 63539c399a am: d98b2019db
...
Change-Id: Ic74b3fbd878ad26911a777111b86712849a90a4b
5 years ago
d98b2019db
[automerger] audio: ensure effect chain with specific session id is unique am: 5945746bca am: d2967d3fba am: 63539c399a
...
Change-Id: Ib66f2e354e2cf561fd9c324ddfb37b2f5398da02
5 years ago
63539c399a
[automerger] audio: ensure effect chain with specific session id is unique am: 5945746bca am: d2967d3fba
...
Change-Id: Ie75c5fb05224afff58b3ac5e7e94d70bfd82f1d9
5 years ago
d2967d3fba
[automerger] audio: ensure effect chain with specific session id is unique am: 5945746bca
...
Change-Id: I82b031ca768dfa401da937cabdba13d3f5058d93
5 years ago
5945746bca
audio: ensure effect chain with specific session id is unique
...
It's possible that tracks with the same session id running on various
playback outputs, which causes effect chain being created on the same
session twice. As a result, the same effect engine will be released
twice as the same context is reused.
Output that has effect chain with same session id is more preferable.
Test: No regression with Play Music and Effects
Bug: 123082420
Bug: 123237974
Merged-In: I690ea3cb942d1fdc96b46048e271557d48000f43
Change-Id: I690ea3cb942d1fdc96b46048e271557d48000f43
(cherry picked from commit 9aeb1770d4
5 years ago
e786ae13e3
[automerger] AudioFlinger: Prevent multiple effect chains with same sessionId am: f963b2bfda am: fa4876957a am: 982715021c am: d6b2f10642 am: 426b85d639
...
Change-Id: If3df519d292c22dc6a71c781926157f4f7ffee9c
5 years ago
426b85d639
[automerger] AudioFlinger: Prevent multiple effect chains with same sessionId am: f963b2bfda am: fa4876957a am: 982715021c am: d6b2f10642
...
Change-Id: I28a8be00fa603092b34e46aefd376024ac5a661f
5 years ago
d6b2f10642
[automerger] AudioFlinger: Prevent multiple effect chains with same sessionId am: f963b2bfda am: fa4876957a am: 982715021c
...
Change-Id: I18a775973885c51ec246a5ea02e1887b8dec9a3f
5 years ago
982715021c
[automerger] AudioFlinger: Prevent multiple effect chains with same sessionId am: f963b2bfda am: fa4876957a
...
Change-Id: Ia904577a31055344fb4a9397013d7f17bebaa720
5 years ago
fa4876957a
[automerger] AudioFlinger: Prevent multiple effect chains with same sessionId am: f963b2bfda
...
Change-Id: If5c5bb96a0a7372a0fb50c57ab4c0a9255eebe15
5 years ago
f963b2bfda
AudioFlinger: Prevent multiple effect chains with same sessionId
...
Allow at most one effect chain with same sessionId on mPlaybackThreads.
Test: poc, CTS effect tests
Bug: 123237974
Merged-In: Ide46cd23b0a9f4295f0dca2fea23379a76b836ee
Change-Id: Ide46cd23b0a9f4295f0dca2fea23379a76b836ee
(cherry picked from commit 1631f06feb
5 years ago
b6a54df739
AudioFlinger: put effect desc lookup under mutex for createEffect am: a41770b682
...
am: ef52b30f9c
6 years ago
ef52b30f9c
AudioFlinger: put effect desc lookup under mutex for createEffect
...
am: a41770b682
6 years ago
a41770b682
AudioFlinger: put effect desc lookup under mutex for createEffect
...
Test: native poc
Bug: 122309228
Change-Id: I48333c69f5c1b1bf1b98f57eb813ec39e074f3a7
Merged-In: I9d339a7d6d81161065e1adaf427dd2d3430436c2
6 years ago
723e8fc248
Merge "aaudio: use weak pointer to prevent UAF" into oc-mr1-dev
6 years ago
92c3e26338
aaudio: use weak pointer to prevent UAF
...
Avoid using the mServiceEndpoint smart pointer
from multiple threads.
Bug: 74122779
Test: see bug for test instructions
Merged-In: Idaf9e32a163b25e51bde35d6f5ea10a372b5d916
Change-Id: Idaf9e32a163b25e51bde35d6f5ea10a372b5d916
6 years ago
c15279ab8b
Merge changes from topic "am-2fb1f972-9bf0-4533-a368-402725bae81d" into oc-dev am: cfefca44b0
...
am: 6f0501b853
6 years ago
6f0501b853
Merge changes from topic "am-2fb1f972-9bf0-4533-a368-402725bae81d" into oc-dev
...
am: cfefca44b0
6 years ago
ab6f41da4e
[automerger] Init gain config to prevent uninit leak. am: ebe0777edc am: 1f39e79a73 am: f57d4e10ef am: 3fc94f3a7f am: e279da4090 am: 7a41b25ce7 am: 3c5a6f0638 am: 8eb9eb44d1 am: deecb6ecad
...
Change-Id: Ib93a4df9e8a0a87506968013ead667785901df66
6 years ago
deecb6ecad
[automerger] Init gain config to prevent uninit leak. am: ebe0777edc am: 1f39e79a73 am: f57d4e10ef am: 3fc94f3a7f am: e279da4090 am: 7a41b25ce7 am: 3c5a6f0638 am: 8eb9eb44d1
...
Change-Id: I816c9ce0d669ff507ec5e4efa41c87b79ec4112f
6 years ago
8eb9eb44d1
[automerger] Init gain config to prevent uninit leak. am: ebe0777edc am: 1f39e79a73 am: f57d4e10ef am: 3fc94f3a7f am: e279da4090 am: 7a41b25ce7 am: 3c5a6f0638
...
Change-Id: I3d0c843a2b28b15236858bfab1a8bf192a121f00
6 years ago
3c5a6f0638
[automerger] Init gain config to prevent uninit leak. am: ebe0777edc am: 1f39e79a73 am: f57d4e10ef am: 3fc94f3a7f am: e279da4090 am: 7a41b25ce7
...
Change-Id: Ib6c972afb8d0004b920ce855bc53b37b3ff317fe
6 years ago
7a41b25ce7
[automerger] Init gain config to prevent uninit leak. am: ebe0777edc am: 1f39e79a73 am: f57d4e10ef am: 3fc94f3a7f am: e279da4090
...
Change-Id: I7af77c272222ecaf9997cad419b959b5437d195d
6 years ago
e279da4090
[automerger] Init gain config to prevent uninit leak. am: ebe0777edc am: 1f39e79a73 am: f57d4e10ef am: 3fc94f3a7f
...
Change-Id: Ia579f45f34e56ae56b4a8b09dba870a6770fabe9
6 years ago
3fc94f3a7f
[automerger] Init gain config to prevent uninit leak. am: ebe0777edc am: 1f39e79a73 am: f57d4e10ef
...
Change-Id: I725f65349dd127eaf689a71eead1eb9a06c059bd
6 years ago
f57d4e10ef
[automerger] Init gain config to prevent uninit leak. am: ebe0777edc am: 1f39e79a73
...
Change-Id: Id36b93f997029b521fb866bf4adb3d46b5ac8558
6 years ago
1f39e79a73
[automerger] Init gain config to prevent uninit leak. am: ebe0777edc
...
Change-Id: I49ac16dd7678f701140e199e9fc78e53e2527031
6 years ago
ebe0777edc
Init gain config to prevent uninit leak.
...
In AudioPortConfig, we only initialize index for audio_gain_config, but
not other fields. That may cause uninit leak at listAudioPorts and
listAudioPatches.
Bug: 77238250
Bug: 77238762
Test: try repo steps at the bug description.
Change-Id: I57e3bd0598f9aa698a6fa3d3c0218b046de34e2f
6 years ago
c59f7c0475
Merge "Soundtrigger service: fix status reporting in loadSoundModel" into lmp-mr1-dev am: c558af3f42 am: 8d6ba121ad am: 1d07dcb4f9
...
am: 360a43b71e
7 years ago
360a43b71e
Merge "Soundtrigger service: fix status reporting in loadSoundModel" into lmp-mr1-dev am: c558af3f42 am: 8d6ba121ad
...
am: 1d07dcb4f9
7 years ago
1d07dcb4f9
Merge "Soundtrigger service: fix status reporting in loadSoundModel" into lmp-mr1-dev am: c558af3f42
...
am: 8d6ba121ad
7 years ago
8d6ba121ad
Merge "Soundtrigger service: fix status reporting in loadSoundModel" into lmp-mr1-dev
...
am: c558af3f42
7 years ago
6306852062
camera: Drop pending preview for enableZsl shots
...
If the device support ZSL, drop pending preview buffers to reduce
the chance the rendering preview frames newer than the still frame
during takePicture().
Test: CTS
Bug: 67497723
Change-Id: I5f253a402a6302d31777ad4ca2878ef0d0d1ae44
Merged-In: I5f253a402a6302d31777ad4ca2878ef0d0d1ae44
7 years ago
82acb6c905
Soundtrigger service: fix status reporting in loadSoundModel
...
Fix regression introduced by commit a188af07
7 years ago
960b1b2fc6
Soundtrigger service: fix status reporting in loadSoundModel
...
Fix regression introduced by commit a188af07
7 years ago
1a55036ab9
Merge "aaudio: fix loss of sync with HW FIFO index" into oc-mr1-dev
7 years ago
999e110dac
aaudio: fix loss of sync with HW FIFO index
...
This fixes a problem with intermittent severe distortion
and variable latency after restarting a stream.
Bug: 68003241
Test: write_sine_callback -pl -m2 -n2 -s5 -c2 -l100
Merged-In: Id7418adb86f2869ac74936cfbd365815a0a0e923
Change-Id: Id7418adb86f2869ac74936cfbd365815a0a0e923
7 years ago
5de64b02a3
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev am: b6b4443dbb am: 74684f638b am: af5ce97781
...
am: 7190597c26
7 years ago
7190597c26
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev am: b6b4443dbb am: 74684f638b
...
am: af5ce97781
7 years ago
af5ce97781
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev am: b6b4443dbb
...
am: 74684f638b
7 years ago
74684f638b
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev
...
am: b6b4443dbb
7 years ago
960f0f335e
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am: dbda8a95eb am: 7f0263ba2d am: 31ac3bd137
...
am: 830bbb259e
7 years ago
830bbb259e
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am: dbda8a95eb am: 7f0263ba2d
...
am: 31ac3bd137
7 years ago
Mikhail Naganov
Andy Hung
Android Build Merger (Role)
Weiyin Jiang
Phil Burk
jiabin
Eric Laurent
Chien-Yu Chen
TreeHugger Robot