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

Commit e35bec4f 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 am: 6ba33c09 am: e9a5aca1

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

Change-Id: I2c5ec07b9ac4f3c49c002f7d0ea4044316928644
parents 77376b2f e9a5aca1

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();