| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Currently, force stopping a 3p assistant app resets it to the default a
ssistant. This is not a desirable user experience. This seems to be
accidental, some history that I was able to dig up:
* b/20882522 - "clearing data in assistant causes it to die and not
respond to queries" - this will happen today anyway, because the
in-app setting for it gets turned off
* the fix for the above ended up resetting the assistant setting when
the assistant is force stopped (as a proxy for data cleared)
* this caused b/121104681 - force stopping assistant resets the default
assistant setting
* also b/124450140 - clearing assistant resets default to none
* the fixes for these included clearing the assistant role profile,
which ends up setting it to the "fallback" app (set in roles.xml).
This fix removes any role and setting clearing / resetting when force
stopping or clearing the active assistant app. It keeps the part that
ensures the service is restarted, i.e. the original bug is still fixed,
i.e. assistant responds to queries after being force stopped (but not
cleared, which has never worked anyway).
Fixes: 191743558
Test: atest CtsVoiceInteractionTestCases
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ba9625e664c76943448ce5b7d97e3b381e71710d)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:402a71810da63067535e8f9b1f6d837e85bde514)
Merged-In: I180e699bd8d3fb5ea6aa4807f435060999436416
Change-Id: I180e699bd8d3fb5ea6aa4807f435060999436416
|
| |\
| |
| |
| |
| |
| |
| | |
https://android.googlesource.com/platform/frameworks/base into t13.0
Android 13.0.0 Release 52 (TQ3A.230605.012)
Change-Id: Ic80f318636f1f70bbd009504352ddde511d0dead
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The VoiceInteraction UI latency is limited to measuring the
SoundTrigger HAL invocation latency. This change cancels the latency
measurment when the VoiceInteraction UI is shown due to a invocation
outside of VoiceInteractionService#showSession.
Bug: 265850090
Test: manual invocation of system UI and gesture to confirm latency is
canceled
Change-Id: Ib1c9464217e8a66fbd96d2192b13cf13713362e9
Merged-In: Ib1c9464217e8a66fbd96d2192b13cf13713362e9
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
Bug: 244387931
Test: use CTS hotword service to crash itself and check
statsd_testdrive.
Change-Id: Icbd10c73df268bc7ff38c986551e30e61aa95177
Merged-in: Ia6a3027eb2dc6f45d77c3025f30c43f1d93a3a2c
|
| |\|
| |
| |
| |
| |
| |
| |
| | |
https://android.googlesource.com/platform/frameworks/base into t13.0
Android 13.0.0 release 35
Change-Id: I709958b2f015d1774b2ece25894467c3a279f93c
|
| | |\
| | |
| | |
| | |
| | |
| | | |
* changes:
Include initialAudio size in metrics and logs
Add initialAudio field to HotwordAudioStream
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Bug: 262433819
Test: `statsd_testdrive 578` with sample app. Verified sizes in metrics
and in the logs.
Change-Id: I4f2258648fa681a2763c41e05bacbb83430f6c09
Merged-In: I4f2258648fa681a2763c41e05bacbb83430f6c09
|
| | |\ \
| | |/
| |/| |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Each read to the read end of the HotwordAudioStream pipe provided by the
HotwordDetectionService is now performed with 32KB size. This request
will return early with whatever bytes are available to be read.
The reason for increasing the default buffer size is to improve the
throughput latency of data egressed from the HotwordDetectionService.
Bug: 262433815
Test: Manual testing with test app
Change-Id: I922bd28e6018bd5abb1c8b5e5e79f500c0b4c093
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The stream and metadata sizes are summed across all HotwordAudioStreams
in the HotwordDetectedResult. Also logged the same byte sizes.
Bug: 261793715
Bug: 244599440
Test: `statsd_testdrive 578` with sample app. The sizes in the metrics
are the same as the ones logged, and the values are in line with what
the sample app is sending in the HotwordDetectedResult.
Change-Id: I48279bba854e3e6badc530fa485bb46c2097ce44
Merged-In: I48279bba854e3e6badc530fa485bb46c2097ce44
|
| | |/
| |
| |
| |
| |
| |
| | |
Bug: 261793715
Test: stasd_drive
Change-Id: I3baf29a547ee69bee7cae4ca7432c489b0bcb700
Merged-In: I3baf29a547ee69bee7cae4ca7432c489b0bcb700
|
| | |\ |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We add new uid filed in HotwordDetectionServiceInitResultReported,
HotwordDetectionServiceRestarted and
HotwordDetectorKeyphraseTriggered. Update the metrics to log it.
Test: statsd_testdrive
Bug: 261793715
Change-Id: Ia49d5981be296c1143074774cc6c00fcc25671e6
Merged-In: Ia49d5981be296c1143074774cc6c00fcc25671e6
|
| | |\ \ |
|
| | | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
There are chances that SysUI does not get the
onVoiceSessionWindowVisibilityChanged(false) callback if the
voice interaction window was visible then the connection is closed.
This could cause issue for TaskBar since TaskBar relies on the callback
to clear its intermediate state.
Video: http://recall/-/b1EZhgUkQcpML5OwZekLBN/giEfwSaYA9saSOfGQwCAus
Bug: 254070601
Test: follow the reproduce steps in bug, see also video
Change-Id: I0222eea38179620c36253f47f332536ffb9e434c
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Bug: 249269473
Test: statsd_testdrive 434
Change-Id: Ia84489dcef1cc96f8fc61a44ccac34d433658bc9
Merged-In: Ia84489dcef1cc96f8fc61a44ccac34d433658bc9
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
"Manager" is a little vague and "Copier" is clearer with the class's
purpose.
Bug: 258323047
Test: None with this change; simple refactoring
Change-Id: I43a24b27983838e0ef9798eef2f45d1d4b1c9ac8
Merged-In: I43a24b27983838e0ef9798eef2f45d1d4b1c9ac8
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
android.media.permission.Identity is not needed for AppOpsManager calls
and is an unnecessary coupling.
Bug: 258323047
Test: None with this change; pure refactoring
Change-Id: I1c70f95a73e36c2793e87116b426d55ce359b74b
Merged-In: I1c70f95a73e36c2793e87116b426d55ce359b74b
|
| | |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
A HotwordDetectionService can specify a buffer length for each
HotwordAudioStream in the HotwordDetectedResult by adding an int in the
HotwordAudioStream's metadata PersistableBundle, with the key
HotwordAudioStream.KEY_AUDIO_STREAM_COPY_BUFFER_LENGTH_BYTES.
If the value is not specified or is an invalid value, the default buffer
length is 2,560 bytes.
Bug: 257509629
Test: Manually with test app, verified with logs
Test: atest CtsVoiceInteractionTestCases
Change-Id: I28c7f21bdf7c00b62c9cc6c29153d79ce9d85286
Merged-In: I28c7f21bdf7c00b62c9cc6c29153d79ce9d85286
|
| | |\ |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It doesn't pass the right value into trusted hotword
metrics when creating trusted hotword detector.
Test: Build pass
Bug: 259212509
Change-Id: I5ab23ccc88c0c1221a2b2843f90f787346df41b7
(cherry picked from commit 550ff9e292203b3406ea47f8fad3cdd99cccf031)
Merged-In: I5ab23ccc88c0c1221a2b2843f90f787346df41b7
|
| | |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The original proximity feature which returned the distance in meters was
determined to be too privacy-invasive. AttentionManagerService continue
to receive proximity in distance from Attention Service, but
HotwordDetectedResult will map it
to different proximity levels, near and far. These proximity levels will be used in HotwordDetectionConnection. Use a RequiredServiceRule to make sure we only run the test if the device has the attention service
Bug: 253326426
Test: atest CtsVoiceInteractionTestCases
Change-Id: I4d55564c39d48dd1869d747beb37f81170c102f6
Merged-In: I4d55564c39d48dd1869d747beb37f81170c102f6
|
| | |
| |
| |
| |
| |
| | |
Bug: 244595867
Test: None; minor constant change
Change-Id: I2f0fc99c78bdf00f512e61fc4419b882286f445f
|
| | |
| |
| |
| |
| |
| |
| | |
Bug: 244595867
Test: TODO - Manual E2E test for now, CTS tests later
Change-Id: I02050cc39146e93e9dca1f3db6e0b5b894e85dd6
Merged-In: I02050cc39146e93e9dca1f3db6e0b5b894e85dd6
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
invoked.
By the original design, we register the activity event in the
ActivityManagerService. After getting the activity event, we will
query current visible activities and report them to Assistant.
Assistant will start to get direct actions of those visible
activities. But sometimes they can not get the direct actions
due to the stage of activity lifecycle before onStart().
We change the logic to make sure that the stage of visible
activity that we reported to the Assistant is after onStart().
Bug: 235296082
Test: atest VoiceInteractionSessionVisibleActivityTest
Test: atest android.app.activity.ActivityThreadClientTest
Test: atest android.view.DisplayTest
Test: atest android.window.ConfigurationHelperTest
Test: atest android.window.SizeConfigurationBucketsTest
Change-Id: Ie439ff3706dab35e875c1eb995a67fa73aec4d76
(cherry picked from commit 29bb3a3428fcd272f8ec236f14354b9ec6c28f3e)
Merged-In: Ie439ff3706dab35e875c1eb995a67fa73aec4d76
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Because it is not clear to understand what these two methods do,
we rename them.
(1)updateVisibleActivitiesLocked()
(2)updateVisibleActivitiesChangedLocked
Bug: 235296082
Test: atest VoiceInteractionSessionVisibleActivityTest
Change-Id: Id7db3a0dc9c2a17276ae213223fa3dd6ae572b9f
(cherry picked from commit 0d7aa31d356af92ec4e69fb19c976b731ff09b5c)
Merged-In: Id7db3a0dc9c2a17276ae213223fa3dd6ae572b9f
|
| | |\ |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Previously, when onRoleHoldersChanged() was called in a pre-created
user, VoiceInteractionManagerService (A.K.A. VIMS) would store that
user id and call the method again when the pre-converted user is
converted to a real user (on onPreCreatedUserConversion()), as the
assistant role holders is not available for pre-created users.
But if the system restarts between the user pre-creation and
conversion, onPreCreatedUserConversion() would log a warning and
do nothing.
So, this CL gets rids of the "save the user id" part, and simply
re-call onRoleHoldersChanged() whenever a pre-created user is
converted.
Test: manual verification on automotive builds
Fixes: 242254421
Merged-In: Id933b2bc4f887da8b2f4959955bd174ed5879a47
Change-Id: Id933b2bc4f887da8b2f4959955bd174ed5879a47
(cherry picked from commit 63da68c1913ddb702af50cb8b5f0f65a1daa6ded)
|
| |/ /
| |
| | |
Change-Id: Ic6cfbb8e5f60b69401fc69ca44e2d879b506003d
|
| |\ \ |
|
| | |/
| |
| |
| |
| |
| |
| |
| |
| | |
Introducing a flag to gate the Attention Service usage by Hotword
Detection Service. The Attention Service will be disabled by default.
Bug: 247890608
Test: atest CtsVoiceInteractionTestCases
Change-Id: Ic8a6a11b2a0843a96f135b360f10f7fef5fce274
|
| |/
|
|
|
|
|
|
|
|
|
|
| |
Log the UI latency with UIActionLatencyReported atom. We plan to
calulate the latency from when the SoundTrigger HAL emits an event to
when the VoiceInteraction system UI view is shown.
Test: device_config put latency_tracker enabled true; verify traces
and latency is logged in WW.
Bug: 247879896
Change-Id: I3edb91691e81f8f23660c0823a6388338fe926ad
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Revert submission 19600381-revert-17936037-hotword_proximity-ZZIDPDULZP
Test: atest CtsVoiceInteractionTestCases, atest CtsVoiceInteractionTestCases:android.voiceinteraction.cts.AlwaysOnHotwordDetectorTest#testAlwaysOnHotwordDetector_startRecognitionWithData -- --abi x86_64
Reason for revert: Including the fix for broken tests
Reverted Changes:
Ibfc659015:Revert "Refactor ProximityUpdateCallbackInternal t...
I1a03c21d5:Revert "Verify that proximity key is added to the ...
I6b79d9400:Revert "Add proximity state to the HotwordDetected...
Change-Id: Iee6ab086ccc3f27b95ee601d6be11231f300170c
Merged-In: Iee6ab086ccc3f27b95ee601d6be11231f300170c
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Reverting the previous revert commit which was merged to resolve the
broken tests. Adding a fix to the broken tests by surrounding
mAttentionManagerInternal with null checks.
dbe5ad1a72efea402f35e2e3e938f0c16e1473bc
Test: atest CtsVoiceInteractionTestCases, atest CtsVoiceInteractionTestCases:android.voiceinteraction.cts.AlwaysOnHotwordDetectorTest#testAlwaysOnHotwordDetector_startRecognitionWithData -- --abi x86_64
Change-Id: Ife5fb9220518a32a89494217f56932f290cce5f3
Merged-In: Ife5fb9220518a32a89494217f56932f290cce5f3
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
RoleService should not be calling onRoleHoldersChanged() on
pre-created users, but that behavior cannot be changed because its
implemented by a system app, and pre-created users APIs are hidden.
To test it:
$ adb shell pm create-user --pre-create-only --guest
Success: created user id 12
$ adb shell pm create-user --guest ElGuesto
Success: created user id 12
$ adb shell cmd user list --all -v
4 users:
0: id=0, name=Driver, type=system.HEADLESS, flags=ADMIN|INITIALIZED|PRIMARY|SYSTEM (running)
1: id=10, name=Driver, type=full.SECONDARY, flags=ADMIN|FULL|INITIALIZED (running) (current)
2: id=11, name=null, type=full.SECONDARY, flags=FULL|INITIALIZED (pre-created)
3: id=12, name=ElGuesto, type=full.GUEST, flags=EPHEMERAL|FULL|GUEST|INITIALIZED (converted)
$ adb shell am switch-user 12
$ adb shell dumpsys voiceinteraction |egrep '(mBound|implementation)'
mBound=true mService=android.service.voice.IVoiceInteractionService$Stub$Proxy@77da1bc
$ adb shell cmd voiceinteraction show
Test: see bove
Bug: 216141085
Bug: 226201975
Merged-In: I12d9bb32e144ecf91ee4b452affea0dcea546127
Change-Id: I12d9bb32e144ecf91ee4b452affea0dcea546127
(cherry picked from commit 39acca1d72df6b07bc57806e74f5f0ecfb65ccb1)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We add more metrics for software detection and
external source detection.
Android Metrics Design Review : eldar/276723226
Verify the metrics logs manually as below:
Step 1: m statsd_testdrive
Step 2: statsd_testdrive 434
Step 3: run the test
Step 4: We can see the log as below after 1 minutes from Step 2.
hotword_detector_events {
event: EXTERNAL_SOURCE_DETECTED
}
hotword_detector_events {
event: ON_DISCONNECTED
}
hotword_detector_events {
event: START_EXTERNAL_SOURCE_DETECTION
}
Bug: 207717787
Bug: 233704035
Test: build pass
Test: manual. The logs are expected after following test steps
Change-Id: Ib268902d63c580cec9cbd65a3816fd5ba003eaff
(cherry picked from commit 37f8b3ec2b8a11fd07832e024da187d6b0f5fd35)
|
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
tm-dev am: 7a1dd2e61c am: ac7d47c9a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18674418
Change-Id: Iabddbfdd1e73f4657a41e6bc6a8575f6e90ad044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
| | |\ |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
this also fixes an NPE b/234828308
Bug: 226167520
Test: atest android.voiceinteraction.cts
Change-Id: Ibe20fb4da91fa80f8539bb19c90515167bf6e85b
Merged-In: Ibe20fb4da91fa80f8539bb19c90515167bf6e85b
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
0d84708056 am: cf05c79ea0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18628126
Change-Id: Ibbfcc51b996298ce0880e4a95dbbb042aedeb75d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
| | |\ \
| | |/
| |/| |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
By the original design, we register the activity event in the
ActivityManagerService. After getting the activity event, we will
query current visible activities and report them to Assistant.
Assistant will start to get direct actions of those visible
activities. But sometimes they can not get the direct actions
due to the stage of activity lifecycle before onStart().
We will postpone the request direct actions a few times
before onStart().
Bug: 224789902
Test: atest CtsVoiceInteractionTestCases
Change-Id: If7cd52c5ba749523e575c0be5595e8f20704c4f2
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
tm-dev am: 90579f32b3 am: 5ec4c563ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18308197
Change-Id: Ic3ec74aaaa851b3860e7bddcab1decc9a9db34e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Bug: 230658902
Test: atest --no-bazel-mode CtsVoiceInteractionTestCases:HotwordDetectionServiceBasicTest
Change-Id: Ic845f06c2e3943f4968067dd23a0520aecce3973
|
| |\| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
am: b92b97dd6d am: 22b5b92afc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17730109
Change-Id: Iea6c6ceebc9f4c1aa9def20d98d611909cabb182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
There are three event in which a client app is started:
1. When Assistant starts Voice Activity (startVoiceActivity)
2. When Assistant requests for a Direct Actions (requestDirectActions)
3. When the app starts invoice interation session
(startLocalVoiceInteraction)
Change-Id: I261ccc1a7136a601b5c8c8b766dc03a024cfe93d
Test: atest android.voiceinteraction.cts
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
tm-dev am: 9f4fb486d8 am: dc2a680bea
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18400689
Change-Id: Ic5ba9900635284f1dadf59aded5bc01c4d5b25f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
| | |/
| |
| |
| |
| |
| | |
Bug: 233011234
Test: atest HotwordDetectionServiceBasicTest
Change-Id: Ie2e426cb6f6168a2a704dd934d949047436e7826
|
| |\|
| |
| |
| |
| |
| |
| |
| |
| | |
into tm-dev am: d5cd970e0c am: 16d458b618
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18179574
Change-Id: Ic514a20d9c5a948110e3af82757efd21d92f3ea1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|