Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee6cdca0 authored by Joanne Chung's avatar Joanne Chung Committed by Automerger Merge Worker
Browse files

Merge "Update javadoc for recognitionService attr." into sc-v2-dev am: 7656c0f3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16100131

Change-Id: I0b02363f98eb3f699df5d20b7e622e5e942b2326
parents 76fa9af4 7656c0f3

core/res/res/values/attrs.xml

+8 −3
Original line number Diff line number Diff line
@@ -8717,9 +8717,14 @@ 
    <declare-styleable name="VoiceInteractionService">

        <!-- The service that hosts active voice interaction sessions.  This is required. -->

        <attr name="sessionService" format="string" />

        <!-- The service that provides voice recognition.  This is required.  When the user

             selects this voice interaction service, they will also be implicitly selecting

             the component here for their recognition service. -->

        <!-- The service that provides voice recognition. This is required. On Android 11 and

             earlier, this must be a valid RecognitionService.

             <p>

             From Android 12 onward, this attribute does nothing. However, we still require it to

             be set to something to reduce the risk that an app with an unspecified value gets

             pushed to older platform versions, where it will cause a boot loop. To make sure

             developers don't miss it, the system will reset the current assistant if this isn't

             specified.-->

        <attr name="recognitionService" format="string" />

        <attr name="settingsActivity" />

        <!-- Flag indicating whether this voice interaction service is capable of handling the