From c074f7ab85d990f111ce31f9b7ec324037ae25f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksandar=20Kirid=C5=BEi=C4=87?= <kiridza@google.com>
Date: Wed, 7 Dec 2022 15:10:53 +0000
Subject: [PATCH] Revert "speech: Update recognition-service resource"

This reverts commit 98f6ac3cd3a03f212d48bc499a57c4e047b45118.

Reason for revert: Changing the approach - instead of a resource attribute that can be set in a manifest, a public method returning the same value will be available to be overridden.

The method will be added in ag/20063753.

Change-Id: Ie4a7a633377b0b3c624743f48b9c637f788e9093
---
 core/api/current.txt                   | 1 -
 core/res/res/values/attrs.xml          | 3 ---
 core/res/res/values/public-staging.xml | 2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index 434b60dd144a7..92c32faec5e07 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -1042,7 +1042,6 @@ package android {
     field public static final int max = 16843062; // 0x1010136
     field public static final int maxAspectRatio = 16844128; // 0x1010560
     field public static final int maxButtonHeight = 16844029; // 0x10104fd
-    field public static final int maxConcurrentSessionsCount;
     field public static final int maxDate = 16843584; // 0x1010340
     field public static final int maxEms = 16843095; // 0x1010157
     field public static final int maxHeight = 16843040; // 0x1010120
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 79464937ff30e..2d832bc71684d 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -8955,9 +8955,6 @@
         <!-- Flag indicating whether a recognition service can be selected as default. The default
              value of this flag is true. -->
         <attr name="selectableAsDefault" format="boolean" />
-        <!-- The maximal number of recognition sessions ongoing at the same time.
-             The default value is 1, meaning no concurrency. -->
-        <attr name="maxConcurrentSessionsCount" format="integer" />
     </declare-styleable>
 
     <!-- Use <code>voice-interaction-service</code> as the root tag of the XML resource that
diff --git a/core/res/res/values/public-staging.xml b/core/res/res/values/public-staging.xml
index a9bec7a9fe288..90141e57ce8dd 100644
--- a/core/res/res/values/public-staging.xml
+++ b/core/res/res/values/public-staging.xml
@@ -117,7 +117,7 @@
     <public name="accessibilityDataPrivate" />
     <public name="enableTextStylingShortcuts" />
     <public name="requiredDisplayCategory"/>
-    <public name="maxConcurrentSessionsCount" />
+    <public name="removed_maxConcurrentSessionsCount" />
   </staging-public-group>
 
   <staging-public-group type="id" first-id="0x01cd0000">