Merge "skip reading vmallocinfo if not needed" into qt-r1-dev

am: d8fd3f8e43

Change-Id: I4017fc6822aa718f2ffdc35c2f219c9777e259bd

core/jni/android_os_Debug.cpp

@@ -575,7 +575,7 @@ static void android_os_Debug_getMemInfo(JNIEnv *env, jobject clazz, jlongArray o
     if (outArray != NULL) {
         outLen = MEMINFO_COUNT;
         for (int i = 0; i < outLen; i++) {
-            if (i == MEMINFO_VMALLOC_USED) {
+            if (i == MEMINFO_VMALLOC_USED && mem[i] == 0) {
                 outArray[i] = smi.ReadVmallocInfo() / 1024;
                 continue;
             }