Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54a505d4 authored by Ahaan Ugale's avatar Ahaan Ugale
Browse files

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
parent cc6f2a78

core/java/android/service/voice/VoiceInteractionServiceInfo.java

+1 −2
Original line number Diff line number Diff line
@@ -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;

services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java

+1 −2
Original line number Diff line number Diff line
@@ -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) {