Merge "Multiply the total memory by mem_unit" am: 2bded37dfc am: dec2e1abc0

Change-Id: I6e62dc3dbc96ab2852bc4a71aa119235fffb2470
2020-04-03 23:59:37 +00:00
parent 2dff1ce920 dec2e1abc0
commit 0e31bbc0e8
1 changed files with 1 additions and 1 deletions
--- 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;
 }

 /*