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

Commit eb632544 authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge "replace cutils/logger.h with log/logger.h"

parents c81891c1 44bc1866

core/jni/android_net_TrafficStats.cpp

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <sys/types.h>



#include <android_runtime/AndroidRuntime.h>

#include <cutils/logger.h>

#include <jni.h>

#include <ScopedUtfChars.h>

#include <utils/misc.h>

core/jni/android_os_Parcel.cpp

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include <utils/SystemClock.h>

#include <utils/List.h>

#include <utils/KeyedVector.h>

#include <cutils/logger.h>

#include <binder/Parcel.h>

#include <binder/ProcessState.h>

#include <binder/IServiceManager.h>

core/jni/android_util_Binder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include <utils/SystemClock.h>

#include <utils/List.h>

#include <utils/KeyedVector.h>

#include <cutils/logger.h>

#include <log/logger.h>

#include <binder/Parcel.h>

#include <binder/ProcessState.h>

#include <binder/IServiceManager.h>

core/jni/android_util_EventLog.cpp

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include "JNIHelp.h"

#include "android_runtime/AndroidRuntime.h"

#include "jni.h"

#include "cutils/logger.h"

#include "log/logger.h"



// The size of the tag number comes out of the payload size.

#define MAX_EVENT_PAYLOAD (LOGGER_ENTRY_MAX_PAYLOAD - sizeof(int32_t))

core/jni/com_android_internal_net_NetworkStatsFactory.cpp

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <sys/types.h>



#include <android_runtime/AndroidRuntime.h>

#include <cutils/logger.h>

#include <jni.h>



#include <ScopedUtfChars.h>