commit 0d0d0f03732f548e5d8182a06ab28535ab5ffddc
author Tom Cherry <tomcherry@google.com> Fri Aug 18 20:24:10 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Aug 18 20:24:10 2017 +0000
tree df61f7d9907e34efd7aa846393f7870a5fb8b201
parent 404bf6b583ca154af6f498afc090b1483a754575
parent 1b99daf95b57d4cbc3cfdabf1814dece4ed62836

Merge "init: only set ro.boottime.<service> properties once." am: fe0607575d am: a1a6826c59 am: a82cc92437
am: bc4a6c49d9

Change-Id: Ib7ae7cb1b93708f8302c48903cc89396d533f47a

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index c201ec9..6ab60e3 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -201,7 +201,10 @@
 
     if (new_state == "running") {
         uint64_t start_ns = time_started_.time_since_epoch().count();
-        property_set("ro.boottime." + name_, std::to_string(start_ns));
+        std::string boottime_property = "ro.boottime." + name_;
+        if (GetProperty(boottime_property, "").empty()) {
+            property_set(boottime_property, std::to_string(start_ns));
+        }
     }
 }