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

Commit 137f8ff5 authored by Zach Johnson's avatar Zach Johnson
Browse files

Copy in the jni exception logging macros from android_runtime 

Bug: 143971120
Test: compile, boot, and check things that invoke callbacks (like discovery) still work
Change-Id: I64a73ce817560d19ce60478c8fb64199e8a7cf68
parent 602f4c1c

android/app/jni/com_android_bluetooth.h

+1 −3
Original line number Original line Diff line number Diff line
@@ -18,12 +18,10 @@ 
#ifndef COM_ANDROID_BLUETOOTH_H

#ifndef COM_ANDROID_BLUETOOTH_H

#define COM_ANDROID_BLUETOOTH_H

#define COM_ANDROID_BLUETOOTH_H





#include <nativehelper/JNIHelp.h>

#include "android_runtime/AndroidRuntime.h"

#include "android_runtime/Log.h"

#include "hardware/bluetooth.h"

#include "hardware/bluetooth.h"

#include "hardware/hardware.h"

#include "hardware/hardware.h"

#include "jni.h"

#include "jni.h"

#include "jni_logging.h"

#include "nativehelper/ScopedLocalRef.h"

#include "nativehelper/ScopedLocalRef.h"

#include "utils/Log.h"

#include "utils/Log.h"

android/app/jni/jni_logging.h

0 → 100644
+31 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

#pragma once



#include <nativehelper/JNIHelp.h>



/* Logging macros imported from android_runtime/Log.h

 *

 * Logs an exception.  If the exception is omitted or NULL, logs the current

 * exception from the JNI environment, if any.

 */

#define LOG_EX(env, priority, tag, ...) \

  jniLogException(env, ANDROID_##priority, tag, ##__VA_ARGS__)

#define LOGV_EX(env, ...) LOG_EX(env, LOG_VERBOSE, LOG_TAG, ##__VA_ARGS__)

#define LOGD_EX(env, ...) LOG_EX(env, LOG_DEBUG, LOG_TAG, ##__VA_ARGS__)

#define LOGI_EX(env, ...) LOG_EX(env, LOG_INFO, LOG_TAG, ##__VA_ARGS__)

#define LOGW_EX(env, ...) LOG_EX(env, LOG_WARN, LOG_TAG, ##__VA_ARGS__)

#define LOGE_EX(env, ...) LOG_EX(env, LOG_ERROR, LOG_TAG, ##__VA_ARGS__)