handle SIGABRT only on API level > 25

execute SIGABRT test only for API level > 25

Author: vtrifonov

test-app/app/src/main/assets/app/tests/exceptionHandlingTests.js

@@ -337,20 +337,20 @@ describe("Tests exception handling ", function () {
 	    expect(errMsg).toContain("Cannot compile /data/data/com.tns.testapplication/files/app/tests/syntaxErrors.js");
 	    expect(errMsg).toContain("SyntaxError: Unexpected token =");
 	    expect(errMsg).toContain("File: \"file:///data/data/com.tns.testapplication/files/app/tests/syntaxErrors.js, line: 3, column: 10");
-
-
-
 	});
 
-	it("Should handle SIGABRT and throw a NativeScript exception when incorrectly calling JNI methods", function () {
-        let myClassInstance = new com.tns.tests.MyTestBaseClass3();
-        // public void callMeWithAString(java.lang.String[] stringArr, Runnable arbitraryInterface)
-        try {
-            myClassInstance.callMeWithAString("stringVal", new java.lang.Runnable({ run: () => {} }))
-        } catch (e) {
-            android.util.Log.d("~~~~~", "~~~~~~~~ " + e.toString());
-
-            expect(e.toString()).toContain("SIGABRT");
-        }
-    });
+    // run this test only for API level bigger than 25 as we have handling there
+    if(android.os.Build.VERSION.SDK_INT > 25) {
+        it("Should handle SIGABRT and throw a NativeScript exception when incorrectly calling JNI methods", function () {
+            let myClassInstance = new com.tns.tests.MyTestBaseClass3();
+            // public void callMeWithAString(java.lang.String[] stringArr, Runnable arbitraryInterface)
+            try {
+                myClassInstance.callMeWithAString("stringVal", new java.lang.Runnable({ run: () => {} }))
+            } catch (e) {
+                android.util.Log.d("~~~~~", "~~~~~~~~ " + e.toString());
+
+                expect(e.toString()).toContain("SIGABRT");
+            }
+        });
+    }
 });

test-app/runtime/src/main/cpp/Runtime.cpp

@@ -53,14 +53,29 @@ void Runtime::Init(JavaVM* vm, void* reserved) {
         JEnv::Init(s_jvm);
     }
 
-    // handle SIGABRT
-    struct sigaction action;
-    action.sa_handler = SIGABRT_handler;
-    sigaction(SIGABRT, &action, NULL);
+    if(m_androidVersion > 25) {
+        // handle SIGABRT only on API level > 25 as the handling is not so efficient in older versions
+        struct sigaction action;
+        action.sa_handler = SIGABRT_handler;
+        sigaction(SIGABRT, &action, NULL);
+    }
 
     DEBUG_WRITE("JNI_ONLoad END");
 }
 
+int Runtime::GetAndroidVersion() {
+    char sdkVersion[PROP_VALUE_MAX];
+    __system_property_get("ro.build.version.sdk", sdkVersion);
+
+    stringstream strValue;
+    strValue << sdkVersion;
+
+    unsigned int intValue;
+    strValue >> intValue;
+
+    return intValue;
+}
+
 Runtime::Runtime(JNIEnv* env, jobject runtime, int id)
     : m_env(env), m_id(id), m_isolate(nullptr), m_lastUsedMemory(0), m_gcFunc(nullptr), m_runGC(false) {
     m_runtime = m_env.NewGlobalRef(runtime);
@@ -403,15 +418,11 @@ Isolate* Runtime::PrepareV8Runtime(const string& filesPath, const string& native
 
     m_startupData = new StartupData();
 
-    // Retrieve the device android Sdk version
-    char sdkVersion[PROP_VALUE_MAX];
-    __system_property_get("ro.build.version.sdk", sdkVersion);
-
     void* snapshotPtr = nullptr;
     string snapshotPath;
 
     // If device isn't running on Sdk 17
-    if (strcmp(sdkVersion, string("17").c_str()) != 0) {
+    if (m_androidVersion != 17) {
         snapshotPath = "libsnapshot.so";
     } else {
         // If device is running on android Sdk 17
@@ -664,3 +675,4 @@ map<int, Runtime*> Runtime::s_id2RuntimeCache;
 map<Isolate*, Runtime*> Runtime::s_isolate2RuntimesCache;
 bool Runtime::s_mainThreadInitialized = false;
 v8::Platform* Runtime::platform = nullptr;
+int Runtime::m_androidVersion = Runtime::GetAndroidVersion();

test-app/runtime/src/main/cpp/Runtime.h

@@ -85,6 +85,8 @@ class Runtime {
 
         v8::Isolate* PrepareV8Runtime(const std::string& filesPath, const std::string& nativeLibsDir, const std::string& packageName, bool isDebuggable, const std::string& callingDir, const std::string& profilerOutputDir);
         jobject ConvertJsValueToJavaObject(JEnv& env, const v8::Local<v8::Value>& value, int classReturnType);
+        static int GetAndroidVersion();
+        static int m_androidVersion;
 
         static std::map<int, Runtime*> s_id2RuntimeCache;
 
@@ -95,8 +97,6 @@ class Runtime {
         static jmethodID GET_USED_MEMORY_METHOD_ID;
 
         static bool s_mainThreadInitialized;
-
-
 };
 }