| ad65899e5f7d46e30a4dcca07aa0503fc014a3b9 |
|
11-Apr-2016 |
Ryan Bavetta <bavetta@google.com> |
Return error instead of unloading existing model
We were previously favoring KeyphraseSoundModels at this layer.
We now have better state handling in SoundTriggerHelper, and
will defer the loading problem to SoundTriggerHelper and above
to sort out.
BUG:28119841
Change-Id: I438a620d6f6e6c593216a8a39bec6d969d6a5311
/frameworks/av/services/soundtrigger/SoundTriggerHwService.cpp
|
| efcf16c9fd2a2f0d865a2bcca98527d3804f83d6 |
|
28-Mar-2016 |
Chris Thornton <thorntonc@google.com> |
Use new stop_all_recogntions when changing sound trigger state.
If no implementation is provided to the hal or uses an earlier version,
will fallback to using the single stop_recognition on all running
models.
Change-Id: Ifc1bd3f2887ad9397499bfd291241fd907b55421
/frameworks/av/services/soundtrigger/SoundTriggerHwService.cpp
|
| 2c561209f00320f7ca2b75998bbe72ecec527210 |
|
16-Feb-2016 |
Ryan Bavetta <bavetta@google.com> |
Prevent dumping sound models when max reached
There are currently cases when SoundTriggerHelper may get out of sync
with SoundTriggerHwService, specifically which and how many sound models
are loaded.
If SoundTriggerHelper attempts to load a sound model and it would be
exceeding the maximum allowable number of sound models:
1) If the new sound model is not a KeyphraseSoundModel:
Throw an error
2) If the new sound model is a KeyphraseSoundModel:
See if there is an existing KeyphraseSoundModel to unload
Failing that, unload the first SoundModel in the index
BUG: 27225762
BUG: 22860713
Change-Id: I74db1be36bbc5887f5bf4751c3138de102976722
/frameworks/av/services/soundtrigger/SoundTriggerHwService.cpp
|
| 9609a91f8560622735f6725f7f597be47a8e2f5f |
|
29-Jan-2016 |
Ryan Bavetta <bavetta@google.com> |
Restore Abort Event for Unknown Sound Models
Restore abort event when setting capture state
from active to inactive for Unknown Sound Models
This was taken out mistakenly in change 853028
Also fix/improve log messages
Change-Id: I58771de47ea357bb99a4ba3cfeea412490746443
/frameworks/av/services/soundtrigger/SoundTriggerHwService.cpp
|
| 00a727c430c474f77f8835675a9d773f0314fb68 |
|
27-Jan-2016 |
Ryan Bavetta <bavetta@google.com> |
Add SoundTrigger GenericSoundModel type
BUG: 22860713
Change-Id: I462ba039577511674a08aee42e3f1941ff7005ce
/frameworks/av/services/soundtrigger/SoundTriggerHwService.cpp
|
| 7b56f2e1e9495915ad9dea9afdc13e9e5d5b7536 |
|
22-May-2015 |
Eric Laurent <elaurent@google.com> |
sound trigger: fix abort event init.
Initialize unused fields of recognition abort event
to avoid argument type check exception in JNI.
Bug: 20951546.
Change-Id: I65ed3284464bd9a32406b5305d562fa434abedce
/frameworks/av/services/soundtrigger/SoundTriggerHwService.cpp
|
| 58cc16ef6b3a6d0e26566203cc6c094a8c036bc7 |
|
21-Nov-2014 |
Eric Laurent <elaurent@google.com> |
am 8052d933: Merge "SoundTrigger: allow sound model reloading" into lmp-mr1-dev
automerge: 30dee17
* commit '30dee177d25bf75f8b3fb8a70573de2c04306759':
SoundTrigger: allow sound model reloading
|
| 02eb47cf18793effe9fc7ab34e1b0fe9ea6635bc |
|
20-Nov-2014 |
Eric Laurent <elaurent@google.com> |
SoundTrigger: allow sound model reloading
Allow reloading a sound model without unloading it before.
Bug: 18308781.
Change-Id: I31c83b81a03ee1c1e80f4339ca62e6d06fb1a33b
/frameworks/av/services/soundtrigger/SoundTriggerHwService.cpp
|
| f888020c6e2735624f2b2a30e72aca24e17b8b4d |
|
14-Nov-2014 |
Marco Nelissen <marcone@google.com> |
Update calls to IInterface::asBinder()
to use the new static version.
Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a
Conflicts:
media/libmedia/IAudioFlinger.cpp
media/libmedia/IMediaPlayer.cpp
media/libstagefright/CameraSource.cpp
/frameworks/av/services/soundtrigger/SoundTriggerHwService.cpp
|
| 886561f06ddaea86a51def1e918367430240b5ac |
|
29-Aug-2014 |
Eric Laurent <elaurent@google.com> |
sound trigger: fix cross deadlock between service and client
Do not call callback methods on ISoundTriggerClient with the service mutex
locked: the client implementation will lock its mutex to process
the callback and if a request from the same client with client
mutex locked was waiting for the service mutex a deadlock occurs.
Bug: 16873049.
Change-Id: Ifc3b31fdfaed525981fa59876c041478f38b42e8
/frameworks/av/services/soundtrigger/SoundTriggerHwService.cpp
|
| df3dc7e2fe6c639529b70e3f3a7d2bf0f4c6e871 |
|
28-Jul-2014 |
Eric Laurent <elaurent@google.com> |
Add sound trigger control by audio policy
Audio policy:
- Added active capture indication to sound trigger service:
recognition stops if concurrent capture is not supported.
- Added generation of reserved I/O handle and session ID for
utterance capture.
Sound trigger service
- Added sound model update callback handling.
- Added service state callback
- Simplified callback shared memory allocation.
Bug: 12378680.
Change-Id: Ib0292c2733e6df90fdae480633dd9953d0016ef1
/frameworks/av/services/soundtrigger/SoundTriggerHwService.cpp
|
| 8ba53d87a2d311ff4b3f04e30b2e09309ae7421c |
|
02-Aug-2014 |
Eric Laurent <elaurent@google.com> |
Revert "Revert "sound trigger: added permission checks""
This reverts commit 936c84a5b743dce2a2572fdf54b37b187bc88b60.
Bug: 16374803.
Change-Id: I9d3137faeddf119b13f9cdb73c14ca49e1ee3d1c
/frameworks/av/services/soundtrigger/SoundTriggerHwService.cpp
|
| 936c84a5b743dce2a2572fdf54b37b187bc88b60 |
|
17-Jul-2014 |
Eric Laurent <elaurent@google.com> |
Revert "sound trigger: added permission checks"
This reverts commit dcb162f3aed807d1e51f29e2454ade584439992e.
/frameworks/av/services/soundtrigger/SoundTriggerHwService.cpp
|
| dcb162f3aed807d1e51f29e2454ade584439992e |
|
11-Jul-2014 |
Eric Laurent <elaurent@google.com> |
sound trigger: added permission checks
Add check for android.permission.CAPTURE_AUDIO_HOTWORD
to all sound trigger binder calls on server side.
Bug: 12378680.
Change-Id: Ic3fd70e947882cdf5f4d4a4fe609a2c5a8236fd5
/frameworks/av/services/soundtrigger/SoundTriggerHwService.cpp
|
| 0832b2d7d190f4fbe6f134446b2610df0cccdbbb |
|
07-Jul-2014 |
Eric Laurent <elaurent@google.com> |
sound trigger: update HAL
New start_recognition() prototype with recognition
configuration structure.
New recognition event format.
Bug: 12378680.
Change-Id: I57b430eb076e6baa58118a0ed45ce4afaacb998c
/frameworks/av/services/soundtrigger/SoundTriggerHwService.cpp
|
| 1a1cba8f9a93db188b09d9754987354029129113 |
|
10-Jun-2014 |
Eric Laurent <elaurent@google.com> |
sound trigger: stop recognition on sound model unload
Force a stop recognition command to the HAL when
unloading a sound model and recognition is still active.
Change-Id: I7379a64a37bbc3eeea08e0e1d59e427de9544a10
/frameworks/av/services/soundtrigger/SoundTriggerHwService.cpp
|
| b7a11d83f749ad0200778c4815e907d011d4b5d3 |
|
19-Apr-2014 |
Eric Laurent <elaurent@google.com> |
add sound trigger native service
Change-Id: I0cd954c1c7d28a334e786d0004431d4f6a1227ec
/frameworks/av/services/soundtrigger/SoundTriggerHwService.cpp
|