diff options
| author | Tom Cherry <tomcherry@google.com> | 2017-07-10 18:32:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-10 18:32:54 +0000 |
| commit | 4e5c4f18d8a0612b73396822fd23dfd82411c0f7 (patch) | |
| tree | 3dd41bd37928dcff4f9adc25ce0594b563fba147 /init/property_service.cpp | |
| parent | 2a064ca6e4f25417054f0452f16fc1233bc3fb98 (diff) | |
| parent | 7ff0b008f7e731048940622f3b7ea499bc0c0fc1 (diff) | |
| download | system_core-4e5c4f18d8a0612b73396822fd23dfd82411c0f7.tar.gz system_core-4e5c4f18d8a0612b73396822fd23dfd82411c0f7.tar.bz2 system_core-4e5c4f18d8a0612b73396822fd23dfd82411c0f7.zip | |
Merge "Move Timer from init to libbase" am: 896297b2ef
am: 7ff0b008f7
Change-Id: I3d1dd6eabbf17d701eefbf7363bfe6107d4de8a4
Diffstat (limited to 'init/property_service.cpp')
| -rw-r--r-- | init/property_service.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/init/property_service.cpp b/init/property_service.cpp index b7907e5ee..fd14bd66f 100644 --- a/init/property_service.cpp +++ b/init/property_service.cpp @@ -42,6 +42,7 @@ #include <queue> #include <vector> +#include <android-base/chrono_utils.h> #include <android-base/file.h> #include <android-base/logging.h> #include <android-base/properties.h> @@ -55,6 +56,8 @@ #include "init.h" #include "util.h" +using android::base::Timer; + #define PERSISTENT_PROPERTY_DIR "/data/property" #define RECOVERY_MOUNT_POINT "/recovery" @@ -350,7 +353,7 @@ class SocketConnection { while (*timeout_ms > 0) { Timer timer; int nr = poll(ufds, 1, *timeout_ms); - uint64_t millis = timer.duration_ms(); + uint64_t millis = timer.duration().count(); *timeout_ms = (millis > *timeout_ms) ? 0 : *timeout_ms - millis; if (nr > 0) { |