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

Commit 1edb3ada authored by Devin Moore's avatar Devin Moore Committed by Android (Google) Code Review
Browse files

Merge "Add DUMP_FLAG_PROTO to libbinder_ndk" into main

parents 8d900636 ebfb6bb1

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

+4 −0
Original line number Diff line number Diff line
@@ -30,10 +30,14 @@ enum AServiceManager_AddServiceFlag : uint32_t { 
     * not be added with this flag for privacy concerns.

     */

    ADD_SERVICE_ALLOW_ISOLATED = 1 << 0,

    /**

     * Allows services to dump sections according to priorities and format

     */

    ADD_SERVICE_DUMP_FLAG_PRIORITY_CRITICAL = 1 << 1,

    ADD_SERVICE_DUMP_FLAG_PRIORITY_HIGH = 1 << 2,

    ADD_SERVICE_DUMP_FLAG_PRIORITY_NORMAL = 1 << 3,

    ADD_SERVICE_DUMP_FLAG_PRIORITY_DEFAULT = 1 << 4,

    ADD_SERVICE_DUMP_FLAG_PROTO = 1 << 5,

    // All other bits are reserved for internal usage

};

libs/binder/ndk/service_manager.cpp

+3 −0
Original line number Diff line number Diff line
@@ -63,6 +63,9 @@ binder_exception_t AServiceManager_addServiceWithFlags(AIBinder* binder, const c 
    if (flags & AServiceManager_AddServiceFlag::ADD_SERVICE_DUMP_FLAG_PRIORITY_DEFAULT) {

        dumpFlags |= IServiceManager::DUMP_FLAG_PRIORITY_DEFAULT;

    }

    if (flags & AServiceManager_AddServiceFlag::ADD_SERVICE_DUMP_FLAG_PROTO) {

        dumpFlags |= IServiceManager::DUMP_FLAG_PROTO;

    }

    if (dumpFlags == 0) {

        dumpFlags = IServiceManager::DUMP_FLAG_PRIORITY_DEFAULT;

    }