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

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

Merge "init: Do not invoke the ServiceList destructor when exiting" am: dfc88362 am: 701f00fd 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2328595



Change-Id: I50ea5b87a0abfe81d7cc09261b61d78d3671fb91
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 30e29e2e 701f00fd

init/service_list.cpp

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ namespace init { 
ServiceList::ServiceList() {}



ServiceList& ServiceList::GetInstance() {

    static ServiceList instance;

    return instance;

    static ServiceList* instance = new ServiceList;

    return *instance;

}



size_t ServiceList::CheckAllCommands() {