From 5efbcb4443e17f948a04d5f002f5fde1a452120a Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 4 Jan 2019 09:51:01 +0000
Subject: [PATCH] Fix nullness issue

PiperOrigin-RevId: 227822937
---
 .../android/exoplayer2/extractor/mp4/MdtaMetadataEntry.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntry.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntry.java
index 517a0a51d5..b458a8f0f4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntry.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntry.java
@@ -19,6 +19,7 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.metadata.Metadata;
+import com.google.android.exoplayer2.util.Util;
 import java.util.Arrays;
 
 /**
@@ -45,7 +46,7 @@ public final class MdtaMetadataEntry implements Metadata.Entry {
   }
 
   private MdtaMetadataEntry(Parcel in) {
-    key = in.readString();
+    key = Util.castNonNull(in.readString());
     value = new byte[in.readInt()];
     in.readByteArray(value);
     localeIndicator = in.readInt();