ref(session): Clear the unhandled marker for any terminal status

update() only cleared hasNonTerminatingUnhandledError for Crashed, so an ANR
arriving after a non-terminating unhandled error left the marker set on an
Abnormal session and serialized it into previous_session.json. The marker only
decides how an Ok session is finalized, so any explicit terminal status clears
it now.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: buenaflor

sentry/src/main/java/io/sentry/Session.java

@@ -213,8 +213,8 @@ public boolean hasNonTerminatingUnhandledError() {
   /**
    * Records that an active session experienced an unhandled error which did not terminate the
    * process, counting the error and advancing the session's sequence without ending it. On {@link
-   * #end()} the session is finalized as {@link State#Unhandled} unless a crash escalated it to
-   * {@link State#Crashed} first.
+   * #end()} the session is finalized as {@link State#Unhandled} unless a terminal status such as
+   * {@link State#Crashed} or {@link State#Abnormal} took over first.
    *
    * <p>Hybrid SDKs whose unhandled errors do not kill the process. Native Java/Android capture
    * should not call this.
@@ -310,8 +310,9 @@ public boolean update(
       boolean sessionHasBeenUpdated = false;
       if (status != null) {
         this.status = status;
-        // a crash terminates the process, so it takes precedence over a non-terminating one.
-        if (status == State.Crashed) {
+        // the flag only decides how an Ok session is finalized, so an explicit terminal status
+        // such as a crash or an ANR takes precedence over a non-terminating error.
+        if (status != State.Ok) {
           hasNonTerminatingUnhandledError = false;
         }
         sessionHasBeenUpdated = true;

sentry/src/test/java/io/sentry/cache/EnvelopeCacheTest.kt

@@ -373,7 +373,7 @@ class EnvelopeCacheTest {
       )
     assertEquals(State.Abnormal, updatedSession!!.status)
     assertEquals("abnormal_mechanism", updatedSession.abnormalMechanism)
-    assertTrue(updatedSession.hasNonTerminatingUnhandledError())
+    assertFalse(updatedSession.hasNonTerminatingUnhandledError())
   }
 
   @Test

sentry/src/test/java/io/sentry/protocol/SessionSerializationTest.kt

@@ -39,8 +39,8 @@ class SessionSerializationTest {
     /**
      * An unhandled session cannot be built by mutating [getSut]: the flag is only reachable through
      * [Session.recordNonTerminatingUnhandledError], which no-ops unless the session is still `Ok`,
-     * and a crash would clear it again. Ending on a fixed timestamp keeps `seq` and `duration`
-     * deterministic.
+     * and a terminal status would clear it again. Ending on a fixed timestamp keeps `seq` and
+     * `duration` deterministic.
      */
     fun getUnhandledSut() =
       Session(