Commit 7e8e06af authored Apr 04, 2020 by Jing Ji Committed by Automerger Merge Worker Apr 04, 2020

Merge "Multiply the total memory by mem_unit" into rvc-dev am: b7bca21b am:...

Merge "Multiply the total memory by mem_unit" into rvc-dev am: b7bca21b am: 238749ee am: d661a957

Change-Id: Ia59de2cf8b83a1010c7e0330eb7a2f0b9e2045dd

parents 7456a63d d661a957

core/jni/android_util_Process.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

		/*