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

Commit 19babc24 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:... 

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

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



Change-Id: I0e7675d4b98d0655b05cf8b07e99379a03744757
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 55a9f701 be16e53e

cmds/servicemanager/main.cpp

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



    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*/);

libs/binder/include/binder/ProcessState.h

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

    void startThreadPool();



    bool becomeContextManager();

    [[nodiscard]] bool becomeContextManager();



    sp<IBinder> getStrongProxyForHandle(int32_t handle);

    void expungeHandle(int32_t handle, IBinder* binder);