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

Commit 3c58775a authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Allow INTERACT_ACROSS_USERS for service access."

parents 782fb750 409297da

core/java/android/os/UserManager.java

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

package android.os;



import android.app.ActivityManager;

import android.app.ActivityManagerNative;

import android.content.Context;

import android.content.pm.UserInfo;
@@ -900,6 +901,8 @@ public class UserManager { 
    public static int getMaxSupportedUsers() {

        // Don't allow multiple users on certain builds

        if (android.os.Build.ID.startsWith("JVP")) return 1;

        // Svelte devices don't get multi-user.

        if (ActivityManager.isLowRamDeviceStatic()) return 1;

        return SystemProperties.getInt("fw.max_users",

                Resources.getSystem().getInteger(R.integer.config_multiuserMaximumUsers));

    }

services/core/java/com/android/server/am/ActiveServices.java

+1 −1
Original line number Diff line number Diff line
@@ -961,7 +961,7 @@ public final class ActiveServices { 
                + " type=" + resolvedType + " callingUid=" + callingUid);



        userId = mAm.handleIncomingUser(callingPid, callingUid, userId,

                false, true, "service", null);

                false, ActivityManagerService.ALLOW_NON_FULL_IN_PROFILE, "service", null);



        ServiceMap smap = getServiceMap(userId);

        final ComponentName comp = service.getComponent();

services/core/java/com/android/server/am/ActivityManagerService.java

+178 −84

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/am/ActivityStackSupervisor.java

+4 −2
Original line number Diff line number Diff line
@@ -3407,7 +3407,8 @@ public final class ActivityStackSupervisor implements DisplayListener { 
        public final int startActivity(Intent intent) {

            mService.enforceNotIsolatedCaller("ActivityContainer.startActivity");

            int userId = mService.handleIncomingUser(Binder.getCallingPid(),

                    Binder.getCallingUid(), mCurrentUser, false, true, "ActivityContainer", null);

                    Binder.getCallingUid(), mCurrentUser, false,

                    ActivityManagerService.ALLOW_FULL_ONLY, "ActivityContainer", null);

            // TODO: Switch to user app stacks here.

            intent.addFlags(FORCE_NEW_TASK_FLAGS);

            String mimeType = intent.getType();
@@ -3433,7 +3434,8 @@ public final class ActivityStackSupervisor implements DisplayListener { 


        private void checkEmbeddedAllowedInner(Intent intent, String resolvedType) {

            int userId = mService.handleIncomingUser(Binder.getCallingPid(),

                    Binder.getCallingUid(), mCurrentUser, false, true, "ActivityContainer", null);

                    Binder.getCallingUid(), mCurrentUser, false,

                    ActivityManagerService.ALLOW_FULL_ONLY, "ActivityContainer", null);

            if (resolvedType == null) {

                resolvedType = intent.getType();

                if (resolvedType == null && intent.getData() != null