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

Commit 1eed181f 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:... 

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

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



Change-Id: I3fb3aee72a68798377b976321f493f3a073a9fa5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 516a2820 5e798728

init/service_list.cpp

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

ServiceList::ServiceList() {}





ServiceList& ServiceList::GetInstance() {

ServiceList& ServiceList::GetInstance() {

    static ServiceList instance;

    static ServiceList* instance = new ServiceList;

    return instance;

    return *instance;

}

}





size_t ServiceList::CheckAllCommands() {

size_t ServiceList::CheckAllCommands() {