Merge "init: Do not invoke the ServiceList destructor when exiting" am: dfc88362b1 am: 701f00fd4c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2328595 Change-Id: I50ea5b87a0abfe81d7cc09261b61d78d3671fb91 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
5e798728dd
1 changed files with 2 additions and 2 deletions
|
|
@ -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() {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue