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

Merge "Merge "Rename Binder.destroy() to Binder.destroyBinder()." am: a634b38c8e am: 1b4b326128 am: 17bb92fe14" into oc-dr1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2017-06-23 12:46:05 +00:00
committed by Android (Google) Code Review
parent bcda5a74b7 8c120b8eb5
commit 3ec8fd13f8
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

@@ -623,7 +623,7 @@ public class Binder implements IBinder {
protected void finalize() throws Throwable {
try {
destroy();
destroyBinder();
} finally {
super.finalize();
}
@@ -653,7 +653,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,

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