resolved conflicts for merge of ed84dea9 to master (dd86ed9b) · Commits · e / os / android_frameworks_base

cmds/bootanimation/BootAnimation.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -159,8 +159,8 @@ status_t BootAnimation::initTexture(void* buffer, size_t len)
		SkBitmap bitmap;
		SkMemoryStream stream(buffer, len);
		SkImageDecoder* codec = SkImageDecoder::Factory(&stream);
		codec->setDitherImage(false);
		if (codec) {
		codec->setDitherImage(false);
		codec->decode(&stream, &bitmap,
		SkBitmap::kARGB_8888_Config,
		SkImageDecoder::kDecodePixels_Mode);

core/jni/android_os_Debug.cpp

+5 −1

Original line number	Diff line number	Diff line
		@@ -675,6 +675,7 @@ static jint read_binder_stat(const char* stat)
		// loop until we have the block that represents this process
		do {
		if (fgets(line, 1024, fp) == 0) {
		fclose(fp);
		return -1;
		}
		} while (strncmp(compare, line, len));
		@@ -684,13 +685,16 @@ static jint read_binder_stat(const char* stat)

		do {
		if (fgets(line, 1024, fp) == 0) {
		fclose(fp);
		return -1;
		}
		} while (strncmp(compare, line, len));

		// we have the line, now increment the line ptr to the value
		char* ptr = line + len;
		return atoi(ptr);
		jint result = atoi(ptr);
		fclose(fp);
		return result;
		}

		static jint android_os_Debug_getBinderSentTransactions(JNIEnv *env, jobject clazz)

core/jni/android_util_Process.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -405,7 +405,7 @@ static int pid_compare(const void* v1, const void* v2)
		return ((const jint)v1) - ((const jint)v2);
		}

		static jlong getFreeMemoryImpl(const char* const sums[], const int sumsLen[], int num)
		static jlong getFreeMemoryImpl(const char* const sums[], const size_t sumsLen[], size_t num)
		{
		int fd = open("/proc/meminfo", O_RDONLY);

		@@ -424,7 +424,7 @@ static jlong getFreeMemoryImpl(const char* const sums[], const int sumsLen[], in
		}
		buffer[len] = 0;

		int numFound = 0;
		size_t numFound = 0;
		jlong mem = 0;

		char* p = buffer;
		@@ -456,14 +456,14 @@ static jlong getFreeMemoryImpl(const char* const sums[], const int sumsLen[], in
		static jlong android_os_Process_getFreeMemory(JNIEnv* env, jobject clazz)
		{
		static const char* const sums[] = { "MemFree:", "Cached:", NULL };
		static const int sumsLen[] = { strlen("MemFree:"), strlen("Cached:"), 0 };
		static const size_t sumsLen[] = { strlen("MemFree:"), strlen("Cached:"), 0 };
		return getFreeMemoryImpl(sums, sumsLen, 2);
		}

		static jlong android_os_Process_getTotalMemory(JNIEnv* env, jobject clazz)
		{
		static const char* const sums[] = { "MemTotal:", NULL };
		static const int sumsLen[] = { strlen("MemTotal:"), 0 };
		static const size_t sumsLen[] = { strlen("MemTotal:"), 0 };
		return getFreeMemoryImpl(sums, sumsLen, 1);
		}

		@@ -728,7 +728,7 @@ jboolean android_os_Process_parseProcLineArray(JNIEnv* env, jobject clazz,

		jsize end = -1;
		if ((mode&PROC_PARENS) != 0) {
		while (buffer[i] != ')' && i < endIndex) {
		while (i < endIndex && buffer[i] != ')') {
		i++;
		}
		end = i;
		@@ -740,7 +740,7 @@ jboolean android_os_Process_parseProcLineArray(JNIEnv* env, jobject clazz,
		end = i;
		i++;
		}
		while (buffer[i] != term && i < endIndex) {
		while (i < endIndex && buffer[i] != term) {
		i++;
		}
		if (end < 0) {
		@@ -750,7 +750,7 @@ jboolean android_os_Process_parseProcLineArray(JNIEnv* env, jobject clazz,
		if (i < endIndex) {
		i++;
		if ((mode&PROC_COMBINE) != 0) {
		while (buffer[i] == term && i < endIndex) {
		while (i < endIndex && buffer[i] == term) {
		i++;
		}
		}