Issue 4231 - Fix unstable FilterEngineTest.testSetRemoveFilterChangeCallback

libadblockplus-android/jni/JniCallbacks.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 37 matching lines @@
 void JniCallbackBase::LogException(JNIEnv* env, jthrowable throwable) const
 {
   jmethodID logMethod = env->GetStaticMethodID(
     exceptionHandlerClass->Get(), "logException", "(Ljava/lang/Throwable;)V");
   if (logMethod)
   {
     env->CallStaticVoidMethod(exceptionHandlerClass->Get(), logMethod, throwable);
   }
 }
 
-void JniCallbackBase::CheckAndLogJavaException(JNIEnv* env) const
+bool JniCallbackBase::CheckAndLogJavaException(JNIEnv* env) const

[sergei, 2017/08/07 12:49:59]

Is it an unrelated change?

 {
   if (env->ExceptionCheck())
   {
     JniLocalReference<jthrowable> throwable(env, env->ExceptionOccurred());
     env->ExceptionClear();
     LogException(env, *throwable);
+
+    return true;
   }
+  return false;
 }