Merge "close file in PersistentDataBlockService jni"

        if (fd < 0)

            return 0;

        return get_block_device_size(fd);

        const uint64_t size = get_block_device_size(fd);

        close(fd);

        return size;

    }

    static int com_android_server_PersistentDataBlockService_wipe(JNIEnv *env, jclass, jstring jpath) {

        if (fd < 0)

            return 0;

        return wipe_block_device(fd);

        const int ret = wipe_block_device(fd);

        close(fd);

        return ret;

    }

    static const JNINativeMethod sMethods[] = {