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

Commit bb278d36 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 am: e35bec4f

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

Change-Id: I3f89e7e70258bcf4102e81b82f4bbc2764ca406c
parents 980da58a e35bec4f

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