From 51ce8413d36df3b178d3bea525940d8e8b71902a Mon Sep 17 00:00:00 2001
From: Daniel Norman <danielnorman@google.com>
Date: Wed, 15 Feb 2023 13:38:44 -0800
Subject: [PATCH] Fixes assistant shortcut by adding VOICE_COMMAND <queries> to
 manifest.

Test: Use assistant shortcut, observe assistant opens
Change-Id: I448f74b7cb074c666ff49c3fd6af4b785384d25c
---
 .../accessibility/accessibilitymenu/AndroidManifest.xml       | 3 +++
 .../accessibilitymenu/AccessibilityMenuService.java           | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/accessibility/accessibilitymenu/AndroidManifest.xml b/packages/SystemUI/accessibility/accessibilitymenu/AndroidManifest.xml
index 82ddf38bb1bfa..ca8426560cccc 100644
--- a/packages/SystemUI/accessibility/accessibilitymenu/AndroidManifest.xml
+++ b/packages/SystemUI/accessibility/accessibilitymenu/AndroidManifest.xml
@@ -55,5 +55,8 @@
             <category android:name="android.intent.category.BROWSABLE" />
             <data android:scheme="https" />
         </intent>
+        <intent>
+            <action android:name="android.intent.action.VOICE_COMMAND" />
+        </intent>
     </queries>
 </manifest>
\ No newline at end of file
diff --git a/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/AccessibilityMenuService.java b/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/AccessibilityMenuService.java
index ff7373676c0e6..40af294f9a6f0 100644
--- a/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/AccessibilityMenuService.java
+++ b/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/AccessibilityMenuService.java
@@ -297,8 +297,8 @@ public class AccessibilityMenuService extends AccessibilityService
 
     private void startActivityIfIntentIsSafe(Intent intent, int flag) {
         PackageManager packageManager = getPackageManager();
-        List<ResolveInfo> activities =
-                packageManager.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
+        List<ResolveInfo> activities = packageManager.queryIntentActivities(intent,
+                PackageManager.ResolveInfoFlags.of(PackageManager.MATCH_DEFAULT_ONLY));
         if (!activities.isEmpty()) {
             intent.setFlags(flag);
             startActivity(intent);