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

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

Merge "jni: move security interfaces to private" am: 07bc1ee7 am: 82df72dc am: ab9b60ef 

am: ceb123bf

Change-Id: I0260dec12bff1313521d604130099b5546a42944
parents 5a54b5df ceb123bf

core/jni/android_app_admin_SecurityLog.cpp

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

#include "core_jni_helpers.h"

#include "jni.h"

#include "log/logger.h"

#include <private/android_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/android_util_EventLog.cpp

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

#include "core_jni_helpers.h"

#include "jni.h"

#include "log/logger.h"

#include <log/logger.h>



#define UNUSED  __attribute__((__unused__))