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

    protected void finalize() throws Throwable {

        try {

            destroy();

            destroyBinder();

        } finally {

            super.finalize();

        }

    }

    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,

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

    } 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.

    { "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 }

};