diff options
| author | Justin DeMartino <jjdemartino@google.com> | 2020-10-14 19:39:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-14 19:39:53 +0000 |
| commit | 0d11af03e43f110b0bb160f7e20436d0043e3038 (patch) | |
| tree | 48f8bcca856276ec73a86dd3fb26143d3ca64578 /libutils/SystemClock.cpp | |
| parent | 075666ebd0dee8d0c4a2efa54f7c324a3f67ee2a (diff) | |
| parent | a6c01e4e98d2b343dcecfc99611e2e6250c730db (diff) | |
Merge changes from topic "SP1A.200921.001" into s-keystone-qcom-dev
* changes:
fs_mgr: adb-remount-test.sh: filter out more administrivia mounts.
Merge SP1A.200921.001 Change-Id: I90b97c4e9fb10b1f45e74def404823eed5b1aaa8
Diffstat (limited to 'libutils/SystemClock.cpp')
| -rw-r--r-- | libutils/SystemClock.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libutils/SystemClock.cpp b/libutils/SystemClock.cpp index 73ec1be96..9c71141f2 100644 --- a/libutils/SystemClock.cpp +++ b/libutils/SystemClock.cpp @@ -39,8 +39,15 @@ namespace android { */ int64_t uptimeMillis() { - int64_t when = systemTime(SYSTEM_TIME_MONOTONIC); - return (int64_t) nanoseconds_to_milliseconds(when); + return nanoseconds_to_milliseconds(uptimeNanos()); +} + +/* + * public static native long uptimeNanos(); + */ +int64_t uptimeNanos() +{ + return systemTime(SYSTEM_TIME_MONOTONIC); } /* |