Change API signature from plural to singular.

am: 91117eddbf

Change-Id: I5cbb52025890a4967007d496c0d87e8dd980d151

4 files changed, 14 insertions, 12 deletions

diff --git a/disaster_recovery/disaster_recovery.cc b/disaster_recovery/disaster_recovery.cc
index b6e6326..b995182 100644
--- a/disaster_recovery/disaster_recovery.cc
+++ b/disaster_recovery/disaster_recovery.cc
@@ -30,7 +30,7 @@ int main(int argc, char**) {
   // should always be enabled in release.
   // Code for reading the flag will be removed before release.
   // tracking bug: b/119627143
-  std::string flag_value = server_configurable_flags::GetServerConfigurableFlags(
+  std::string flag_value = server_configurable_flags::GetServerConfigurableFlag(
       "global_settings", "native_flags_health_check_enabled", "1");
   if (flag_value == "1") {
     LOG(INFO) << "Starting server configurable flags health check.";
diff --git a/libflags/include/server_configurable_flags/get_flags.h b/libflags/include/server_configurable_flags/get_flags.h
index 26fc431..c0d0a25 100644
--- a/libflags/include/server_configurable_flags/get_flags.h
+++ b/libflags/include/server_configurable_flags/get_flags.h
@@ -23,8 +23,10 @@ namespace server_configurable_flags {
 // Use the category name and flag name registered in SettingsToPropertiesMapper.java
 // to query the experiment flag value. This method will return default_value if
 // querying fails.
-std::string GetServerConfigurableFlags(const std::string& experiment_category_name,
-                                       const std::string& experiment_flag_name,
-                                       const std::string& default_value);
+// Note that for flags from Settings.Global, experiment_category_name should
+// always be global_settings.
+std::string GetServerConfigurableFlag(const std::string& experiment_category_name,
+                                      const std::string& experiment_flag_name,
+                                      const std::string& default_value);
 
 }  // namespace server_configurable_flags
diff --git a/libflags/server_configurable_flags.cc b/libflags/server_configurable_flags.cc
index c422621..9f845b0 100644
--- a/libflags/server_configurable_flags.cc
+++ b/libflags/server_configurable_flags.cc
@@ -99,9 +99,9 @@ void ServerConfigurableFlagsReset() {
 #endif  // __BIONIC__
 }
 
-std::string GetServerConfigurableFlags(const std::string& experiment_category_name,
-                                       const std::string& experiment_flag_name,
-                                       const std::string& default_value) {
+std::string GetServerConfigurableFlag(const std::string& experiment_category_name,
+                                      const std::string& experiment_flag_name,
+                                      const std::string& default_value) {
   if (!ValidateExperimentSegment(experiment_category_name)) {
     LOG(ERROR) << __FUNCTION__ << " invalid category name " << experiment_category_name;
     return default_value;
diff --git a/libflags/server_configurable_flags_test.cc b/libflags/server_configurable_flags_test.cc
index c3509cd..6be44e2 100644
--- a/libflags/server_configurable_flags_test.cc
+++ b/libflags/server_configurable_flags_test.cc
@@ -36,14 +36,14 @@ static bool contains(std::vector<std::string>& vec, std::string& str) {
 
 TEST(server_configurable_flags, empty_flag_returns_default) {
   std::string result =
-      server_configurable_flags::GetServerConfigurableFlags("category", "flag", "default");
+      server_configurable_flags::GetServerConfigurableFlag("category", "flag", "default");
   ASSERT_EQ("default", result);
 }
 
 TEST(server_configurable_flags, set_flag_returns_value) {
   android::base::SetProperty("persist.device_config.category.flag", "hello");
   std::string result =
-      server_configurable_flags::GetServerConfigurableFlags("category", "flag", "default");
+      server_configurable_flags::GetServerConfigurableFlag("category", "flag", "default");
   ASSERT_EQ("hello", result);
 
   // clean up
@@ -52,13 +52,13 @@ TEST(server_configurable_flags, set_flag_returns_value) {
 
 TEST(server_configurable_flags, invalid_flag_returns_default) {
   std::string result =
-      server_configurable_flags::GetServerConfigurableFlags("category.", "flag", "default");
+      server_configurable_flags::GetServerConfigurableFlag("category.", "flag", "default");
   ASSERT_EQ("default", result);
 
-  result = server_configurable_flags::GetServerConfigurableFlags("category", "!flag", "default");
+  result = server_configurable_flags::GetServerConfigurableFlag("category", "!flag", "default");
   ASSERT_EQ("default", result);
 
-  result = server_configurable_flags::GetServerConfigurableFlags("category", ".flag", "default");
+  result = server_configurable_flags::GetServerConfigurableFlag("category", ".flag", "default");
   ASSERT_EQ("default", result);
 }