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

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

Browse Source
This commit is contained in:
Michael Kolb
2014-04-18 00:48:20 +00:00
committed by Android Git Automerger
parent d42eeab20f c5aa56872d
commit 7d755a6f57
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/jni/android_util_Binder.cpp
View File

@@ -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;
}