summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJing Ji <jji@google.com>2020-04-03 14:19:41 -0700
committerDenis Hsu <denis.hsu@mediatek.com>2020-04-22 03:48:51 +0000
commitac07666862741454877c60102fa752f5e4a1a84d (patch)
tree8966cfe0c5dedbf038d8c10b2a8618837ad33ef9
parent1cfbbd462c1ad9c0ebdcc29329460801d56fb77b (diff)
downloadbase-ac07666862741454877c60102fa752f5e4a1a84d.tar.gz
Multiply the total memory by mem_unit
Bug: 153107152 Test: Manual Change-Id: If268b1ea63d7166158ac546dd8a1f445eb3d09f9 (cherry picked from commit bfdf2d2ea382093fa0017d6400db1c87239d4693)
-rw-r--r--core/jni/android_util_Process.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp
index 2d7069c50255..7d1663d9f4d7 100644
--- a/core/jni/android_util_Process.cpp
+++ b/core/jni/android_util_Process.cpp
@@ -641,7 +641,7 @@ static jlong android_os_Process_getTotalMemory(JNIEnv* env, jobject clazz)
return -1;
}
- return si.totalram;
+ return static_cast<jlong>(si.totalram) * si.mem_unit;
}
void android_os_Process_readProcLines(JNIEnv* env, jobject clazz, jstring fileStr,