Refactor

Author: oleavr

lib/android.js

@@ -458,14 +458,15 @@ function _getApi () {
     temporaryApi.artRuntime = artRuntime;
     const runtimeSpec = getArtRuntimeSpec(temporaryApi);
     const runtimeOffset = runtimeSpec.offset;
-    const instrumentationOffset = runtimeOffset.instrumentation;
-    temporaryApi.artInstrumentation = (instrumentationOffset !== null) ? artRuntime.add(instrumentationOffset) : null;
 
-    // todo: figure out better detection of https://android.googlesource.com/platform/art/+/17c7ed2de734cf892b005b1d15b3db9855506f14
+    const instrumentationOffset = runtimeOffset.instrumentation;
+    let artInstrumentation = (instrumentationOffset !== null) ? artRuntime.add(instrumentationOffset) : null;
+    // TODO: Figure out better detection of https://android.googlesource.com/platform/art/+/17c7ed2de734cf892b005b1d15b3db9855506f14
     const instrumentationIsPointer = apiLevel > 35;
-    if (instrumentationIsPointer && temporaryApi.artInstrumentation != null) {
-      temporaryApi.artInstrumentation = temporaryApi.artInstrumentation.readPointer();
+    if (instrumentationIsPointer && artInstrumentation !== null) {
+      artInstrumentation = artInstrumentation.readPointer();
     }
+    temporaryApi.artInstrumentation = artInstrumentation;
 
     temporaryApi.artHeap = artRuntime.add(runtimeOffset.heap).readPointer();
     temporaryApi.artThreadList = artRuntime.add(runtimeOffset.threadList).readPointer();