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

Commit 80d3529a authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge changes I0d33b4d3,I7034fcb2 

* changes:
  Moved some log config. to ActivityTaskManagerDebugConfig (21/n)
  Moved more stuff from AMS to ATMS (20/n)
parents 861872da 98875615

core/java/android/app/ActivityManagerInternal.java

+7 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.ComponentName; 
import android.content.IIntentReceiver;

import android.content.IIntentSender;

import android.content.Intent;

import android.content.pm.ActivityInfo;

import android.content.pm.ApplicationInfo;

import android.content.pm.UserInfo;

import android.os.Bundle;
@@ -242,4 +243,10 @@ public abstract class ActivityManagerInternal { 
            throws TransactionTooLargeException;



    public abstract void disconnectActivityFromServices(Object connectionHolder);

    public abstract void cleanUpServices(int userId, ComponentName component, Intent baseIntent);

    public abstract ActivityInfo getActivityInfoForUser(ActivityInfo aInfo, int userId);

    public abstract void ensureBootCompleted();

    public abstract void updateOomLevelsForDisplay(int displayId);

    public abstract boolean isActivityStartsLoggingEnabled();

    public abstract void reportCurKeyguardUsageEvent(boolean keyguardShowing);

}

core/java/android/app/ActivityTaskManager.java

+6 −0
Original line number Diff line number Diff line
@@ -44,6 +44,12 @@ public class ActivityTaskManager { 
    /** Invalid stack ID. */

    public static final int INVALID_STACK_ID = -1;



    /**

     * Invalid task ID.

     * @hide

     */

    public static final int INVALID_TASK_ID = -1;



    /**

     * Parameter to {@link IActivityTaskManager#setTaskWindowingModeSplitScreenPrimary} which

     * specifies the position of the created docked stack at the top half of the screen if

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

+12 −12
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import java.io.PrintWriter; 
import java.io.StringWriter;

import java.util.ArrayList;

import java.util.Comparator;

import java.util.HashSet;

import java.util.Iterator;

import java.util.List;

import java.util.Set;
@@ -552,7 +551,7 @@ public final class ActiveServices { 
        if (!callerFg && !fgRequired && 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 (proc == null || proc.getCurProcState() > ActivityManager.PROCESS_STATE_RECEIVER) {

                // If this is not coming from a foreground caller, then we may want

                // to delay the start if there are already other background services

                // that are starting.  This is to avoid process start spam when lots
@@ -580,7 +579,7 @@ public final class ActiveServices { 
                }

                if (DEBUG_DELAYED_STARTS) Slog.v(TAG_SERVICE, "Not delaying: " + r);

                addToStarting = true;

            } else if (proc.curProcState >= ActivityManager.PROCESS_STATE_SERVICE) {

            } else if (proc.getCurProcState() >= ActivityManager.PROCESS_STATE_SERVICE) {

                // We slightly loosen when we will enqueue this new service as a background

                // starting service we are waiting for, to also include processes that are

                // currently running other services or receivers.
@@ -589,7 +588,7 @@ public final class ActiveServices { 
                        "Not delaying, but counting as bg: " + r);

            } else if (DEBUG_DELAYED_STARTS) {

                StringBuilder sb = new StringBuilder(128);

                sb.append("Not potential delay (state=").append(proc.curProcState)

                sb.append("Not potential delay (state=").append(proc.getCurProcState())

                        .append(' ').append(proc.adjType);

                String reason = proc.makeAdjReason();

                if (reason != null) {
@@ -1442,8 +1441,8 @@ public final class ActiveServices { 
                }

            }

        }

        if (anyClientActivities != proc.hasClientActivities) {

            proc.hasClientActivities = anyClientActivities;

        if (anyClientActivities != proc.hasClientActivities()) {

            proc.setHasClientActivities(anyClientActivities);

            if (updateLru) {

                mAm.updateLruProcessLocked(proc, anyClientActivities, null);

            }
@@ -1623,8 +1622,9 @@ public final class ActiveServices { 
                }

            }



            mAm.startAssociationLocked(callerApp.uid, callerApp.processName, callerApp.curProcState,

                    s.appInfo.uid, s.appInfo.longVersionCode, s.name, s.processName);

            mAm.startAssociationLocked(callerApp.uid, callerApp.processName,

                    callerApp.getCurProcState(), s.appInfo.uid, s.appInfo.longVersionCode,

                    s.name, s.processName);

            // Once the apps have become associated, if one of them is caller is ephemeral

            // the target app should now be able to see the calling app

            mAm.grantEphemeralAccessLocked(callerApp.userId, service,
@@ -1680,7 +1680,7 @@ public final class ActiveServices { 
                    s.app.whitelistManager = true;

                }

                // This could have made the service more important.

                mAm.updateLruProcessLocked(s.app, s.app.hasClientActivities

                mAm.updateLruProcessLocked(s.app, s.app.hasClientActivities()

                        || s.app.treatLikeActivity, b.client);

                mAm.updateOomAdjLocked(s.app, true);

            }
@@ -1794,7 +1794,7 @@ public final class ActiveServices { 
                    if ((r.flags&Context.BIND_TREAT_LIKE_ACTIVITY) != 0) {

                        r.binding.service.app.treatLikeActivity = true;

                        mAm.updateLruProcessLocked(r.binding.service.app,

                                r.binding.service.app.hasClientActivities

                                r.binding.service.app.hasClientActivities()

                                || r.binding.service.app.treatLikeActivity, null);

                    }

                    mAm.updateOomAdjLocked(r.binding.service.app, false);
@@ -3259,9 +3259,9 @@ public final class ActiveServices { 
        }

    }



    void cleanUpRemovedTaskLocked(TaskRecord tr, ComponentName component, Intent baseIntent) {

    void cleanUpServices(int userId, ComponentName component, Intent baseIntent) {

        ArrayList<ServiceRecord> services = new ArrayList<>();

        ArrayMap<ComponentName, ServiceRecord> alls = getServicesLocked(tr.userId);

        ArrayMap<ComponentName, ServiceRecord> alls = getServicesLocked(userId);

        for (int i = alls.size() - 1; i >= 0; i--) {

            ServiceRecord sr = alls.valueAt(i);

            if (sr.packageName.equals(component.getPackageName())) {

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

+7 −7
Original line number Diff line number Diff line
@@ -37,12 +37,12 @@ import static com.android.server.am.ActivityDisplayProto.FOCUSED_STACK_ID; 
import static com.android.server.am.ActivityDisplayProto.ID;

import static com.android.server.am.ActivityDisplayProto.RESUMED_ACTIVITY;

import static com.android.server.am.ActivityDisplayProto.STACKS;

import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_STACK;

import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_STATES;

import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_TASKS;

import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_STACK;

import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM;

import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME;

import static com.android.server.am.ActivityTaskManagerDebugConfig.DEBUG_STACK;

import static com.android.server.am.ActivityTaskManagerDebugConfig.DEBUG_STATES;

import static com.android.server.am.ActivityTaskManagerDebugConfig.DEBUG_TASKS;

import static com.android.server.am.ActivityTaskManagerDebugConfig.POSTFIX_STACK;

import static com.android.server.am.ActivityTaskManagerDebugConfig.TAG_ATM;

import static com.android.server.am.ActivityTaskManagerDebugConfig.TAG_WITH_CLASS_NAME;

import static com.android.server.am.ActivityStack.ActivityState.RESUMED;

import static com.android.server.am.ActivityStackSupervisor.FindTaskResult;

import static com.android.server.am.ActivityStackSupervisor.TAG_STATES;
@@ -73,7 +73,7 @@ import java.util.ArrayList; 
 */

class ActivityDisplay extends ConfigurationContainer<ActivityStack>

        implements WindowContainerListener {

    private static final String TAG = TAG_WITH_CLASS_NAME ? "ActivityDisplay" : TAG_AM;

    private static final String TAG = TAG_WITH_CLASS_NAME ? "ActivityDisplay" : TAG_ATM;

    private static final String TAG_STACK = TAG + POSTFIX_STACK;



    static final int POSITION_TOP = Integer.MAX_VALUE;

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

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ final class ActivityManagerConstants extends ContentObserver { 


    // Indicates whether the activity starts logging is enabled.

    // Controlled by Settings.Global.ACTIVITY_STARTS_LOGGING_ENABLED

    boolean mFlagActivityStartsLoggingEnabled;

    volatile boolean mFlagActivityStartsLoggingEnabled;



    private final ActivityManagerService mService;

    private ContentResolver mResolver;