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

Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev

Browse Source 
am: 2dec0c7839

* commit '2dec0c7839784940601df3f2110a552a5cf73400':
  Fix issue #28400000: Settings memory UI still showing z-ram...

Change-Id: Id9e43e234b5aaac86dd94d36ccd051d22ad5bdd4
This commit is contained in:
Dianne Hackborn
2016-05-12 00:51:36 +00:00
committed by android-build-merger
parent 8b649c0558 2dec0c7839
commit c55d3e0ee8
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,7 +160,7 @@ public class ProcStatsData {
ProcessStats.ALL_SCREEN_ADJ, mMemStates, ProcessStats.NON_CACHED_PROC_STATES); ProcessStats.ALL_SCREEN_ADJ, mMemStates, ProcessStats.NON_CACHED_PROC_STATES);
createPkgMap(getProcs(bgTotals, runTotals), bgTotals, runTotals); createPkgMap(getProcs(bgTotals, runTotals), bgTotals, runTotals);
if (totalMem.sysMemZRamWeight > 0) { if (totalMem.sysMemZRamWeight > 0 && !totalMem.hasSwappedOutPss) {
distributeZRam(totalMem.sysMemZRamWeight); distributeZRam(totalMem.sysMemZRamWeight);
} }
@@ -418,8 +418,10 @@ public class ProcStatsData {
memReader.readMemInfo(); memReader.readMemInfo();
realTotalRam = memReader.getTotalSize(); realTotalRam = memReader.getTotalSize();
freeWeight = totalMem.sysMemFreeWeight + totalMem.sysMemCachedWeight; freeWeight = totalMem.sysMemFreeWeight + totalMem.sysMemCachedWeight;
usedWeight = totalMem.sysMemKernelWeight + totalMem.sysMemNativeWeight usedWeight = totalMem.sysMemKernelWeight + totalMem.sysMemNativeWeight;
+ totalMem.sysMemZRamWeight; if (!totalMem.hasSwappedOutPss) {
usedWeight += totalMem.sysMemZRamWeight;
}
for (int i = 0; i < ProcessStats.STATE_COUNT; i++) { for (int i = 0; i < ProcessStats.STATE_COUNT; i++) {
if (i == ProcessStats.STATE_SERVICE_RESTARTING) { if (i == ProcessStats.STATE_SERVICE_RESTARTING) {
// These don't really run. // These don't really run.