From 5fbbdb79694d55940f1ecb500750d9f55ed94ffc Mon Sep 17 00:00:00 2001
From: Joanne Chung <joannechung@google.com>
Date: Mon, 18 Oct 2021 15:45:58 +0800
Subject: [PATCH] Update javadoc for recognitionService attr.

We fix the issue that if the app with VoiceInteractionService but no
RecognitionService it will crash SystemServer. This change updates
the javadoc for recognitionService attr.

Bug: 195453424
Test: n/a. Only update javadoc.
Change-Id: Ib0817df73b7c84417e41fcc9fe000ce1d506cf2f
---
 core/res/res/values/attrs.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index ab39152fc10f5..5cd5c2604e28f 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -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