Merge branch 'master' of github.com:getsentry/sentry-android into fea…

…t/in_app_prefix

sentry-core/src/main/java/io/sentry/core/SentryStackTraceFactory.java

@@ -28,16 +28,15 @@ List<SentryStackFrame> getStackFrames(@Nullable final StackTraceElement[] elemen
 
     if (elements != null) {
       for (StackTraceElement item : elements) {
-        SentryStackFrame sentryStackFrame = new SentryStackFrame();
-
-        // https://docs.sentry.io/development/sdk-dev/features/#in-app-frames
-        sentryStackFrame.setInApp(isInApp(item.getClassName()));
-        sentryStackFrame.setModule(item.getClassName());
-        sentryStackFrame.setFunction(item.getMethodName());
-        sentryStackFrame.setFilename(item.getFileName());
-        sentryStackFrame.setLineno(item.getLineNumber());
-        sentryStackFrame.setNative(item.isNativeMethod());
-
+        if (item != null) {
+          SentryStackFrame sentryStackFrame = new SentryStackFrame();
+          // https://docs.sentry.io/development/sdk-dev/features/#in-app-frames
+          sentryStackFrame.setInApp(isInApp(item.getClassName()));
+          sentryStackFrame.setModule(item.getClassName());
+          sentryStackFrame.setFunction(item.getMethodName());
+          sentryStackFrame.setFilename(item.getFileName());
+          sentryStackFrame.setLineno(item.getLineNumber());
+          sentryStackFrame.setNative(item.isNativeMethod());
           sentryStackFrames.add(sentryStackFrame);
         }
       }

sentry-core/src/main/java/io/sentry/core/SentryThreadFactory.java

@@ -3,7 +3,6 @@
 import io.sentry.core.protocol.SentryStackFrame;
 import io.sentry.core.protocol.SentryStackTrace;
 import io.sentry.core.protocol.SentryThread;
-import io.sentry.core.util.Nullable;
 import io.sentry.core.util.Objects;
 import java.util.ArrayList;
 import java.util.List;