From 54a505d46f02f12f0cb3e49bc5bfb976b1efd6f8 Mon Sep 17 00:00:00 2001 From: Ahaan Ugale Date: Sun, 17 Jan 2021 17:18:17 -0800 Subject: [PATCH] VoiceInteraction: Remove MATCH_DEBUG_TRIAGED_MISSING from PM queries. MATCH_DEBUG_TRIAGED_MISSING is the deprecated equivalent to MATCH_DIRECT_BOOT_AUTO. Not needed since we use MATCH_DIRECT_BOOT_AWARE and MATCH_DIRECT_BOOT_UNAWARE (see comments on ag/1101955). Bug: 178410946 Test: atest CtsVoiceInteractionTestCases Change-Id: I2093b163bb18e43c4f868715d60bc4b637fced6c --- .../android/service/voice/VoiceInteractionServiceInfo.java | 3 +-- .../voiceinteraction/VoiceInteractionManagerService.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/core/java/android/service/voice/VoiceInteractionServiceInfo.java b/core/java/android/service/voice/VoiceInteractionServiceInfo.java index 7203f2d86f5f0..f7710e6a82ce8 100644 --- a/core/java/android/service/voice/VoiceInteractionServiceInfo.java +++ b/core/java/android/service/voice/VoiceInteractionServiceInfo.java @@ -69,8 +69,7 @@ public class VoiceInteractionServiceInfo { ServiceInfo si = AppGlobals.getPackageManager().getServiceInfo(comp, PackageManager.GET_META_DATA | PackageManager.MATCH_DIRECT_BOOT_AWARE - | PackageManager.MATCH_DIRECT_BOOT_UNAWARE - | PackageManager.MATCH_DEBUG_TRIAGED_MISSING, + | PackageManager.MATCH_DIRECT_BOOT_UNAWARE, userHandle); if (si != null) { return si; diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java index 7026de7a8462b..81d511f42415a 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java @@ -585,8 +585,7 @@ public class VoiceInteractionManagerService extends SystemService { mContext.getPackageManager().queryIntentServicesAsUser( new Intent(VoiceInteractionService.SERVICE_INTERFACE), PackageManager.MATCH_DIRECT_BOOT_AWARE - | PackageManager.MATCH_DIRECT_BOOT_UNAWARE - | PackageManager.MATCH_DEBUG_TRIAGED_MISSING, userHandle); + | PackageManager.MATCH_DIRECT_BOOT_UNAWARE, userHandle); int numAvailable = available.size(); if (numAvailable == 0) {