From c3fc1218af54a28023007d1e17d5598a850428e5 Mon Sep 17 00:00:00 2001
From: Santiago Seifert <aquilescanta@google.com>
Date: Wed, 10 Feb 2021 14:55:36 +0000
Subject: [PATCH] Assert parameters are non-null

Bug: 158743263
Bug: 179814446
Change-Id: Ia27012dbe01cb75dacf6c69edc8275de7aa799a5
Test: atest CtsMediaTestCases:android.media.cts.DrmInitDataTest
---
 media/java/android/media/DrmInitData.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/media/java/android/media/DrmInitData.java b/media/java/android/media/DrmInitData.java
index 85b4ba54de630..3c48f8f602df5 100644
--- a/media/java/android/media/DrmInitData.java
+++ b/media/java/android/media/DrmInitData.java
@@ -19,6 +19,7 @@ import android.annotation.NonNull;
 import android.media.MediaDrm;
 
 import java.util.Arrays;
+import java.util.Objects;
 import java.util.UUID;
 
 /**
@@ -94,9 +95,9 @@ public abstract class DrmInitData {
          * @param data The initialization data.
          */
         public SchemeInitData(@NonNull UUID uuid, @NonNull String mimeType, @NonNull byte[] data) {
-            this.uuid = uuid;
-            this.mimeType = mimeType;
-            this.data = data;
+            this.uuid = Objects.requireNonNull(uuid);
+            this.mimeType = Objects.requireNonNull(mimeType);
+            this.data = Objects.requireNonNull(data);
         }
 
         @Override