Skip to content

fix(cache): Do not throw NPE when reading ANR marker #4979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
romtsn merged 4 commits into from
Dec 22, 2025
+2 −1
Merged

fix(cache): Do not throw NPE when reading ANR marker #4979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
49abaf3
fix(cache): Do not throw NPE when reading ANR marker
romtsn Dec 22, 2025
0ab57bc
Changelog
romtsn Dec 22, 2025
6feeedc
Merge branch 'main' into rz/fix/npe-anr-marker
romtsn Dec 22, 2025
830884e
Merge branch 'main' into rz/fix/npe-anr-marker
romtsn Dec 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
- Fix ANRs when collecting device context ([#4970](https://github.com/getsentry/sentry-java/pull/4970))
- **IMPORTANT:** This disables collecting external storage size (total/free) by default, to enable it back
use `options.isCollectExternalStorageContext = true` or `<meta-data android:name="io.sentry.external-storage-context" android:value="true" />`
- Fix `NullPointerException` when reading ANR marker ([#4979](https://github.com/getsentry/sentry-java/pull/4979))

### Improvements

Expand Down
2 changes: 1 addition & 1 deletion sentry-android-core/src/main/java/io/sentry/android/core/cache/AndroidEnvelopeCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ public static boolean hasStartupCrashMarker(final @NotNull SentryOptions options
final String content = FileUtils.readText(lastAnrMarker);
// we wrapped into try-catch already
//noinspection ConstantConditions
return content.equals("null") ? null : Long.parseLong(content.trim());
return (content == null || content.equals("null")) ? null : Long.parseLong(content.trim());
} catch (Throwable e) {
if (e instanceof FileNotFoundException) {
options
Expand Down
Loading