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

Commit 610acda8 authored by Fyodor Kupolov's avatar Fyodor Kupolov
Browse files

Introduced UserController for multi-user functionality 

The new helper class encapsulates user life-cycle management, provided by
ActivityManagerService.

Bug: 24745840
Change-Id: I8ebfa38febc4090390d1c45a9fc47398e52693ae
parent e51ba45c

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

+3 −2
Original line number Diff line number Diff line
@@ -355,7 +355,8 @@ public final class ActiveServices { 


        final ServiceMap smap = getServiceMap(r.userId);

        boolean addToStarting = false;

        if (!callerFg && r.app == null && mAm.mStartedUsers.get(r.userId) != null) {

        if (!callerFg && r.app == null

                && mAm.mUserController.hasStartedUserState(r.userId)) {

            ProcessRecord proc = mAm.getProcessRecordLocked(r.processName, r.appInfo.uid, false);

            if (proc == null || proc.curProcState > ActivityManager.PROCESS_STATE_RECEIVER) {

                // If this is not coming from a foreground caller, then we may want
@@ -1401,7 +1402,7 @@ public final class ActiveServices { 


        // Make sure that the user who owns this service is started.  If not,

        // we don't want to allow it to run.

        if (mAm.mStartedUsers.get(r.userId) == null) {

        if (!mAm.mUserController.hasStartedUserState(r.userId)) {

            String msg = "Unable to launch app "

                    + r.appInfo.packageName + "/"

                    + r.appInfo.uid + " for service "