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

Commit 24705070 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [8673593, 8673409, 8673796, 8673797, 8673798, 8673855,... 

Merge cherrypicks of [8673593, 8673409, 8673796, 8673797, 8673798, 8673855, 8673151, 8673594, 8673499, 8673799, 8673895, 8673896] into qt-release

Change-Id: Ifabd921ababb715958d57a2fd841c826fb962065
parents e6f518c0 00e0a7be

src/com/android/packageinstaller/role/model/AssistantRoleBehavior.java

+34 −30
Original line number Diff line number Diff line
@@ -61,8 +61,7 @@ public class AssistantRoleBehavior implements RoleBehavior { 
    @Override

    public boolean isAvailableAsUser(@NonNull Role role, @NonNull UserHandle user,

            @NonNull Context context) {

        return !UserUtils.isWorkProfile(user, context)

                && !context.getSystemService(ActivityManager.class).isLowRamDevice();

        return !UserUtils.isWorkProfile(user, context);

    }



    @Nullable
@@ -97,13 +96,15 @@ public class AssistantRoleBehavior implements RoleBehavior { 
    public List<String> getQualifyingPackagesAsUser(@NonNull Role role, @NonNull UserHandle user,

            @NonNull Context context) {

        Context userContext = UserUtils.getUserContext(context, user);

        ActivityManager userActivityManager = userContext.getSystemService(ActivityManager.class);

        PackageManager userPackageManager = userContext.getPackageManager();

        Set<String> availableAssistants = new ArraySet<>();



        List<ResolveInfo> services = userPackageManager.queryIntentServices(ASSIST_SERVICE_PROBE,

                PackageManager.GET_META_DATA | PackageManager.MATCH_DIRECT_BOOT_AWARE

        if (!userActivityManager.isLowRamDevice()) {

            List<ResolveInfo> services = userPackageManager.queryIntentServices(

                    ASSIST_SERVICE_PROBE, PackageManager.GET_META_DATA

                            | PackageManager.MATCH_DIRECT_BOOT_AWARE

                            | PackageManager.MATCH_DIRECT_BOOT_UNAWARE);



            int numServices = services.size();

            for (int i = 0; i < numServices; i++) {

                ResolveInfo service = services.get(i);
@@ -112,12 +113,12 @@ public class AssistantRoleBehavior implements RoleBehavior { 
                    availableAssistants.add(service.serviceInfo.packageName);

                }

            }

        }



        List<ResolveInfo> activities = userPackageManager.queryIntentActivities(

                ASSIST_ACTIVITY_PROBE, PackageManager.MATCH_DEFAULT_ONLY

                        | PackageManager.MATCH_DIRECT_BOOT_AWARE

                        | PackageManager.MATCH_DIRECT_BOOT_UNAWARE);



        int numActivities = activities.size();

        for (int i = 0; i < numActivities; i++) {

            availableAssistants.add(activities.get(i).activityInfo.packageName);
@@ -130,31 +131,34 @@ public class AssistantRoleBehavior implements RoleBehavior { 
    @Override

    public Boolean isPackageQualified(@NonNull Role role, @NonNull String packageName,

            @NonNull Context context) {

        PackageManager pm = context.getPackageManager();

        ActivityManager activityManager = context.getSystemService(ActivityManager.class);

        PackageManager packageManager = context.getPackageManager();



        boolean hasAssistantService = false;

        if (!activityManager.isLowRamDevice()) {

            Intent pkgServiceProbe = new Intent(ASSIST_SERVICE_PROBE).setPackage(packageName);

        List<ResolveInfo> services = pm.queryIntentServices(pkgServiceProbe,

            List<ResolveInfo> services = packageManager.queryIntentServices(pkgServiceProbe,

                    PackageManager.GET_META_DATA | PackageManager.MATCH_DIRECT_BOOT_AWARE

                            | PackageManager.MATCH_DIRECT_BOOT_UNAWARE);



            hasAssistantService = !services.isEmpty();

            int numServices = services.size();

            for (int i = 0; i < numServices; i++) {

                ResolveInfo service = services.get(i);



            if (isAssistantVoiceInteractionService(pm, service.serviceInfo)) {

                if (isAssistantVoiceInteractionService(packageManager, service.serviceInfo)) {

                    return true;

                }

            }

        }



        Intent pkgActivityProbe = new Intent(ASSIST_ACTIVITY_PROBE).setPackage(packageName);

        boolean hasAssistantActivity = !pm.queryIntentActivities(pkgActivityProbe,

        boolean hasAssistantActivity = !packageManager.queryIntentActivities(pkgActivityProbe,

                PackageManager.MATCH_DEFAULT_ONLY | PackageManager.MATCH_DIRECT_BOOT_AWARE

                        | PackageManager.MATCH_DIRECT_BOOT_UNAWARE).isEmpty();



        if (!hasAssistantActivity) {

            Log.w(LOG_TAG, "Package " + packageName + " not qualified for " + role.getName()

                    + " due to " + (services.isEmpty() ? "missing service"

                    : "service without qualifying metadata") + " and missing activity");

                    + " due to " + (hasAssistantService ? "unqualified" : "missing")

                    + " service and missing activity");

        }



        return hasAssistantActivity;