summaryrefslogtreecommitdiffstats
path: root/fingerprintd/fingerprintd.cpp
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2016-09-28 10:07:20 -0700
committerMark Salyzyn <salyzyn@google.com>2016-09-30 12:47:05 -0700
commit66ce3e08c5632a20ea66bde6dd76397041edf034 (patch)
treee77589e0f6c62e8ac1c8faabe2d9dd2934d3ecee /fingerprintd/fingerprintd.cpp
parent0dd4431072cce3c62876b728cb20aa5b77b11a8d (diff)
downloadsystem_core-66ce3e08c5632a20ea66bde6dd76397041edf034.tar.gz
system_core-66ce3e08c5632a20ea66bde6dd76397041edf034.tar.bz2
system_core-66ce3e08c5632a20ea66bde6dd76397041edf034.zip
system/core Replace cutils/log.h with android/log.h
Should use android/log.h instead of cutils/log.h as a good example to all others. Adjust header order to comply with Android Coding standards. Test: Compile Bug: 26552300 Bug: 31289077 Change-Id: I2c9cbbbd64d8dccf2d44356361d9742e4a9b9031
Diffstat (limited to 'fingerprintd/fingerprintd.cpp')
-rw-r--r--fingerprintd/fingerprintd.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/fingerprintd/fingerprintd.cpp b/fingerprintd/fingerprintd.cpp
index 8fa7ed18e..05109b7d1 100644
--- a/fingerprintd/fingerprintd.cpp
+++ b/fingerprintd/fingerprintd.cpp
@@ -16,20 +16,17 @@
#define LOG_TAG "fingerprintd"
-#include <cutils/log.h>
-#include <utils/Log.h>
-
+#include <android/log.h>
#include <binder/IPCThreadState.h>
#include <binder/IServiceManager.h>
#include <binder/PermissionCache.h>
-#include <utils/String16.h>
-
-#include <keystore/IKeystoreService.h>
-#include <keystore/keystore.h> // for error codes
-
#include <hardware/hardware.h>
#include <hardware/fingerprint.h>
#include <hardware/hw_auth_token.h>
+#include <keystore/IKeystoreService.h>
+#include <keystore/keystore.h> // for error codes
+#include <utils/Log.h>
+#include <utils/String16.h>
#include "FingerprintDaemonProxy.h"