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

Merge "Rename Binder.destroy() to Binder.destroyBinder()."

Browse Source 
am: a634b38c8e

Change-Id: I5d80b7a76f1d9b3d7bfc152994551f0cd6defaba
This commit is contained in:
Vladimir Marko
2017-06-23 10:45:32 +00:00
committed by android-build-merger
parent 3205ff1331 a634b38c8e
commit 1b4b326128
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/os/Binder.java
View File

@@ -529,7 +529,7 @@ public class Binder implements IBinder {
protected void finalize() throws Throwable { protected void finalize() throws Throwable {
try { try {
destroy(); destroyBinder();
} finally { } finally {
super.finalize(); super.finalize();
} }
@@ -559,7 +559,7 @@ public class Binder implements IBinder {
} }
private native final void init(); private native final void init();
private native final void destroy(); private native final void destroyBinder();
// Entry point from android_util_Binder.cpp's onTransact // Entry point from android_util_Binder.cpp's onTransact
private boolean execTransact(int code, long dataObj, long replyObj, private boolean execTransact(int code, long dataObj, long replyObj,

6
core/jni/android_util_Binder.cpp
View File

@@ -836,7 +836,7 @@ static void android_os_Binder_init(JNIEnv* env, jobject obj)
env->SetLongField(obj, gBinderOffsets.mObject, (jlong)jbh); 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*) JavaBBinderHolder* jbh = (JavaBBinderHolder*)
env->GetLongField(obj, gBinderOffsets.mObject); env->GetLongField(obj, gBinderOffsets.mObject);
@@ -847,7 +847,7 @@ static void android_os_Binder_destroy(JNIEnv* env, jobject obj)
} else { } else {
// Encountering an uninitialized binder is harmless. All it means is that // Encountering an uninitialized binder is harmless. All it means is that
// the Binder was only partially initialized when its finalizer ran and called // 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 // For example, a Binder subclass constructor might have thrown an exception before
// it could delegate to its superclass's constructor. Consequently init() would // it could delegate to its superclass's constructor. Consequently init() would
// not have been called and the holder pointer would remain NULL. // 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 }, { "getThreadStrictModePolicy", "()I", (void*)android_os_Binder_getThreadStrictModePolicy },
{ "flushPendingCommands", "()V", (void*)android_os_Binder_flushPendingCommands }, { "flushPendingCommands", "()V", (void*)android_os_Binder_flushPendingCommands },
{ "init", "()V", (void*)android_os_Binder_init }, { "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 } { "blockUntilThreadAvailable", "()V", (void*)android_os_Binder_blockUntilThreadAvailable }
}; };