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

Commit 31913b50 authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Removed AMS.mStackSuperivor (22/n) 

The stack supervisor object should only be accessed through ATMS.

Test: Existing test pass
Bug: 80414790
Change-Id: I0648a95161a6a5c4ad714264d217c7f5e55852d7
parent 7c5c113f

core/java/android/app/ActivityManagerInternal.java

+0 −14
Original line number Diff line number Diff line
@@ -123,17 +123,6 @@ public abstract class ActivityManagerInternal { 
     */

    public abstract void notifyNetworkPolicyRulesUpdated(int uid, long procStateSeq);



    /**

     * Saves the current activity manager state and includes the saved state in the next dump of

     * activity manager.

     */

    public abstract void saveANRState(String reason);



    /**

     * Clears the previously saved activity manager ANR state.

     */

    public abstract void clearSavedANRState();



    /**

     * @return true if runtime was restarted, false if it's normal boot

     */
@@ -197,9 +186,6 @@ public abstract class ActivityManagerInternal { 
    /** Trims memory usage in the system by removing/stopping unused application processes. */

    public abstract void trimApplications();



    /** Closes all system dialogs. */

    public abstract void closeSystemDialogs(String reason);



    /** Kill the processes in the list due to their tasks been removed. */

    public abstract void killProcessesForRemovedTask(ArrayList<Object> procsToKill);

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

+80 −580

File changed.

Preview size limit exceeded, changes collapsed.

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

+3 −3
Original line number Diff line number Diff line
@@ -507,14 +507,14 @@ class ActivityMetricsLogger { 
    /**

     * Notifies the tracker that we called immediately before we call bindApplication on the client.

     *

     * @param app The client into which we'll call bindApplication.

     * @param appInfo The client into which we'll call bindApplication.

     */

    void notifyBindApplication(ProcessRecord app) {

    void notifyBindApplication(ApplicationInfo appInfo) {

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

            final WindowingModeTransitionInfo info = mWindowingModeTransitionInfo.valueAt(i);



            // App isn't attached to record yet, so match with info.

            if (info.launchedActivity.appInfo == app.info) {

            if (info.launchedActivity.appInfo == appInfo) {

                info.bindApplicationDelayMs = calculateCurrentDelay();

            }

        }

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

+4 −4
Original line number Diff line number Diff line
@@ -994,8 +994,8 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D 
        return candidateTaskId;

    }



    boolean attachApplicationLocked(ProcessRecord app) throws RemoteException {

        final String processName = app.processName;

    boolean attachApplicationLocked(WindowProcessController app) throws RemoteException {

        final String processName = app.mName;

        boolean didSomething = false;

        for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {

            final ActivityDisplay display = mActivityDisplays.get(displayNdx);
@@ -1009,10 +1009,10 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D 
                final int size = mTmpActivityList.size();

                for (int i = 0; i < size; i++) {

                    final ActivityRecord activity = mTmpActivityList.get(i);

                    if (activity.app == null && app.uid == activity.info.applicationInfo.uid

                    if (activity.app == null && app.mUid == activity.info.applicationInfo.uid

                            && processName.equals(activity.processName)) {

                        try {

                            if (realStartActivityLocked(activity, app,

                            if (realStartActivityLocked(activity, (ProcessRecord) app.mOwner,

                                    top == activity /* andResume */, true /* checkConfig */)) {

                                didSomething = true;

                            }

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

+686 −9

File changed.

Preview size limit exceeded, changes collapsed.