Skip to content
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.

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

Improve error message when android.os.Build class missing #2598

Merged
merged 1 commit into from
Jan 2, 2024
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@ class AndroidBuildMirror(
*/
fun fromHeapGraph(graph: HeapGraph): AndroidBuildMirror {
return graph.context.getOrPut(AndroidBuildMirror::class.java.name) {
val buildClass = graph.findClassByName("android.os.Build")!!
// checkNotNull for more helpful message than NPE if this isn't an Android hprof.
// Not doing checkNotNull for other classes, if android.os.Build is there it's definitely
// an Android heap dump.
val buildClass = checkNotNull(graph.findClassByName("android.os.Build")) {
"android.os.Build class missing from heap dump, is this an Android heap dump?"
}
val versionClass = graph.findClassByName("android.os.Build\$VERSION")!!
val manufacturer = buildClass["MANUFACTURER"]!!.value.readAsJavaString()!!
val sdkInt = versionClass["SDK_INT"]!!.value.asInt!!
Expand Down