Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5aa5687 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Android Git Automerger
Browse files

am 7423510c: am da93c60d: Merge "jni: binder ptrdiff_t compile issues" 

* commit '7423510c':
  jni: binder ptrdiff_t compile issues
parents dc500d2d 7423510c

core/jni/android_util_Binder.cpp

+2 −2
Original line number Diff line number Diff line
@@ -966,7 +966,7 @@ static bool push_eventlog_string(char** pos, const char* end, const char* str) { 
    jint len = strlen(str);

    int space_needed = 1 + sizeof(len) + len;

    if (end - *pos < space_needed) {

        ALOGW("not enough space for string. remain=%zd; needed=%d",

        ALOGW("not enough space for string. remain=%" PRIdPTR "; needed=%d",

             end - *pos, space_needed);

        return false;

    }
@@ -982,7 +982,7 @@ static bool push_eventlog_string(char** pos, const char* end, const char* str) { 
static bool push_eventlog_int(char** pos, const char* end, jint val) {

    int space_needed = 1 + sizeof(val);

    if (end - *pos < space_needed) {

        ALOGW("not enough space for int.  remain=%zd; needed=%d",

        ALOGW("not enough space for int.  remain=%" PRIdPTR "; needed=%d",

             end - *pos, space_needed);

        return false;

    }