diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-19 17:36:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-19 17:36:48 +0000 |
| commit | 9d8c7089db8a253cbbe3c36aac6255d09a46a8c7 (patch) | |
| tree | b3bb4676418d3b49a300b9d86f3c8a5d6b9b0e06 /cmds/incidentd/src | |
| parent | 6c9b1f8f8597fc6075dbe502b479c8317873c4c4 (diff) | |
| parent | 813760c9548320eb93c7b3fa4522e7ac20882c37 (diff) | |
Merge "Always use a positive value for timestamp" am: bfe66d9800 am: e7fad0b026 am: 813760c954
Change-Id: Ie39f191b994ebdf9ed19a919e54cf3e42e1d7774
Diffstat (limited to 'cmds/incidentd/src')
| -rw-r--r-- | cmds/incidentd/src/WorkDirectory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/incidentd/src/WorkDirectory.cpp b/cmds/incidentd/src/WorkDirectory.cpp index 7e7c6421e23f..9963533c08ac 100644 --- a/cmds/incidentd/src/WorkDirectory.cpp +++ b/cmds/incidentd/src/WorkDirectory.cpp @@ -666,7 +666,7 @@ int64_t WorkDirectory::make_timestamp_ns_locked() { clock_gettime(CLOCK_REALTIME, &spec); timestampNs = int64_t(spec.tv_sec) * 1000 + spec.tv_nsec; } while (file_exists_locked(timestampNs)); - return timestampNs; + return (timestampNs >= 0)? timestampNs : -timestampNs; } /** |