Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb189f14 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

system/core Replace cutils/log.h with android/log.h 

am: 66ce3e08

Change-Id: I20b6def8ee10f2017776024bb647deea0e073683
parents 0f76f040 66ce3e08

adf/libadfhwc/adfhwc.cpp

+3 −3
Original line number Diff line number Diff line
@@ -20,12 +20,12 @@ 
#include <pthread.h>

#include <sys/resource.h>



#include <android/log.h>

#include <utils/Vector.h>



#include <adf/adf.h>

#include <adfhwc/adfhwc.h>



#include <cutils/log.h>

#include <utils/Vector.h>



struct adf_hwc_helper {

    adf_hwc_event_callbacks const *event_cb;

    void *event_cb_data;

debuggerd/getevent.cpp

+9 −7
Original line number Diff line number Diff line
@@ -14,20 +14,22 @@ 
 * limitations under the License.

 */



#include <dirent.h>

#include <errno.h>

#include <fcntl.h>

#include <linux/input.h>

#include <stdint.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <stdint.h>

#include <dirent.h>

#include <fcntl.h>

#include <sys/ioctl.h>

#include <sys/inotify.h>

#include <sys/ioctl.h>

#include <sys/limits.h>

#include <sys/poll.h>

#include <linux/input.h>

#include <errno.h>



#include <memory>

#include <cutils/log.h>



#include <android/log.h>



static struct pollfd* ufds;

static char** device_names;

fingerprintd/fingerprintd.cpp

+5 −8
Original line number Diff line number Diff line
@@ -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"

gatekeeperd/gatekeeperd.cpp

+7 −10
Original line number Diff line number Diff line
@@ -19,25 +19,22 @@ 
#include "IGateKeeperService.h"



#include <errno.h>

#include <stdint.h>

#include <inttypes.h>

#include <fcntl.h>

#include <inttypes.h>

#include <stdint.h>

#include <unistd.h>



#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 <utils/Log.h>



#include <keystore/IKeystoreService.h>

#include <keystore/keystore.h> // For error code

#include <gatekeeper/password_handle.h> // for password_handle_t

#include <hardware/gatekeeper.h>

#include <hardware/hw_auth_token.h>

#include <keystore/IKeystoreService.h>

#include <keystore/keystore.h> // For error code

#include <utils/Log.h>

#include <utils/String16.h>



#include "SoftGateKeeperDevice.h"

#include "IUserManager.h"

include/utils/KeyedVector.h

+2 −3
Original line number Diff line number Diff line
@@ -21,11 +21,10 @@ 
#include <stdint.h>

#include <sys/types.h>



#include <cutils/log.h>



#include <android/log.h>

#include <utils/Errors.h>

#include <utils/SortedVector.h>

#include <utils/TypeHelpers.h>

#include <utils/Errors.h>



// ---------------------------------------------------------------------------