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

Commit ba37dbb3 authored by Ahaan Ugale's avatar Ahaan Ugale
Browse files

VIMS cleanup: set package on pm query instead of filtering results. 

Bug: 178410946
Test: atest CtsVoiceInteractionTestCases
Change-Id: I8ab1824aba534857e2978861d001a74837de281d
parent 54a505d4

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

+12 −14
Original line number Diff line number Diff line
@@ -583,7 +583,8 @@ public class VoiceInteractionManagerService extends SystemService { 
        VoiceInteractionServiceInfo findAvailInteractor(int userHandle, String packageName) {

            List<ResolveInfo> available =

                    mContext.getPackageManager().queryIntentServicesAsUser(

                            new Intent(VoiceInteractionService.SERVICE_INTERFACE),

                            new Intent(VoiceInteractionService.SERVICE_INTERFACE)

                                    .setPackage(packageName),

                            PackageManager.MATCH_DIRECT_BOOT_AWARE

                                    | PackageManager.MATCH_DIRECT_BOOT_UNAWARE, userHandle);

            int numAvailable = available.size();
@@ -603,8 +604,6 @@ public class VoiceInteractionManagerService extends SystemService { 
                            VoiceInteractionServiceInfo info = new VoiceInteractionServiceInfo(

                                    mContext.getPackageManager(), comp, userHandle);

                            if (info.getParseError() == null) {

                                if (packageName == null || info.getServiceInfo().packageName.equals(

                                        packageName)) {

                                if (foundInfo == null) {

                                    foundInfo = info;

                                } else {
@@ -616,7 +615,6 @@ public class VoiceInteractionManagerService extends SystemService { 
                                            + " over "

                                            + new ComponentName(cur.packageName, cur.name));

                                }

                                }

                            } else {

                                Slog.w(TAG, "Bad interaction service " + comp + ": "

                                        + info.getParseError());