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

Update to support long version codes.

Browse Source 
Bug: 64459786
Test: manual
Change-Id: I2d4af47f6ace237aa4c37af95d1de97be2870acd
This commit is contained in:
Dianne Hackborn
2017-11-28 16:51:08 -08:00
parent 73dc437b45
commit c383932a8a
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/applications/ProcStatsData.java
View File

@@ -26,6 +26,7 @@ import android.os.SystemClock;
import android.text.format.Formatter; import android.text.format.Formatter;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.Log; import android.util.Log;
import android.util.LongSparseArray;
import android.util.SparseArray; import android.util.SparseArray;
import com.android.internal.app.ProcessMap; import com.android.internal.app.ProcessMap;
@@ -270,10 +271,10 @@ public class ProcStatsData {
final ProcessMap<ProcStatsEntry> entriesMap = new ProcessMap<ProcStatsEntry>(); final ProcessMap<ProcStatsEntry> entriesMap = new ProcessMap<ProcStatsEntry>();
for (int ipkg = 0, N = mStats.mPackages.getMap().size(); ipkg < N; ipkg++) { for (int ipkg = 0, N = mStats.mPackages.getMap().size(); ipkg < N; ipkg++) {
final SparseArray<SparseArray<ProcessStats.PackageState>> pkgUids = mStats.mPackages final SparseArray<LongSparseArray<ProcessStats.PackageState>> pkgUids = mStats.mPackages
.getMap().valueAt(ipkg); .getMap().valueAt(ipkg);
for (int iu = 0; iu < pkgUids.size(); iu++) { for (int iu = 0; iu < pkgUids.size(); iu++) {
final SparseArray<ProcessStats.PackageState> vpkgs = pkgUids.valueAt(iu); final LongSparseArray<ProcessStats.PackageState> vpkgs = pkgUids.valueAt(iu);
for (int iv = 0; iv < vpkgs.size(); iv++) { for (int iv = 0; iv < vpkgs.size(); iv++) {
final ProcessStats.PackageState st = vpkgs.valueAt(iv); final ProcessStats.PackageState st = vpkgs.valueAt(iv);
for (int iproc = 0; iproc < st.mProcesses.size(); iproc++) { for (int iproc = 0; iproc < st.mProcesses.size(); iproc++) {
@@ -311,10 +312,10 @@ public class ProcStatsData {
// Add in service info. // Add in service info.
for (int ip = 0, N = mStats.mPackages.getMap().size(); ip < N; ip++) { for (int ip = 0, N = mStats.mPackages.getMap().size(); ip < N; ip++) {
SparseArray<SparseArray<ProcessStats.PackageState>> uids = mStats.mPackages.getMap() SparseArray<LongSparseArray<ProcessStats.PackageState>> uids = mStats.mPackages.getMap()
.valueAt(ip); .valueAt(ip);
for (int iu = 0; iu < uids.size(); iu++) { for (int iu = 0; iu < uids.size(); iu++) {
SparseArray<ProcessStats.PackageState> vpkgs = uids.valueAt(iu); LongSparseArray<ProcessStats.PackageState> vpkgs = uids.valueAt(iu);
for (int iv = 0; iv < vpkgs.size(); iv++) { for (int iv = 0; iv < vpkgs.size(); iv++) {
ProcessStats.PackageState ps = vpkgs.valueAt(iv); ProcessStats.PackageState ps = vpkgs.valueAt(iv);
for (int is = 0, NS = ps.mServices.size(); is < NS; is++) { for (int is = 0, NS = ps.mServices.size(); is < NS; is++) {

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

@@ -23,7 +23,7 @@ import android.os.Parcelable;
import android.text.TextUtils; 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.LongSparseArray;
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;
@@ -142,7 +142,7 @@ public final class ProcStatsEntry implements Parcelable {
// Collect information about each package running in the process. // Collect information about each package running in the process.
ArrayList<ProcStatsEntry> subProcs = new ArrayList<>(); ArrayList<ProcStatsEntry> subProcs = new ArrayList<>();
for (int ipkg=0; ipkg<mPackages.size(); ipkg++) { for (int ipkg=0; ipkg<mPackages.size(); ipkg++) {
SparseArray<ProcessStats.PackageState> vpkgs LongSparseArray<ProcessStats.PackageState> vpkgs
= stats.mPackages.get(mPackages.get(ipkg), mUid); = stats.mPackages.get(mPackages.get(ipkg), mUid);
for (int ivers=0; ivers<vpkgs.size(); ivers++) { for (int ivers=0; ivers<vpkgs.size(); ivers++) {
ProcessStats.PackageState pkgState = vpkgs.valueAt(ivers); ProcessStats.PackageState pkgState = vpkgs.valueAt(ivers);