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

Commit 741abfc1 authored by Nicolas Prevot's avatar Nicolas Prevot Committed by Nicolas Prévot
Browse files

Fix cross-profile intent filters with system-user split. 

Don't assume that the parent is always the user owner.

BUG:23105562
Change-Id: Ia98ed608e2b6d1d82d95a73110134d85274c6abf
parent 2af03d2a

core/java/com/android/internal/app/ChooserActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ public class ChooserActivity extends ResolverActivity { 
                result.putExtras(replExtras);

            }

        }

        if (aInfo.name.equals(IntentForwarderActivity.FORWARD_INTENT_TO_USER_OWNER)

        if (aInfo.name.equals(IntentForwarderActivity.FORWARD_INTENT_TO_PARENT)

                || aInfo.name.equals(IntentForwarderActivity.FORWARD_INTENT_TO_MANAGED_PROFILE)) {

            result = Intent.createChooser(result,

                    getIntent().getCharSequenceExtra(Intent.EXTRA_TITLE));

core/java/com/android/internal/app/IntentForwarderActivity.java

+21 −6
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ public class IntentForwarderActivity extends Activity { 


    public static String TAG = "IntentForwarderActivity";



    public static String FORWARD_INTENT_TO_USER_OWNER

            = "com.android.internal.app.ForwardIntentToUserOwner";

    public static String FORWARD_INTENT_TO_PARENT

            = "com.android.internal.app.ForwardIntentToParent";



    public static String FORWARD_INTENT_TO_MANAGED_PROFILE

            = "com.android.internal.app.ForwardIntentToManagedProfile";
@@ -60,9 +60,9 @@ public class IntentForwarderActivity extends Activity { 
        final int targetUserId;

        final int userMessageId;



        if (className.equals(FORWARD_INTENT_TO_USER_OWNER)) {

        if (className.equals(FORWARD_INTENT_TO_PARENT)) {

            userMessageId = com.android.internal.R.string.forward_intent_to_owner;

            targetUserId = UserHandle.USER_OWNER;

            targetUserId = getProfileParent();

        } else if (className.equals(FORWARD_INTENT_TO_MANAGED_PROFILE)) {

            userMessageId = com.android.internal.R.string.forward_intent_to_work;

            targetUserId = getManagedProfile();
@@ -72,7 +72,7 @@ public class IntentForwarderActivity extends Activity { 
            targetUserId = UserHandle.USER_NULL;

        }

        if (targetUserId == UserHandle.USER_NULL) {

            // This covers the case where there is no managed profile.

            // This covers the case where there is no parent / managed profile.

            finish();

            return;

        }
@@ -168,7 +168,7 @@ public class IntentForwarderActivity extends Activity { 
     */

    private int getManagedProfile() {

        UserManager userManager = (UserManager) getSystemService(Context.USER_SERVICE);

        List<UserInfo> relatedUsers = userManager.getProfiles(UserHandle.USER_OWNER);

        List<UserInfo> relatedUsers = userManager.getProfiles(UserHandle.myUserId());

        for (UserInfo userInfo : relatedUsers) {

            if (userInfo.isManagedProfile()) return userInfo.id;

        }
@@ -176,4 +176,19 @@ public class IntentForwarderActivity extends Activity { 
                + " has been called, but there is no managed profile");

        return UserHandle.USER_NULL;

    }



    /**

     * Returns the userId of the profile parent or UserHandle.USER_NULL if there is

     * no parent.

     */

    private int getProfileParent() {

        UserManager userManager = (UserManager) getSystemService(Context.USER_SERVICE);

        UserInfo parent = userManager.getProfileParent(UserHandle.myUserId());

        if (parent == null) {

            Slog.wtf(TAG, FORWARD_INTENT_TO_PARENT

                    + " has been called, but there is no parent");

            return UserHandle.USER_NULL;

        }

        return parent.id;

    }

}

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -2658,7 +2658,7 @@ 
                android:exported="true"

                >

        </activity>

        <activity-alias android:name="com.android.internal.app.ForwardIntentToUserOwner"

        <activity-alias android:name="com.android.internal.app.ForwardIntentToParent"

                android:targetActivity="com.android.internal.app.IntentForwarderActivity"

                android:exported="true"

                android:label="@string/user_owner_label">

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

+13 −6
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ import static android.os.Trace.TRACE_TAG_PACKAGE_MANAGER; 
import static android.system.OsConstants.O_CREAT;

import static android.system.OsConstants.O_RDWR;

import static com.android.internal.app.IntentForwarderActivity.FORWARD_INTENT_TO_MANAGED_PROFILE;

import static com.android.internal.app.IntentForwarderActivity.FORWARD_INTENT_TO_USER_OWNER;

import static com.android.internal.app.IntentForwarderActivity.FORWARD_INTENT_TO_PARENT;

import static com.android.internal.content.NativeLibraryHelper.LIB64_DIR_NAME;

import static com.android.internal.content.NativeLibraryHelper.LIB_DIR_NAME;

import static com.android.internal.util.ArrayUtils.appendInt;
@@ -4949,18 +4949,25 @@ public class PackageManagerService extends IPackageManager.Stub { 
    private ResolveInfo createForwardingResolveInfo(IntentFilter filter,

            int sourceUserId, int targetUserId) {

        ResolveInfo forwardingResolveInfo = new ResolveInfo();

        long ident = Binder.clearCallingIdentity();

        boolean targetIsProfile;

        try {

            targetIsProfile = sUserManager.getUserInfo(targetUserId).isManagedProfile();

        } finally {

            Binder.restoreCallingIdentity(ident);

        }

        String className;

        if (targetUserId == UserHandle.USER_OWNER) {

            className = FORWARD_INTENT_TO_USER_OWNER;

        } else {

        if (targetIsProfile) {

            className = FORWARD_INTENT_TO_MANAGED_PROFILE;

        } else {

            className = FORWARD_INTENT_TO_PARENT;

        }

        ComponentName forwardingActivityComponentName = new ComponentName(

                mAndroidApplication.packageName, className);

        ActivityInfo forwardingActivityInfo = getActivityInfo(forwardingActivityComponentName, 0,

                sourceUserId);

        if (targetUserId == UserHandle.USER_OWNER) {

            forwardingActivityInfo.showUserIcon = UserHandle.USER_OWNER;

        if (!targetIsProfile) {

            forwardingActivityInfo.showUserIcon = targetUserId;

            forwardingResolveInfo.noResourceId = true;

        }

        forwardingResolveInfo.activityInfo = forwardingActivityInfo;

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+8 −2
Original line number Diff line number Diff line
@@ -4963,13 +4963,19 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            IPackageManager pm = AppGlobals.getPackageManager();

            long id = Binder.clearCallingIdentity();

            try {

                UserInfo parent = mUserManager.getProfileParent(callingUserId);

                if (parent == null) {

                    Slog.e(LOG_TAG, "Cannot call addCrossProfileIntentFilter if there is no "

                            + "parent");

                    return;

                }

                if ((flags & DevicePolicyManager.FLAG_PARENT_CAN_ACCESS_MANAGED) != 0) {

                    pm.addCrossProfileIntentFilter(filter, who.getPackageName(), callingUserId,

                            UserHandle.USER_OWNER, 0);

                            parent.id, 0);

                }

                if ((flags & DevicePolicyManager.FLAG_MANAGED_CAN_ACCESS_PARENT) != 0) {

                    pm.addCrossProfileIntentFilter(filter, who.getPackageName(),

                            UserHandle.USER_OWNER, callingUserId, 0);

                            parent.id, callingUserId, 0);

                }

            } catch (RemoteException re) {

                // Shouldn't happen