Merge "Rename Binder.destroy() to Binder.destroyBinder()." (1b4b3261) · Commits · e / os / android_frameworks_base

core/java/android/os/Binder.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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,

core/jni/android_util_Binder.cpp

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -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 }
	};		};