Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update language to comply with Android's inclusive language guidance" am: e859848f9f am: e5da315dd7 am: 6ba33c095c

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

Change-Id: I5aa60a3cec72ee834e8914390e8fa15d2064690f
This commit is contained in:
Kelly Rossmoyer
2020-07-29 23:45:40 +00:00
committed by Automerger Merge Worker
parent 45c4df598c 6ba33c095c
commit e9a5aca11d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/statsd/src/config/ConfigManager.cpp
View File

@@ -128,7 +128,7 @@ void ConfigManager::Startup() {
} }
void ConfigManager::StartupForTest() { 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) { void ConfigManager::AddListener(const sp<ConfigListener>& listener) {

2
cmds/statsd/src/config/ConfigManager.h
View File

@@ -46,7 +46,7 @@ public:
void Startup(); void Startup();
/* /*
* Dummy initializer for tests. * No-op initializer for tests.
*/ */
void StartupForTest(); void StartupForTest();