diff options
| -rw-r--r-- | core/java/android/os/Binder.java | 4 | ||||
| -rw-r--r-- | core/jni/android_util_Binder.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/os/Binder.java b/core/java/android/os/Binder.java index 50a3f4c01051..65d05a804c31 100644 --- a/core/java/android/os/Binder.java +++ b/core/java/android/os/Binder.java @@ -529,7 +529,7 @@ public class Binder implements IBinder { protected void finalize() throws Throwable { try { - destroy(); + destroyBinder(); } finally { super.finalize(); } @@ -559,7 +559,7 @@ public class Binder implements IBinder { } private native final void init(); - private native final void destroy(); + private native final void destroyBinder(); // Entry point from android_util_Binder.cpp's onTransact private boolean execTransact(int code, long dataObj, long replyObj, diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp index 26b00344b789..e2aa17b32d0b 100644 --- a/core/jni/android_util_Binder.cpp +++ b/core/jni/android_util_Binder.cpp @@ -836,7 +836,7 @@ static void android_os_Binder_init(JNIEnv* env, jobject obj) env->SetLongField(obj, gBinderOffsets.mObject, (jlong)jbh); } -static void android_os_Binder_destroy(JNIEnv* env, jobject obj) +static void android_os_Binder_destroyBinder(JNIEnv* env, jobject obj) { JavaBBinderHolder* jbh = (JavaBBinderHolder*) env->GetLongField(obj, gBinderOffsets.mObject); @@ -847,7 +847,7 @@ static void android_os_Binder_destroy(JNIEnv* env, jobject obj) } else { // Encountering an uninitialized binder is harmless. All it means is that // the Binder was only partially initialized when its finalizer ran and called - // destroy(). The Binder could be partially initialized for several reasons. + // destroyBinder(). The Binder could be partially initialized for several reasons. // For example, a Binder subclass constructor might have thrown an exception before // it could delegate to its superclass's constructor. Consequently init() would // not have been called and the holder pointer would remain NULL. @@ -872,7 +872,7 @@ static const JNINativeMethod gBinderMethods[] = { { "getThreadStrictModePolicy", "()I", (void*)android_os_Binder_getThreadStrictModePolicy }, { "flushPendingCommands", "()V", (void*)android_os_Binder_flushPendingCommands }, { "init", "()V", (void*)android_os_Binder_init }, - { "destroy", "()V", (void*)android_os_Binder_destroy }, + { "destroyBinder", "()V", (void*)android_os_Binder_destroyBinder }, { "blockUntilThreadAvailable", "()V", (void*)android_os_Binder_blockUntilThreadAvailable } }; |