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

Commit 2300b890 authored by Hai Zhang's avatar Hai Zhang
Browse files

Fix assistant role availability on low ram devices. 

The assistant role should be available on low ram devices, just that
only assistant activities but not assistant services can be qualified.

Fixes: 137388024
Test: presubmit & manual
Change-Id: Ie84fd163fb49c0514f51ba64ba89c225dceb2e5b
parent e508f003

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

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

    @Override

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

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

            @NonNull Context context) {

            @NonNull Context context) {

        return !UserUtils.isWorkProfile(user, context)

        return !UserUtils.isWorkProfile(user, context);

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

    }

    }





    @Nullable

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

    public List<String> getQualifyingPackagesAsUser(@NonNull Role role, @NonNull UserHandle user,

            @NonNull Context context) {

            @NonNull Context context) {

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

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

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

        PackageManager userPackageManager = userContext.getPackageManager();

        PackageManager userPackageManager = userContext.getPackageManager();

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

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





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

        if (!userActivityManager.isLowRamDevice()) {

                PackageManager.GET_META_DATA | PackageManager.MATCH_DIRECT_BOOT_AWARE

            List<ResolveInfo> services = userPackageManager.queryIntentServices(

                    ASSIST_SERVICE_PROBE, PackageManager.GET_META_DATA

                            | PackageManager.MATCH_DIRECT_BOOT_AWARE

                            | PackageManager.MATCH_DIRECT_BOOT_UNAWARE);

                            | PackageManager.MATCH_DIRECT_BOOT_UNAWARE);



            int numServices = services.size();

            int numServices = services.size();

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

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

                ResolveInfo service = services.get(i);

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

                    availableAssistants.add(service.serviceInfo.packageName);

                }

                }

            }

            }

        }





        List<ResolveInfo> activities = userPackageManager.queryIntentActivities(

        List<ResolveInfo> activities = userPackageManager.queryIntentActivities(

                ASSIST_ACTIVITY_PROBE, PackageManager.MATCH_DEFAULT_ONLY

                ASSIST_ACTIVITY_PROBE, PackageManager.MATCH_DEFAULT_ONLY

                        | PackageManager.MATCH_DIRECT_BOOT_AWARE

                        | PackageManager.MATCH_DIRECT_BOOT_AWARE

                        | PackageManager.MATCH_DIRECT_BOOT_UNAWARE);

                        | PackageManager.MATCH_DIRECT_BOOT_UNAWARE);



        int numActivities = activities.size();

        int numActivities = activities.size();

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

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

            availableAssistants.add(activities.get(i).activityInfo.packageName);

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

    @Override

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

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

            @NonNull Context context) {

            @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);

            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.GET_META_DATA | PackageManager.MATCH_DIRECT_BOOT_AWARE

                            | PackageManager.MATCH_DIRECT_BOOT_UNAWARE);

                            | PackageManager.MATCH_DIRECT_BOOT_UNAWARE);



            hasAssistantService = !services.isEmpty();

            int numServices = services.size();

            int numServices = services.size();

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

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

                ResolveInfo service = services.get(i);

                ResolveInfo service = services.get(i);





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

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

                    return true;

                    return true;

                }

                }

            }

            }

        }





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

        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_DEFAULT_ONLY | PackageManager.MATCH_DIRECT_BOOT_AWARE

                        | PackageManager.MATCH_DIRECT_BOOT_UNAWARE).isEmpty();

                        | PackageManager.MATCH_DIRECT_BOOT_UNAWARE).isEmpty();



        if (!hasAssistantActivity) {

        if (!hasAssistantActivity) {

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

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

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

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

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

                    + " service and missing activity");

        }

        }





        return hasAssistantActivity;

        return hasAssistantActivity;