PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Have a fallback package name when matching targetPackage." into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-08-22 21:23:47 +00:00
committed by Android (Google) Code Review
parent ce8a222a59 0c58131c37
commit 5a6fad7607
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/applications/ProcStatsEntry.java
View File

@@ -20,12 +20,13 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.text.TextUtils;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.Log; import android.util.Log;
import android.util.SparseArray; import android.util.SparseArray;
import com.android.internal.app.procstats.ProcessStats;
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.ServiceState; import com.android.internal.app.procstats.ServiceState;
import java.util.ArrayList; import java.util.ArrayList;
@@ -33,6 +34,7 @@ import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
public final class ProcStatsEntry implements Parcelable { public final class ProcStatsEntry implements Parcelable {
private static final String TAG = "ProcStatsEntry"; private static final String TAG = "ProcStatsEntry";
private static boolean DEBUG = ProcessStatsUi.DEBUG; private static boolean DEBUG = ProcessStatsUi.DEBUG;
@@ -40,7 +42,7 @@ public final class ProcStatsEntry implements Parcelable {
final int mUid; final int mUid;
final String mName; final String mName;
public CharSequence mLabel; public CharSequence mLabel;
final ArrayList<String> mPackages = new ArrayList<String>(); final ArrayList<String> mPackages = new ArrayList<>();
final long mBgDuration; final long mBgDuration;
final long mAvgBgMem; final long mAvgBgMem;
final long mMaxBgMem; final long mMaxBgMem;
@@ -52,7 +54,7 @@ public final class ProcStatsEntry implements Parcelable {
String mBestTargetPackage; String mBestTargetPackage;
ArrayMap<String, ArrayList<Service>> mServices = new ArrayMap<String, ArrayList<Service>>(1); ArrayMap<String, ArrayList<Service>> mServices = new ArrayMap<>(1);
public ProcStatsEntry(ProcessState proc, String packageName, public ProcStatsEntry(ProcessState proc, String packageName,
ProcessStats.ProcessDataCollection tmpBgTotals, ProcessStats.ProcessDataCollection tmpBgTotals,
@@ -249,6 +251,10 @@ public final class ProcStatsEntry implements Parcelable {
+ " not as good as last " + bestRunTime); + " not as good as last " + bestRunTime);
} }
} }
// Final fallback, just pick the first subProc.
if (TextUtils.isEmpty(mBestTargetPackage)) {
mBestTargetPackage = subProcs.get(0).mPackage;
}
} else if (subProcs.size() == 1) { } else if (subProcs.size() == 1) {
mBestTargetPackage = subProcs.get(0).mPackage; mBestTargetPackage = subProcs.get(0).mPackage;
} }