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

Commit 6ba33c09 authored by Kelly Rossmoyer's avatar Kelly Rossmoyer Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" am: e859848f am: e5da315d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1378577

Change-Id: I3463b8081b05f431f95f0477f64558d6c9797615
parents f2f4e95b e5da315d

cmds/statsd/src/config/ConfigManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ void ConfigManager::Startup() { 
}



void ConfigManager::StartupForTest() {

    // Dummy function to avoid reading configs from disks for tests.

    // No-op function to avoid reading configs from disks for tests.

}



void ConfigManager::AddListener(const sp<ConfigListener>& listener) {

cmds/statsd/src/config/ConfigManager.h

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ public: 
    void Startup();



    /*

     * Dummy initializer for tests.

     * No-op initializer for tests.

     */

    void StartupForTest();