From e6c1a120b8f26e3d2f9e30f65f8f92d497119256 Mon Sep 17 00:00:00 2001
From: Sergey Volnov <volnov@google.com>
Date: Tue, 23 Feb 2021 22:02:27 +0000
Subject: [PATCH] Always start speech recognition service.

Since we've decided to direct all traffic through system server, it now
needs to be started all the time.

Test: atest
Bug: 180951739
Change-Id: I9f1639d13d5d2c00f8cd2a6dae2abe8c44e6c31b
---
 services/java/com/android/server/SystemServer.java | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 2b09d12c97c76..cc0534756ea89 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1715,14 +1715,9 @@ public final class SystemServer implements Dumpable {
             startSystemCaptionsManagerService(context, t);
 
             // System Speech Recognition Service
-            if (deviceHasConfigString(context,
-                    R.string.config_defaultOnDeviceSpeechRecognitionService)) {
-                t.traceBegin("StartSpeechRecognitionManagerService");
-                mSystemServiceManager.startService(SPEECH_RECOGNITION_MANAGER_SERVICE_CLASS);
-                t.traceEnd();
-            } else {
-                Slog.d(TAG, "System speech recognition is not defined by OEM");
-            }
+            t.traceBegin("StartSpeechRecognitionManagerService");
+            mSystemServiceManager.startService(SPEECH_RECOGNITION_MANAGER_SERVICE_CLASS);
+            t.traceEnd();
 
             // App prediction manager service
             if (deviceHasConfigString(context, R.string.config_defaultAppPredictionService)) {