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

Commit 624b1ef3 authored by Vova Sharaienko's avatar Vova Sharaienko Committed by Automerger Merge Worker
Browse files

Merge "Atom ProcessStateChanged marked as deprecated" am: eca09fa8 am:... 

Merge "Atom ProcessStateChanged marked as deprecated" am: eca09fa8 am: d1a21493 am: 01a8da09 am: ce2d2b10 am: 121946a7

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



Change-Id: I9f1d7db990088e29feeb90dec28ae9793b3061a1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 342855bc 121946a7

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

+0 −13
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.server.am;

package com.android.server.am;





import static android.app.ActivityManager.PROCESS_STATE_NONEXISTENT;

import static android.app.ActivityManager.PROCESS_STATE_NONEXISTENT;

import static android.app.ActivityManager.processStateAmToProto;





import android.annotation.IntDef;

import android.annotation.IntDef;

import android.app.IApplicationThread;

import android.app.IApplicationThread;
@@ -318,12 +317,6 @@ final class ProcessProfileRecord { 
                            origBase.setState(ProcessStats.STATE_NOTHING,

                            origBase.setState(ProcessStats.STATE_NOTHING,

                                    tracker.getMemFactorLocked(), SystemClock.uptimeMillis(),

                                    tracker.getMemFactorLocked(), SystemClock.uptimeMillis(),

                                    pkgList.getPackageListLocked());

                                    pkgList.getPackageListLocked());

                            pkgList.forEachPackage((pkgName, holder) ->

                                    FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_STATE_CHANGED,

                                        mApp.uid, mApp.processName, pkgName,

                                        processStateAmToProto(ProcessStats.STATE_NOTHING),

                                        holder.appVersion)

                            );

                        }

                        }

                        origBase.makeInactive();

                        origBase.makeInactive();

                    }

                    }
@@ -362,12 +355,6 @@ final class ProcessProfileRecord { 
                        origBase.setState(ProcessStats.STATE_NOTHING,

                        origBase.setState(ProcessStats.STATE_NOTHING,

                                tracker.getMemFactorLocked(), SystemClock.uptimeMillis(),

                                tracker.getMemFactorLocked(), SystemClock.uptimeMillis(),

                                pkgList.getPackageListLocked());

                                pkgList.getPackageListLocked());

                        pkgList.forEachPackage((pkgName, holder) ->

                                FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_STATE_CHANGED,

                                    mApp.uid, mApp.processName, pkgName,

                                    processStateAmToProto(ProcessStats.STATE_NOTHING),

                                    holder.appVersion)

                        );

                    }

                    }

                    origBase.makeInactive();

                    origBase.makeInactive();

                    setBaseProcessTracker(null);

                    setBaseProcessTracker(null);

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

+0 −7
Original line number Original line Diff line number Diff line
@@ -54,7 +54,6 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.app.procstats.ProcessState;

import com.android.internal.app.procstats.ProcessState;

import com.android.internal.app.procstats.ProcessStats;

import com.android.internal.app.procstats.ProcessStats;

import com.android.internal.os.Zygote;

import com.android.internal.os.Zygote;

import com.android.internal.util.FrameworkStatsLog;

import com.android.server.wm.WindowProcessController;

import com.android.server.wm.WindowProcessController;

import com.android.server.wm.WindowProcessListener;

import com.android.server.wm.WindowProcessListener;
@@ -1212,12 +1211,6 @@ class ProcessRecord implements WindowProcessListener { 
                    long now = SystemClock.uptimeMillis();

                    long now = SystemClock.uptimeMillis();

                    baseProcessTracker.setState(ProcessStats.STATE_NOTHING,

                    baseProcessTracker.setState(ProcessStats.STATE_NOTHING,

                            tracker.getMemFactorLocked(), now, mPkgList.getPackageListLocked());

                            tracker.getMemFactorLocked(), now, mPkgList.getPackageListLocked());

                    mPkgList.forEachPackage((pkgName, holder) ->

                            FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_STATE_CHANGED,

                                uid, processName, pkgName,

                                ActivityManager.processStateAmToProto(ProcessStats.STATE_NOTHING),

                                holder.appVersion)

                    );

                    if (numOfPkgs != 1) {

                    if (numOfPkgs != 1) {

                        mPkgList.forEachPackageProcessStats(holder -> {

                        mPkgList.forEachPackageProcessStats(holder -> {

                            if (holder.state != null && holder.state != baseProcessTracker) {

                            if (holder.state != null && holder.state != baseProcessTracker) {

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

+0 −13
Original line number Original line Diff line number Diff line
@@ -35,7 +35,6 @@ import android.util.TimeUtils; 




import com.android.internal.annotations.CompositeRWLock;

import com.android.internal.annotations.CompositeRWLock;

import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.GuardedBy;

import com.android.internal.util.FrameworkStatsLog;

import com.android.server.am.PlatformCompatCache.CachedCompatChangeId;

import com.android.server.am.PlatformCompatCache.CachedCompatChangeId;





import java.io.PrintWriter;

import java.io.PrintWriter;
@@ -599,12 +598,6 @@ final class ProcessStateRecord { 
    @GuardedBy({"mService", "mProcLock"})

    @GuardedBy({"mService", "mProcLock"})

    void setReportedProcState(int repProcState) {

    void setReportedProcState(int repProcState) {

        mRepProcState = repProcState;

        mRepProcState = repProcState;

        mApp.getPkgList().forEachPackage((pkgName, holder) ->

                FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_STATE_CHANGED,

                    mApp.uid, mApp.processName, pkgName,

                    ActivityManager.processStateAmToProto(mRepProcState),

                    holder.appVersion)

        );

        mApp.getWindowProcessController().setReportedProcState(repProcState);

        mApp.getWindowProcessController().setReportedProcState(repProcState);

    }

    }
@@ -620,12 +613,6 @@ final class ProcessStateRecord { 
                mRepProcState = newState;

                mRepProcState = newState;

                setCurProcState(newState);

                setCurProcState(newState);

                setCurRawProcState(newState);

                setCurRawProcState(newState);

                mApp.getPkgList().forEachPackage((pkgName, holder) ->

                        FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_STATE_CHANGED,

                            mApp.uid, mApp.processName, pkgName,

                            ActivityManager.processStateAmToProto(mRepProcState),

                            holder.appVersion)

                );

            }

            }

        }

        }

    }

    }