diff options
| author | Alex Vakulenko <avakulenko@google.com> | 2016-04-21 19:22:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-21 19:22:18 +0000 |
| commit | b140a8f1d48312cf98f4bc20346e42e15f43fd3e (patch) | |
| tree | cd2296e55306daea485131b575e1e1bd6b31dfed /buffet/buffet_config.cc | |
| parent | 5294050be48f9650e95d5fc74af3962538e62503 (diff) | |
| parent | b1601f6b51ad88045b9f3e083cf3fe65b63d8742 (diff) | |
| download | weaved-b140a8f1d48312cf98f4bc20346e42e15f43fd3e.tar.gz | |
weaved: Fix LocalAccessEnabled flags to reflect changes in libweave am: ebd4538fe7
am: b1601f6b51
* commit 'b1601f6b51ad88045b9f3e083cf3fe65b63d8742':
weaved: Fix LocalAccessEnabled flags to reflect changes in libweave
Change-Id: I336871419ba2c7f48dcfb355a6114fc26ffd3075
Diffstat (limited to 'buffet/buffet_config.cc')
| -rw-r--r-- | buffet/buffet_config.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/buffet/buffet_config.cc b/buffet/buffet_config.cc index 16672f6..942cd3c 100644 --- a/buffet/buffet_config.cc +++ b/buffet/buffet_config.cc @@ -60,8 +60,7 @@ const char kName[] = "name"; const char kDescription[] = "description"; const char kLocation[] = "location"; const char kLocalAnonymousAccessRole[] = "local_anonymous_access_role"; -const char kLocalDiscoveryEnabled[] = "local_discovery_enabled"; -const char kLocalPairingEnabled[] = "local_pairing_enabled"; +const char kLocalAccessEnabled[] = "local_access_enabled"; const char kOemName[] = "oem_name"; const char kModelName[] = "model_name"; const char kModelId[] = "model_id"; @@ -149,10 +148,8 @@ bool BuffetConfig::LoadDefaults(const brillo::KeyValueStore& store, if (!StringToEnum(role_str, &settings->local_anonymous_access_role)) return false; } - store.GetBoolean(config_keys::kLocalDiscoveryEnabled, - &settings->local_discovery_enabled); - store.GetBoolean(config_keys::kLocalPairingEnabled, - &settings->local_pairing_enabled); + store.GetBoolean(config_keys::kLocalAccessEnabled, + &settings->local_access_enabled); store.GetBoolean(config_keys::kAllowEndpointsOverride, &settings->allow_endpoints_override); return true; |