Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 7744

Browse Source 
* changes:
  Make Process.getFreeMemory() return a long instead of an int, to better work on the simulator now, and phones 2 years from now.
This commit is contained in:
Android (Google) Code Review
2009-07-17 13:45:17 -07:00
parent cf541ee116 0bca96bcbf
commit c8f479cbd5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/os/Process.java
View File

@@ -739,7 +739,7 @@ public class Process {
public static final native void sendSignal(int pid, int signal);
/** @hide */
public static final native int getFreeMemory();
public static final native long getFreeMemory();
/** @hide */
public static final native void readProcLines(String path,

8
core/jni/android_util_Process.cpp
View File

@@ -368,7 +368,7 @@ static int pid_compare(const void* v1, const void* v2)
return *((const jint*)v1) - *((const jint*)v2);
}
jint android_os_Process_getFreeMemory(JNIEnv* env, jobject clazz)
static jlong android_os_Process_getFreeMemory(JNIEnv* env, jobject clazz)
{
int fd = open("/proc/meminfo", O_RDONLY);
@@ -388,7 +388,7 @@ jint android_os_Process_getFreeMemory(JNIEnv* env, jobject clazz)
buffer[len] = 0;
int numFound = 0;
int mem = 0;
jlong mem = 0;
static const char* const sums[] = { "MemFree:", "Cached:", NULL };
static const int sumsLen[] = { strlen("MemFree:"), strlen("Cached:"), NULL };
@@ -407,7 +407,7 @@ jint android_os_Process_getFreeMemory(JNIEnv* env, jobject clazz)
p++;
if (*p == 0) p--;
}
mem += atoi(num) * 1024;
mem += atoll(num) * 1024;
numFound++;
break;
}
@@ -857,7 +857,7 @@ static const JNINativeMethod methods[] = {
{"setGid", "(I)I", (void*)android_os_Process_setGid},
{"sendSignal", "(II)V", (void*)android_os_Process_sendSignal},
{"supportsProcesses", "()Z", (void*)android_os_Process_supportsProcesses},
{"getFreeMemory", "()I", (void*)android_os_Process_getFreeMemory},
{"getFreeMemory", "()J", (void*)android_os_Process_getFreeMemory},
{"readProcLines", "(Ljava/lang/String;[Ljava/lang/String;[J)V", (void*)android_os_Process_readProcLines},
{"getPids", "(Ljava/lang/String;[I)[I", (void*)android_os_Process_getPids},
{"readProcFile", "(Ljava/lang/String;[I[Ljava/lang/String;[J[F)Z", (void*)android_os_Process_readProcFile},