From b0e707ee786e6e16efa70441cb7604f8d6f785ac Mon Sep 17 00:00:00 2001
From: Victoria Lestari <valestari@google.com>
Date: Wed, 3 Feb 2021 14:12:36 +0000
Subject: [PATCH] Show VoiceInput settings at all times

Change-Id: Ief3da88bd68d7bf6c41c6a01578e44e32aa63c82
Bug: 167599201
Tested: on device (https://screenshot.googleplex.com/5nbkXkXJuXrfEqQ, https://screenshot.googleplex.com/AueYfuExhG6pW2E)
---
 .../DefaultVoiceInputPreferenceController.java       | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
index 1f8b9d1a5cc..e53334d7d34 100644
--- a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
+++ b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
@@ -19,6 +19,7 @@ package com.android.settings.applications.assist;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.text.TextUtils;
 
@@ -45,9 +46,11 @@ public class DefaultVoiceInputPreferenceController extends DefaultAppPreferenceC
     private PreferenceScreen mScreen;
     private Preference mPreference;
     private SettingObserver mSettingObserver;
+    private Context mContext;
 
     public DefaultVoiceInputPreferenceController(Context context, Lifecycle lifecycle) {
         super(context);
+        mContext = context;
         mSettingObserver = new SettingObserver();
         mAssistUtils = new AssistUtils(context);
         mHelper = new VoiceInputHelper(context);
@@ -59,13 +62,8 @@ public class DefaultVoiceInputPreferenceController extends DefaultAppPreferenceC
 
     @Override
     public boolean isAvailable() {
-        // If current assist is also voice service, don't show voice preference.
-        final ComponentName currentVoiceService =
-                DefaultVoiceInputPicker.getCurrentService(mHelper);
-        final ComponentName currentAssist =
-                mAssistUtils.getAssistComponentForUser(mUserId);
-        return !DefaultVoiceInputPicker.isCurrentAssistVoiceService(
-                currentAssist, currentVoiceService);
+        return mContext.getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_VOICE_RECOGNIZERS);
     }
 
     @Override