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

Commit b67757ce authored by Sarup Dalwani's avatar Sarup Dalwani
Browse files

For web intents, checking if parent profile can resolve. 

If profile have android.os.UserManager#ALLOW_PARENT_PROFILE_APP_LINKING
set then parent profile should be allowed to resolve the intent even if
there is no matching CrossProfileIntentFilters.

Test: atest CtsDomainVerificationDeviceMultiUserTestCases
Bug: 253401810
Change-Id: Ia04218df1773443b8e0692e8b2b7e0a4d516849f
parent 7ff2217f

services/core/java/com/android/server/pm/CrossProfileIntentResolverEngine.java

+19 −3
Original line number Diff line number Diff line
@@ -89,8 +89,8 @@ public class CrossProfileIntentResolverEngine { 


    /**

     * Resolves intent in directly linked profiles and return list of {@link CrossProfileDomainInfo}

     * which contains {@link ResolveInfo}. This would also recursively call profiles not directly

     * linked.

     * which contains {@link ResolveInfo}. This would also iteratively call profiles not directly

     * linked using Breadth First Search.

     *

     * It first finds {@link CrossProfileIntentFilter} configured in current profile to find list of

     * target user profiles that can serve current intent request. It uses corresponding strategy
@@ -117,7 +117,23 @@ public class CrossProfileIntentResolverEngine { 
        List<CrossProfileIntentFilter> matchingFilters =

                computer.getMatchingCrossProfileIntentFilters(intent, resolvedType, userId);



        if (matchingFilters == null || matchingFilters.isEmpty()) return crossProfileDomainInfos;

        if (matchingFilters == null || matchingFilters.isEmpty()) {

            /** if intent is web intent, checking if parent profile should handle the intent even

            if there is no matching filter. The configuration is based on user profile

            restriction android.os.UserManager#ALLOW_PARENT_PROFILE_APP_LINKING **/

            if (intent.hasWebURI()) {

                UserInfo parent = computer.getProfileParent(userId);

                if (parent != null) {

                    CrossProfileDomainInfo generalizedCrossProfileDomainInfo = computer

                            .getCrossProfileDomainPreferredLpr(intent, resolvedType, flags, userId,

                                    parent.id);

                    if (generalizedCrossProfileDomainInfo != null) {

                        crossProfileDomainInfos.add(generalizedCrossProfileDomainInfo);

                    }

                }

            }

            return crossProfileDomainInfos;

        }



        UserManagerInternal umInternal = LocalServices.getService(UserManagerInternal.class);

        UserInfo sourceUserInfo = umInternal.getUserInfo(userId);