am 7d755a6f: Merge branch \'klp-modular-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev-plus-aosp

* commit '7d755a6f572dfcbe644bf3d92240cc45f8bf7dcc':
  jni: binder ptrdiff_t compile issues

1 files changed, 2 insertions, 2 deletions

diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp
index 5a053ed91ae9..662af895e04f 100644
--- a/core/jni/android_util_Binder.cpp
+++ b/core/jni/android_util_Binder.cpp
@@ -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;
     }