summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jing Ji <jji@google.com> 2020-04-04 03:45:38 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-04-04 03:45:38 +0000
commitb7bca21ba9e6560f3caa268f9016994803d313f5 (patch)
tree580af4c00b00533e0d94cfd110b1539f3d7a7bf0
parent43bc020fc0e1e3648354c44503294af8258a8314 (diff)
parentfb18abde483c7fed713a1764efc16360ddc122b7 (diff)
Merge "Multiply the total memory by mem_unit" into rvc-dev
-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 0c74387c1a2e..7c32ca653114 100644
--- a/core/jni/android_util_Process.cpp
+++ b/core/jni/android_util_Process.cpp
@@ -696,7 +696,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;
}
/*