Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c120b8e authored by Vladimir Marko's avatar Vladimir Marko Committed by android-build-merger
Browse files

Merge "Rename Binder.destroy() to Binder.destroyBinder()." am: a634b38c am: 1b4b3261

am: 17bb92fe

Change-Id: I08ab885e0b4373074e5eba3d36dcbb73c87458dc
parents 1f5c405c 17bb92fe
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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,
+3 −3
Original line number 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);
}

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