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

Commit ecd659ed authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "mark AIBinder_Class_setHandleShellCommand as weak." am: 377164ac 

Change-Id: Id84a8112456569a581610fc8d2d53b219267f3e9
parents 49a46bc3 377164ac

libs/binder/ndk/include_ndk/android/binder_interface_utils.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -238,7 +238,9 @@ AIBinder_Class* ICInterface::defineClass(const char* interfaceDescriptor, 
    // ourselves. The defaults are harmless.

    // ourselves. The defaults are harmless.

    AIBinder_Class_setOnDump(clazz, ICInterfaceData::onDump);

    AIBinder_Class_setOnDump(clazz, ICInterfaceData::onDump);

#ifdef HAS_BINDER_SHELL_COMMAND

#ifdef HAS_BINDER_SHELL_COMMAND

    if (AIBinder_Class_setHandleShellCommand != nullptr) {

        AIBinder_Class_setHandleShellCommand(clazz, ICInterfaceData::handleShellCommand);

        AIBinder_Class_setHandleShellCommand(clazz, ICInterfaceData::handleShellCommand);

    }

#endif

#endif

    return clazz;

    return clazz;

}

}

libs/binder/ndk/include_platform/android/binder_shell.h

+2 −3
Original line number Original line Diff line number Diff line
@@ -48,8 +48,7 @@ typedef binder_status_t (*AIBinder_handleShellCommand)(AIBinder* binder, int in, 
 * \param handleShellCommand function to call when a shell transaction is

 * \param handleShellCommand function to call when a shell transaction is

 * received

 * received

 */

 */

void AIBinder_Class_setHandleShellCommand(AIBinder_Class* clazz,

__attribute__((weak)) void AIBinder_Class_setHandleShellCommand(

                                          AIBinder_handleShellCommand handleShellCommand)

        AIBinder_Class* clazz, AIBinder_handleShellCommand handleShellCommand) __INTRODUCED_IN(30);

        __INTRODUCED_IN(30);





__END_DECLS
 
__END_DECLS