diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-04-29 11:58:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-04-29 11:58:19 +0000 |
| commit | 5839b68910c97cb034471cb622bdc465a8a9d008 (patch) | |
| tree | 8966cfe0c5dedbf038d8c10b2a8618837ad33ef9 | |
| parent | 1cfbbd462c1ad9c0ebdcc29329460801d56fb77b (diff) | |
| parent | ac07666862741454877c60102fa752f5e4a1a84d (diff) | |
| download | base-5839b68910c97cb034471cb622bdc465a8a9d008.tar.gz | |
Merge "Multiply the total memory by mem_unit" into android10-gsi
| -rw-r--r-- | core/jni/android_util_Process.cpp | 2 |
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, |