From b370a8d580cdc435081155e6ff5e50d6bb9105e7 Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Wed, 23 Mar 2016 12:35:01 -0700 Subject: [PATCH] Adapt to procstats classes which moved. Change-Id: I29a04ef3a3230f688ddf13e607a755b7d7f61991 --- .../settings/applications/ProcStatsData.java | 43 ++++++++++--------- .../settings/applications/ProcStatsEntry.java | 39 +++++++++-------- .../applications/ProcessStatsBase.java | 2 +- .../applications/ProcessStatsMemDetail.java | 2 +- .../settings/applications/ProcessStatsUi.java | 2 +- 5 files changed, 46 insertions(+), 42 deletions(-) diff --git a/src/com/android/settings/applications/ProcStatsData.java b/src/com/android/settings/applications/ProcStatsData.java index 5e330b89007..3c813746e70 100644 --- a/src/com/android/settings/applications/ProcStatsData.java +++ b/src/com/android/settings/applications/ProcStatsData.java @@ -28,11 +28,14 @@ import android.util.ArrayMap; import android.util.Log; import android.util.SparseArray; -import com.android.internal.app.IProcessStats; import com.android.internal.app.ProcessMap; -import com.android.internal.app.ProcessStats; -import com.android.internal.app.ProcessStats.ProcessDataCollection; -import com.android.internal.app.ProcessStats.TotalMemoryUseCollection; +import com.android.internal.app.procstats.DumpUtils; +import com.android.internal.app.procstats.IProcessStats; +import com.android.internal.app.procstats.ProcessState; +import com.android.internal.app.procstats.ProcessStats; +import com.android.internal.app.procstats.ProcessStats.ProcessDataCollection; +import com.android.internal.app.procstats.ProcessStats.TotalMemoryUseCollection; +import com.android.internal.app.procstats.ServiceState; import com.android.internal.util.MemInfoReader; import com.android.settings.R; import com.android.settings.Utils; @@ -142,7 +145,7 @@ public class ProcStatsData { long now = SystemClock.uptimeMillis(); - memTotalTime = ProcessStats.dumpSingleTime(null, null, mStats.mMemFactorDurations, + memTotalTime = DumpUtils.dumpSingleTime(null, null, mStats.mMemFactorDurations, mStats.mMemFactor, mStats.mStartTime, now); ProcessStats.TotalMemoryUseCollection totalMem = new ProcessStats.TotalMemoryUseCollection( @@ -274,26 +277,26 @@ public class ProcStatsData { for (int iv = 0; iv < vpkgs.size(); iv++) { final ProcessStats.PackageState st = vpkgs.valueAt(iv); for (int iproc = 0; iproc < st.mProcesses.size(); iproc++) { - final ProcessStats.ProcessState pkgProc = st.mProcesses.valueAt(iproc); - final ProcessStats.ProcessState proc = mStats.mProcesses.get(pkgProc.mName, - pkgProc.mUid); + final ProcessState pkgProc = st.mProcesses.valueAt(iproc); + final ProcessState proc = mStats.mProcesses.get(pkgProc.getName(), + pkgProc.getUid()); if (proc == null) { Log.w(TAG, "No process found for pkg " + st.mPackageName - + "/" + st.mUid + " proc name " + pkgProc.mName); + + "/" + st.mUid + " proc name " + pkgProc.getName()); continue; } - ProcStatsEntry ent = entriesMap.get(proc.mName, proc.mUid); + ProcStatsEntry ent = entriesMap.get(proc.getName(), proc.getUid()); if (ent == null) { ent = new ProcStatsEntry(proc, st.mPackageName, bgTotals, runTotals, mUseUss); if (ent.mRunWeight > 0) { - if (DEBUG) Log.d(TAG, "Adding proc " + proc.mName + "/" - + proc.mUid + ": time=" + if (DEBUG) Log.d(TAG, "Adding proc " + proc.getName() + "/" + + proc.getUid() + ": time=" + ProcessStatsUi.makeDuration(ent.mRunDuration) + " (" + ((((double) ent.mRunDuration) / memTotalTime) * 100) + "%)" + " pss=" + ent.mAvgRunMem); - entriesMap.put(proc.mName, proc.mUid, ent); + entriesMap.put(proc.getName(), proc.getUid(), ent); procEntries.add(ent); } } else { @@ -315,18 +318,18 @@ public class ProcStatsData { for (int iv = 0; iv < vpkgs.size(); iv++) { ProcessStats.PackageState ps = vpkgs.valueAt(iv); for (int is = 0, NS = ps.mServices.size(); is < NS; is++) { - ProcessStats.ServiceState ss = ps.mServices.valueAt(is); - if (ss.mProcessName != null) { - ProcStatsEntry ent = entriesMap.get(ss.mProcessName, + ServiceState ss = ps.mServices.valueAt(is); + if (ss.getProcessName() != null) { + ProcStatsEntry ent = entriesMap.get(ss.getProcessName(), uids.keyAt(iu)); if (ent != null) { if (DEBUG) Log.d(TAG, "Adding service " + ps.mPackageName - + "/" + ss.mName + "/" + uids.keyAt(iu) + " to proc " - + ss.mProcessName); + + "/" + ss.getName() + "/" + uids.keyAt(iu) + + " to proc " + ss.getProcessName()); ent.addService(ss); } else { - Log.w(TAG, "No process " + ss.mProcessName + "/" + uids.keyAt(iu) - + " for service " + ss.mName); + Log.w(TAG, "No process " + ss.getProcessName() + "/" + + uids.keyAt(iu) + " for service " + ss.getName()); } } } diff --git a/src/com/android/settings/applications/ProcStatsEntry.java b/src/com/android/settings/applications/ProcStatsEntry.java index 55f7bb82130..36d397e3e50 100644 --- a/src/com/android/settings/applications/ProcStatsEntry.java +++ b/src/com/android/settings/applications/ProcStatsEntry.java @@ -24,7 +24,9 @@ import android.util.ArrayMap; import android.util.Log; import android.util.SparseArray; -import com.android.internal.app.ProcessStats; +import com.android.internal.app.procstats.ProcessStats; +import com.android.internal.app.procstats.ProcessState; +import com.android.internal.app.procstats.ServiceState; import java.util.ArrayList; import java.util.Collections; @@ -52,14 +54,14 @@ public final class ProcStatsEntry implements Parcelable { ArrayMap> mServices = new ArrayMap>(1); - public ProcStatsEntry(ProcessStats.ProcessState proc, String packageName, + public ProcStatsEntry(ProcessState proc, String packageName, ProcessStats.ProcessDataCollection tmpBgTotals, ProcessStats.ProcessDataCollection tmpRunTotals, boolean useUss) { - ProcessStats.computeProcessData(proc, tmpBgTotals, 0); - ProcessStats.computeProcessData(proc, tmpRunTotals, 0); - mPackage = proc.mPackage; - mUid = proc.mUid; - mName = proc.mName; + proc.computeProcessData(tmpBgTotals, 0); + proc.computeProcessData(tmpRunTotals, 0); + mPackage = proc.getPackage(); + mUid = proc.getUid(); + mName = proc.getName(); mPackages.add(packageName); mBgDuration = tmpBgTotals.totalTime; mAvgBgMem = useUss ? tmpBgTotals.avgUss : tmpBgTotals.avgPss; @@ -69,7 +71,7 @@ public final class ProcStatsEntry implements Parcelable { mAvgRunMem = useUss ? tmpRunTotals.avgUss : tmpRunTotals.avgPss; mMaxRunMem = useUss ? tmpRunTotals.maxUss : tmpRunTotals.maxPss; mRunWeight = mAvgRunMem * (double) mRunDuration; - if (DEBUG) Log.d(TAG, "New proc entry " + proc.mName + ": dur=" + mBgDuration + if (DEBUG) Log.d(TAG, "New proc entry " + proc.getName() + ": dur=" + mBgDuration + " avgpss=" + mAvgBgMem + " weight=" + mBgWeight); } @@ -149,7 +151,7 @@ public final class ProcStatsEntry implements Parcelable { + mUid + " in process " + mName); continue; } - ProcessStats.ProcessState pkgProc = pkgState.mProcesses.get(mName); + ProcessState pkgProc = pkgState.mProcesses.get(mName); if (pkgProc == null) { Log.w(TAG, "No process " + mName + " found in package state " + mPackages.get(ipkg) + "/" + mUid); @@ -252,11 +254,11 @@ public final class ProcStatsEntry implements Parcelable { } } - public void addService(ProcessStats.ServiceState svc) { - ArrayList services = mServices.get(svc.mPackage); + public void addService(ServiceState svc) { + ArrayList services = mServices.get(svc.getPackage()); if (services == null) { services = new ArrayList(); - mServices.put(svc.mPackage, services); + mServices.put(svc.getPackage(), services); } services.add(new Service(svc)); } @@ -306,13 +308,12 @@ public final class ProcStatsEntry implements Parcelable { final String mProcess; final long mDuration; - public Service(ProcessStats.ServiceState service) { - mPackage = service.mPackage; - mName = service.mName; - mProcess = service.mProcessName; - mDuration = ProcessStats.dumpSingleServiceTime(null, null, service, - ProcessStats.ServiceState.SERVICE_RUN, - ProcessStats.STATE_NOTHING, 0, 0); + public Service(ServiceState service) { + mPackage = service.getPackage(); + mName = service.getName(); + mProcess = service.getProcessName(); + mDuration = service.dumpTime(null, null, + ServiceState.SERVICE_RUN, ProcessStats.STATE_NOTHING, 0, 0); } public Service(Parcel in) { diff --git a/src/com/android/settings/applications/ProcessStatsBase.java b/src/com/android/settings/applications/ProcessStatsBase.java index ee53bf91658..66c0371779a 100644 --- a/src/com/android/settings/applications/ProcessStatsBase.java +++ b/src/com/android/settings/applications/ProcessStatsBase.java @@ -23,7 +23,7 @@ import android.widget.AdapterView.OnItemSelectedListener; import android.widget.ArrayAdapter; import android.widget.Spinner; -import com.android.internal.app.ProcessStats; +import com.android.internal.app.procstats.ProcessStats; import com.android.settings.AppHeader; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/applications/ProcessStatsMemDetail.java b/src/com/android/settings/applications/ProcessStatsMemDetail.java index e60a36862f5..6c7b90a346a 100644 --- a/src/com/android/settings/applications/ProcessStatsMemDetail.java +++ b/src/com/android/settings/applications/ProcessStatsMemDetail.java @@ -24,7 +24,7 @@ import android.view.ViewGroup; import android.widget.ProgressBar; import android.widget.TextView; -import com.android.internal.app.ProcessStats; +import com.android.internal.app.procstats.ProcessStats; import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.InstrumentedFragment; import com.android.settings.R; diff --git a/src/com/android/settings/applications/ProcessStatsUi.java b/src/com/android/settings/applications/ProcessStatsUi.java index b26f4a71888..fd0d7a7bdb1 100644 --- a/src/com/android/settings/applications/ProcessStatsUi.java +++ b/src/com/android/settings/applications/ProcessStatsUi.java @@ -27,7 +27,7 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import com.android.internal.app.ProcessStats; +import com.android.internal.app.procstats.ProcessStats; import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity;