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

Commit fb5a1ede authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Immediately notify VM of TOP process state" am: f80f2e45 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2124252



Change-Id: I36c3713f99361d7fc4e59d05ae147dcb7f7f3978
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ec8f45f6 f80f2e45

core/java/android/app/ActivityThread.java

+1 −32
Original line number Diff line number Diff line
@@ -272,11 +272,6 @@ public final class ActivityThread extends ClientTransactionHandler 
    private static final boolean DEBUG_PROVIDER = false;

    public static final boolean DEBUG_ORDER = false;

    private static final long MIN_TIME_BETWEEN_GCS = 5*1000;

    /**

     * If the activity doesn't become idle in time, the timeout will ensure to apply the pending top

     * process state.

     */

    private static final long PENDING_TOP_PROCESS_STATE_TIMEOUT = 1000;

    /**

     * The delay to release the provider when it has no more references. It reduces the number of

     * transactions for acquiring and releasing provider if the client accesses the provider
@@ -361,8 +356,6 @@ public final class ActivityThread extends ClientTransactionHandler 
    private final AtomicInteger mNumLaunchingActivities = new AtomicInteger();

    @GuardedBy("mAppThread")

    private int mLastProcessState = PROCESS_STATE_UNKNOWN;

    @GuardedBy("mAppThread")

    private int mPendingProcessState = PROCESS_STATE_UNKNOWN;

    ArrayList<WeakReference<AssistStructure>> mLastAssistStructures = new ArrayList<>();

    private int mLastSessionId;

    final ArrayMap<IBinder, CreateServiceData> mServicesData = new ArrayMap<>();
@@ -2319,7 +2312,6 @@ public final class ActivityThread extends ClientTransactionHandler 
            if (stopProfiling) {

                mProfiler.stopProfiling();

            }

            applyPendingProcessState();

            return false;

        }

    }
@@ -3366,16 +3358,7 @@ public final class ActivityThread extends ClientTransactionHandler 
            }

            wasCached = isCachedProcessState();

            mLastProcessState = processState;

            // Defer the top state for VM to avoid aggressive JIT compilation affecting activity

            // launch time.

            if (processState == ActivityManager.PROCESS_STATE_TOP

                    && mNumLaunchingActivities.get() > 0) {

                mPendingProcessState = processState;

                mH.postDelayed(this::applyPendingProcessState, PENDING_TOP_PROCESS_STATE_TIMEOUT);

            } else {

                mPendingProcessState = PROCESS_STATE_UNKNOWN;

            updateVmProcessState(processState);

            }

            if (localLOGV) {

                Slog.i(TAG, "******************* PROCESS STATE CHANGED TO: " + processState

                        + (fromIpc ? " (from ipc" : ""));
@@ -3409,20 +3392,6 @@ public final class ActivityThread extends ClientTransactionHandler 
        VMRuntime.getRuntime().updateProcessState(state);

    }



    private void applyPendingProcessState() {

        synchronized (mAppThread) {

            if (mPendingProcessState == PROCESS_STATE_UNKNOWN) {

                return;

            }

            final int pendingState = mPendingProcessState;

            mPendingProcessState = PROCESS_STATE_UNKNOWN;

            // Only apply the pending state if the last state doesn't change.

            if (pendingState == mLastProcessState) {

                updateVmProcessState(pendingState);

            }

        }

    }



    @Override

    public void countLaunchingActivities(int num) {

        mNumLaunchingActivities.getAndAdd(num);