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

am 73258630: Merge "jni: binder 64-bit compile issues"

Browse Source 
* commit '7325863013e5c34d493e4e92ecadf4fea87554e7':
  jni: binder 64-bit compile issues
This commit is contained in:
Mark Salyzyn
2014-04-17 22:57:25 +00:00
committed by Android Git Automerger
parent f0aa4cc0f2 7325863013
commit 4037847c02
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/jni/android_util_Binder.cpp
View File

@@ -23,6 +23,7 @@
#include "JNIHelp.h" #include "JNIHelp.h"
#include <fcntl.h> #include <fcntl.h>
#include <inttypes.h>
#include <stdio.h> #include <stdio.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
@@ -334,7 +335,7 @@ public:
if (b == NULL) { if (b == NULL) {
b = new JavaBBinder(env, obj); b = new JavaBBinder(env, obj);
mBinder = b; mBinder = b;
ALOGV("Creating JavaBinder %p (refs %p) for Object %p, weakCount=%d\n", ALOGV("Creating JavaBinder %p (refs %p) for Object %p, weakCount=%" PRId32 "\n",
b.get(), b->getWeakRefs(), obj, b->getWeakRefs()->getWeakCount()); b.get(), b->getWeakRefs(), obj, b->getWeakRefs()->getWeakCount());
} }
@@ -697,9 +698,9 @@ void signalExceptionForError(JNIEnv* env, jobject obj, status_t err,
"Not allowed to write file descriptors here"); "Not allowed to write file descriptors here");
break; break;
default: default:
ALOGE("Unknown binder error code. 0x%x", err); ALOGE("Unknown binder error code. 0x%" PRIx32, err);
String8 msg; String8 msg;
msg.appendFormat("Unknown binder error code. 0x%x", err); msg.appendFormat("Unknown binder error code. 0x%" PRIx32, err);
// RemoteException is a checked exception, only throw from certain methods. // RemoteException is a checked exception, only throw from certain methods.
jniThrowException(env, canThrowRemoteException jniThrowException(env, canThrowRemoteException
? "android/os/RemoteException" : "java/lang/RuntimeException", msg.string()); ? "android/os/RemoteException" : "java/lang/RuntimeException", msg.string());
@@ -733,7 +734,7 @@ static void android_os_Binder_restoreCallingIdentity(JNIEnv* env, jobject clazz,
if (uid > 0 && uid < 999) { if (uid > 0 && uid < 999) {
// In Android currently there are no uids in this range. // In Android currently there are no uids in this range.
char buf[128]; char buf[128];
sprintf(buf, "Restoring bad calling ident: 0x%Lx", token); sprintf(buf, "Restoring bad calling ident: 0x%" PRIx64, token);
jniThrowException(env, "java/lang/IllegalStateException", buf); jniThrowException(env, "java/lang/IllegalStateException", buf);
return; return;
} }
@@ -965,8 +966,8 @@ static bool push_eventlog_string(char** pos, const char* end, const char* str) {
jint len = strlen(str); jint len = strlen(str);
int space_needed = 1 + sizeof(len) + len; int space_needed = 1 + sizeof(len) + len;
if (end - *pos < space_needed) { if (end - *pos < space_needed) {
ALOGW("not enough space for string. remain=%d; needed=%d", ALOGW("not enough space for string. remain=%zd; needed=%d",
(end - *pos), space_needed); end - *pos, space_needed);
return false; return false;
} }
**pos = EVENT_TYPE_STRING; **pos = EVENT_TYPE_STRING;
@@ -981,8 +982,8 @@ 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) { static bool push_eventlog_int(char** pos, const char* end, jint val) {
int space_needed = 1 + sizeof(val); int space_needed = 1 + sizeof(val);
if (end - *pos < space_needed) { if (end - *pos < space_needed) {
ALOGW("not enough space for int. remain=%d; needed=%d", ALOGW("not enough space for int. remain=%zd; needed=%d",
(end - *pos), space_needed); end - *pos, space_needed);
return false; return false;
} }
**pos = EVENT_TYPE_INT; **pos = EVENT_TYPE_INT;
@@ -1068,7 +1069,7 @@ static jboolean android_os_BinderProxy_transact(JNIEnv* env, jobject obj,
return JNI_FALSE; return JNI_FALSE;
} }
ALOGV("Java code calling transact on %p in Java object %p with code %d\n", ALOGV("Java code calling transact on %p in Java object %p with code %" PRId32 "\n",
target, obj, code); target, obj, code);
#if ENABLE_BINDER_SAMPLE #if ENABLE_BINDER_SAMPLE