Merge "Atom ProcessStateChanged marked as deprecated"
This commit is contained in:
@@ -17,7 +17,6 @@
|
||||
package com.android.server.am;
|
||||
|
||||
import static android.app.ActivityManager.PROCESS_STATE_NONEXISTENT;
|
||||
import static android.app.ActivityManager.processStateAmToProto;
|
||||
|
||||
import android.annotation.IntDef;
|
||||
import android.app.IApplicationThread;
|
||||
@@ -318,12 +317,6 @@ final class ProcessProfileRecord {
|
||||
origBase.setState(ProcessStats.STATE_NOTHING,
|
||||
tracker.getMemFactorLocked(), SystemClock.uptimeMillis(),
|
||||
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();
|
||||
}
|
||||
@@ -362,12 +355,6 @@ final class ProcessProfileRecord {
|
||||
origBase.setState(ProcessStats.STATE_NOTHING,
|
||||
tracker.getMemFactorLocked(), SystemClock.uptimeMillis(),
|
||||
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();
|
||||
setBaseProcessTracker(null);
|
||||
|
||||
@@ -54,7 +54,6 @@ import com.android.internal.annotations.VisibleForTesting;
|
||||
import com.android.internal.app.procstats.ProcessState;
|
||||
import com.android.internal.app.procstats.ProcessStats;
|
||||
import com.android.internal.os.Zygote;
|
||||
import com.android.internal.util.FrameworkStatsLog;
|
||||
import com.android.server.wm.WindowProcessController;
|
||||
import com.android.server.wm.WindowProcessListener;
|
||||
|
||||
@@ -1212,12 +1211,6 @@ class ProcessRecord implements WindowProcessListener {
|
||||
long now = SystemClock.uptimeMillis();
|
||||
baseProcessTracker.setState(ProcessStats.STATE_NOTHING,
|
||||
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) {
|
||||
mPkgList.forEachPackageProcessStats(holder -> {
|
||||
if (holder.state != null && holder.state != baseProcessTracker) {
|
||||
|
||||
@@ -36,7 +36,6 @@ import android.util.TimeUtils;
|
||||
|
||||
import com.android.internal.annotations.CompositeRWLock;
|
||||
import com.android.internal.annotations.GuardedBy;
|
||||
import com.android.internal.util.FrameworkStatsLog;
|
||||
import com.android.server.am.PlatformCompatCache.CachedCompatChangeId;
|
||||
|
||||
import java.io.PrintWriter;
|
||||
@@ -599,12 +598,6 @@ final class ProcessStateRecord {
|
||||
@GuardedBy({"mService", "mProcLock"})
|
||||
void setReportedProcState(int 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);
|
||||
}
|
||||
|
||||
@@ -620,12 +613,6 @@ final class ProcessStateRecord {
|
||||
mRepProcState = newState;
|
||||
setCurProcState(newState);
|
||||
setCurRawProcState(newState);
|
||||
mApp.getPkgList().forEachPackage((pkgName, holder) ->
|
||||
FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_STATE_CHANGED,
|
||||
mApp.uid, mApp.processName, pkgName,
|
||||
ActivityManager.processStateAmToProto(mRepProcState),
|
||||
holder.appVersion)
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user