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

Change-Id: Ia9791be61892a3142f22bb9fd41c45183a14886c
2020-04-04 00:00:25 +00:00
parent cb70e9cf40 dec2e1abc0
commit d7d8df64ef
1 changed files with 1 additions and 1 deletions
--- 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;
 }

 /*