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

Commit e669e0b6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "servicemanager: log if doesn't become ctx mgr" am: 26f7a100 am: c0fd0904 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2582977



Change-Id: I84093fe7342f562afd9fc07e2206230becbc90b0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5b1dd98d c0fd0904

cmds/servicemanager/main.cpp

+4 −1
Original line number Original line Diff line number Diff line
@@ -131,7 +131,10 @@ int main(int argc, char** argv) { 
    }

    }





    IPCThreadState::self()->setTheContextObject(manager);

    IPCThreadState::self()->setTheContextObject(manager);

    ps->becomeContextManager();

    if (!ps->becomeContextManager()) {

        LOG(ERROR) << "Could not become context manager";

        // TODO(b/280514080): fatal

    }





    sp<Looper> looper = Looper::prepare(false /*allowNonCallbacks*/);

    sp<Looper> looper = Looper::prepare(false /*allowNonCallbacks*/);

libs/binder/include/binder/ProcessState.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -55,7 +55,7 @@ public: 
    // For main functions - dangerous for libraries to use

    // For main functions - dangerous for libraries to use

    void startThreadPool();

    void startThreadPool();





    bool becomeContextManager();

    [[nodiscard]] bool becomeContextManager();





    sp<IBinder> getStrongProxyForHandle(int32_t handle);

    sp<IBinder> getStrongProxyForHandle(int32_t handle);

    void expungeHandle(int32_t handle, IBinder* binder);

    void expungeHandle(int32_t handle, IBinder* binder);