Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix typo in SwappedOut reporting" into nyc-dev

Browse Source 
am: f40969ac2c

* commit 'f40969ac2c19399847f153bfa248efcc0935db3c':
  Fix typo in SwappedOut reporting
This commit is contained in:
Thierry Strudel
2016-02-26 02:02:29 +00:00
committed by android-build-merger
parent 2973c936e5 f40969ac2c
commit b7f515cf9b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/ActivityThread.java
View File

@@ -2252,8 +2252,8 @@ public final class ActivityThread {
memInfo.getTotalSwappablePss(),
memInfo.getTotalSharedDirty(), memInfo.getTotalPrivateDirty(),
memInfo.getTotalSharedClean(), memInfo.getTotalPrivateClean(),
memInfo.hasSwappedOutPss ? memInfo.getTotalSwappedOut() :
memInfo.getTotalSwappedOutPss(),
memInfo.hasSwappedOutPss ? memInfo.getTotalSwappedOutPss() :
memInfo.getTotalSwappedOut(),
nativeMax+dalvikMax, nativeAllocated+dalvikAllocated,
nativeFree+dalvikFree);
} else {