diff options
| author | Tom Cherry <tomcherry@google.com> | 2017-09-15 15:44:04 -0700 |
|---|---|---|
| committer | Tom Cherry <tomcherry@google.com> | 2017-09-19 09:56:31 -0700 |
| commit | a97faba653f1a900f74d0205e6e722427bb95968 (patch) | |
| tree | 56eab9d2c379ac95c6abc59950ff21691a9a78bc /init/property_service.cpp | |
| parent | 2fb5fa336bc93ba555642998a9d5becd333f1429 (diff) | |
| download | system_core-a97faba653f1a900f74d0205e6e722427bb95968.tar.gz system_core-a97faba653f1a900f74d0205e6e722427bb95968.tar.bz2 system_core-a97faba653f1a900f74d0205e6e722427bb95968.zip | |
init: use protobuf for serialization of persistent properties
I probably should have done this from the start... There's a shim to
convert my manually serialized format to protobuf, and since that has
not yet shipped, it'll be reverted in a short period of time.
Test: init unit tests
Test: upgrade from legacy and intermediate property formats successfully
Change-Id: Iad25f6c30d0b44d294230a53dd6876222d1c785b
Diffstat (limited to 'init/property_service.cpp')
| -rw-r--r-- | init/property_service.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/property_service.cpp b/init/property_service.cpp index 5f5ed400a..db2d47230 100644 --- a/init/property_service.cpp +++ b/init/property_service.cpp @@ -641,8 +641,8 @@ void load_persist_props(void) { load_override_properties(); /* Read persistent properties after all default values have been loaded. */ auto persistent_properties = LoadPersistentProperties(); - for (const auto& [name, value] : persistent_properties) { - property_set(name, value); + for (const auto& persistent_property_record : persistent_properties.properties()) { + property_set(persistent_property_record.name(), persistent_property_record.value()); } persistent_properties_loaded = true; property_set("ro.persistent_properties.ready", "true"); |