Address PR feedback

Author: markushi

sentry-android-core/src/main/java/io/sentry/android/core/AnrV2Integration.java

@@ -86,11 +86,7 @@ public void register(@NotNull IScopes scopes, @NotNull SentryOptions options) {
             .getExecutorService()
             .submit(
                 new ApplicationExitInfoHistoryDispatcher(
-                    context,
-                    scopes,
-                    this.options,
-                    dateProvider,
-                    new AnrV2Policy(scopes, this.options)));
+                    context, scopes, this.options, dateProvider, new AnrV2Policy(this.options)));
       } catch (Throwable e) {
         options.getLogger().log(SentryLevel.DEBUG, "Failed to start ANR processor.", e);
       }
@@ -109,11 +105,9 @@ public void close() throws IOException {
   private static final class AnrV2Policy
       implements ApplicationExitInfoHistoryDispatcher.ApplicationExitInfoPolicy {
 
-    private final @NotNull IScopes scopes;
     private final @NotNull SentryAndroidOptions options;
 
-    AnrV2Policy(final @NotNull IScopes scopes, final @NotNull SentryAndroidOptions options) {
-      this.scopes = scopes;
+    AnrV2Policy(final @NotNull SentryAndroidOptions options) {
       this.options = options;
     }
 

sentry-android-core/src/main/java/io/sentry/android/core/ApplicationExitInfoEventProcessor.java

@@ -810,12 +810,17 @@ private void setAnrExceptions(
     private void applyAnrProfile(
         @NotNull SentryEvent event, @NotNull Backfillable hint, boolean isBackgroundAnr) {
 
-      // Skip background ANRs (profiling only runs in foreground)
+      // Skip background ANRs (as profiling only runs in foreground)
       if (isBackgroundAnr) {
         return;
       }
 
-      // Get timestamp from hint (ANR hints implement AbnormalExit which has timestamp())
+      final String cacheDirPath = options.getCacheDirPath();
+      if (cacheDirPath == null) {
+        return;
+      }
+      final File cacheDir = new File(cacheDirPath);
+
       if (!(hint instanceof AbnormalExit)) {
         return;
       }
@@ -827,13 +832,6 @@ private void applyAnrProfile(
         anrTimestamp = event.getTimestamp().getTime();
       }
 
-      // Read profile from disk
-      final String cacheDirPath = options.getCacheDirPath();
-      if (cacheDirPath == null) {
-        return;
-      }
-      final File cacheDir = new File(cacheDirPath);
-
       AnrProfile anrProfile = null;
       try {
         final File lastFile = AnrProfileRotationHelper.getLastFile(cacheDir);
@@ -857,14 +855,12 @@ private void applyAnrProfile(
         return;
       }
 
-      // Validate timestamp
       options.getLogger().log(SentryLevel.INFO, "ANR profile found");
       if (anrTimestamp < anrProfile.startTimeMs || anrTimestamp > anrProfile.endtimeMs) {
         options.getLogger().log(SentryLevel.DEBUG, "ANR profile found, but doesn't match");
         return;
       }
 
-      // Identify culprit
       final AggregatedStackTrace culprit = AnrCulpritIdentifier.identify(anrProfile.stacks);
       if (culprit == null) {
         return;
@@ -873,7 +869,6 @@ private void applyAnrProfile(
       // Capture profile chunk
       final SentryId profilerId = captureAnrProfile(anrTimestamp, anrProfile);
 
-      // Set exceptions with culprit
       final StackTraceElement[] stack = culprit.getStack();
       if (stack.length > 0) {
         final StackTraceElement stackTraceElement = stack[0];
@@ -882,7 +877,14 @@ private void applyAnrProfile(
         final AnrException exception = new AnrException(message);
         exception.setStackTrace(stack);
 
-        event.setExceptions(sentryExceptionFactory.getSentryExceptions(exception));
+        final @NotNull List<SentryException> sentryException =
+            sentryExceptionFactory.getSentryExceptions(exception);
+        for (final @NotNull SentryException e : sentryException) {
+          final Mechanism mechanism = new Mechanism();
+          mechanism.setType("ANR");
+          e.setMechanism(mechanism);
+        }
+        event.setExceptions(sentryException);
 
         if (profilerId != null) {
           event.getContexts().setProfile(new ProfileContext(profilerId));

sentry-android-core/src/main/java/io/sentry/android/core/anr/AnrProfilingIntegration.java

@@ -54,10 +54,6 @@ public void register(final @NotNull IScopes scopes, final @NotNull SentryOptions
             "SentryAndroidOptions is required");
     this.logger = options.getLogger();
 
-    if (this.options == null) {
-      return;
-    }
-
     if (((SentryAndroidOptions) options).isEnableAnrProfiling()) {
       addIntegrationToSdkVersion("AnrProfiling");
       AppState.getInstance().addAppStateListener(this);
@@ -151,7 +147,7 @@ protected void checkMainThread(final @NotNull Thread mainThread) throws IOExcept
     final long now = SystemClock.uptimeMillis();
     final long diff = now - lastMainThreadExecutionTime;
 
-    if (diff < 1000) {
+    if (diff < THRESHOLD_SUSPICION_MS) {
       mainThreadState = MainThreadState.IDLE;
     }
 

sentry-android-core/src/main/java/io/sentry/android/core/anr/StackTraceConverter.java

@@ -141,7 +141,6 @@ private static SentryStackFrame createSentryStackFrame(@NotNull StackTraceElemen
     frame.setFunction(element.getMethodName());
     frame.setModule(element.getClassName());
     frame.setLineno(element.getLineNumber() > 0 ? element.getLineNumber() : null);
-    frame.setInApp(true);
     if (element.isNativeMethod()) {
       frame.setNative(true);
     }