am 261bc704: Merge "convert jint to uint32_t."

* commit '261bc70411ba1dd58654c4eb1c91acbbcfb49060':
  convert jint to uint32_t.
This commit is contained in:
Nick Kralevich
2012-12-10 10:31:56 -08:00
committed by Android Git Automerger

View File

@@ -71,8 +71,8 @@ static jint android_util_EventLog_writeEvent_String(JNIEnv* env, jobject clazz,
// Don't throw NPE -- I feel like it's sort of mean for a logging function
// to be all crashy if you pass in NULL -- but make the NULL value explicit.
const char *str = value != NULL ? env->GetStringUTFChars(value, NULL) : "NULL";
jint len = strlen(str);
const int max = sizeof(buf) - sizeof(len) - 2; // Type byte, final newline
uint32_t len = strlen(str);
size_t max = sizeof(buf) - sizeof(len) - 2; // Type byte, final newline
if (len > max) len = max;
buf[0] = EVENT_TYPE_STRING;