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

Commit c0a17d2d authored by Pawan Wagh's avatar Pawan Wagh Committed by Automerger Merge Worker
Browse files

Merge "servicemanager : Adding clear API to ServiceManager" am: 00a54e41 am:... 

Merge "servicemanager : Adding clear API to ServiceManager" am: 00a54e41 am: 77527d1c am: 1c1f4122 am: 6eef6394 am: 296c7366

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



Change-Id: Ia0f50c43c40f8b6ae2c0485b1dc9b5ca123bf0e6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f59b7639 296c7366

cmds/servicemanager/ServiceManager.cpp

+6 −0
Original line number Diff line number Diff line
@@ -762,4 +762,10 @@ Status ServiceManager::getServiceDebugInfo(std::vector<ServiceDebugInfo>* outRet 
    return Status::ok();

}



void ServiceManager::clear() {

    mNameToService.clear();

    mNameToRegistrationCallback.clear();

    mNameToClientCallback.clear();

}



}  // namespace android

cmds/servicemanager/ServiceManager.h

+6 −0
Original line number Diff line number Diff line
@@ -58,6 +58,12 @@ public: 
    void binderDied(const wp<IBinder>& who) override;

    void handleClientCallbacks();



    /**

     *  This API is added for debug purposes. It clears members which hold service and callback

     * information.

     */

    void clear();



protected:

    virtual void tryStartService(const std::string& name);

cmds/servicemanager/ServiceManagerFuzzer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { 
    auto accessPtr = std::make_unique<Access>();

    auto serviceManager = sp<ServiceManager>::make(std::move(accessPtr));

    fuzzService(serviceManager, FuzzedDataProvider(data, size));

    serviceManager->clear();



    return 0;

}