From 1772050ecea73022c1a5de4d8353b3a94704081c Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Fri, 24 Jan 2025 03:53:05 -0800
Subject: [PATCH] Remove confusing `null` from `ParserException.getMessage()`

When reading quickly this suggests something 'real' was null (similar to
a `NullPointerException`), but it's actually just the message from the
superclass.

Seen in stack trace in Issue: androidx/media#2074:

```
Caused by: androidx.media3.common.ParserException: null {contentIsMalformed=true, dataType=1}
```

PiperOrigin-RevId: 719240235
---
 .../main/java/androidx/media3/common/ParserException.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/common/src/main/java/androidx/media3/common/ParserException.java b/libraries/common/src/main/java/androidx/media3/common/ParserException.java
index ee4c74d51f..08dc3c997b 100644
--- a/libraries/common/src/main/java/androidx/media3/common/ParserException.java
+++ b/libraries/common/src/main/java/androidx/media3/common/ParserException.java
@@ -109,11 +109,11 @@ protected ParserException(
     this.dataType = dataType;
   }
 
-  @Nullable
   @Override
   public String getMessage() {
-    return super.getMessage()
-        + " {contentIsMalformed="
+    String superMessage = super.getMessage();
+    return (superMessage != null ? superMessage + " " : "")
+        + "{contentIsMalformed="
         + contentIsMalformed
         + ", dataType="
         + dataType