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

Commit 0fe10282 authored by himanshuz's avatar himanshuz Committed by Himanshu Gupta
Browse files

Fixing custom content provider URIs for cloned user. 

When a custom content URI beloning to cloned application
is accessed by an app in its parent, such URIs should be
fixed to reflect corrected URI grants.
Sharesheet does the same in https://source.corp.google.com/android-internal/packages/modules/IntentResolver/java/src/com/android/intentresolver/chooser/TargetInfo.java;bpv=1;bpt=1;rcl=eeae447b7baf32568765801cb304d72dadfcd739;l=451
and WorkProfile does it in https://source.corp.google.com/android-internal/frameworks/base/core/java/com/android/internal/app/IntentForwarderActivity.java;l=159?q=IntentForwarderActivity

Test: Manually by installing cloned apps with custom content.
Bug: 267279015
Change-Id: I31f26c7da2b62f6c0587e5e85b5471c6a9f6d4a4
parent e9fcda5b

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

+12 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.content.pm.ResolveInfo; 
import android.content.pm.UserInfo;

import android.content.pm.UserProperties;

import android.os.Process;

import android.os.UserHandle;

import android.text.TextUtils;

import android.util.Pair;

import android.util.Slog;
@@ -421,9 +422,19 @@ public class CrossProfileIntentResolverEngine { 
        } else {

            candidates.addAll(resolveInfoFromCrossProfileDomainInfo(crossProfileCandidates));

        }

        // When we have only a single result belonging to a different user space, we check

        // if filtering is configured on cross-profile intent resolution for the originating user.

        // Accordingly, we modify the intent to reflect the content-owner as the originating user,

        // preventing the resolving user to be assumed the same, when activity is started.



        // In case more than one result is present, the resolver sheet is opened which takes care of

        // cross user access.

        if (candidates.size() == 1 && !UserHandle.of(userId).equals(candidates.get(0).userHandle)

                && isNoFilteringPropertyConfiguredForUser(userId)) {

            intent.prepareToLeaveUser(userId);

        }

        return new QueryIntentActivitiesResult(sortResult, addInstant, candidates);

    }



    /**

     * It filters and combines results from current and cross profile based on domain priority.

     * @param computer {@link Computer} instance