commit 522059dbe7d5fc18958c38405d14bcb6aad102f0
author The Android Automerger <android-build@google.com> Sat May 23 01:07:07 2015 -0700
committer The Android Automerger <android-build@google.com> Sat May 23 01:07:07 2015 -0700
tree 7bfeda8ca0017760e4b9014a54b2572bbd6269ea
parent 286836e94f8eac342a4eca6f1300f1942776d890
parent 8ebbc9f023eec756808731bfcfc9dc3327adc10d

merge in mnc-release history after reset to mnc-dev

fingerprintd/IFingerprintDaemon.cpp

diff --git a/fingerprintd/IFingerprintDaemon.cpp b/fingerprintd/IFingerprintDaemon.cpp
index 1120979..5f9d30c 100644
--- a/fingerprintd/IFingerprintDaemon.cpp
+++ b/fingerprintd/IFingerprintDaemon.cpp
@@ -16,7 +16,6 @@
 
 #include <inttypes.h>
 
-#include <android_runtime/AndroidRuntime.h>
 #include <binder/IPCThreadState.h>
 #include <binder/IServiceManager.h>
 #include <binder/PermissionCache.h>

init/util.cpp

diff --git a/init/util.cpp b/init/util.cpp
index df4c25f..b3947f7 100644
--- a/init/util.cpp
+++ b/init/util.cpp
@@ -366,10 +366,10 @@
 int wait_for_file(const char *filename, int timeout)
 {
     struct stat info;
-    time_t timeout_time = gettime() + timeout;
+    uint64_t timeout_time_ns = gettime_ns() + timeout * UINT64_C(1000000000);
     int ret = -1;
 
-    while (gettime() < timeout_time && ((ret = stat(filename, &info)) < 0))
+    while (gettime_ns() < timeout_time_ns && ((ret = stat(filename, &info)) < 0))
         usleep(10000);
 
     return ret;