From 6e751c35c78af953a441a30d0c6a28024ec77e45 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Wed, 22 Jul 2020 11:37:44 +0100
Subject: [PATCH] Enable nullness checking for DefaultMediaClock

PiperOrigin-RevId: 322542289
---
 .../com/google/android/exoplayer2/DefaultMediaClock.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/DefaultMediaClock.java b/library/core/src/main/java/com/google/android/exoplayer2/DefaultMediaClock.java
index 5700964967..6276f3bca8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/DefaultMediaClock.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/DefaultMediaClock.java
@@ -16,6 +16,7 @@
 package com.google.android.exoplayer2;
 
 import androidx.annotation.Nullable;
+import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Clock;
 import com.google.android.exoplayer2.util.MediaClock;
 import com.google.android.exoplayer2.util.StandaloneMediaClock;
@@ -133,7 +134,9 @@ import com.google.android.exoplayer2.util.StandaloneMediaClock;
 
   @Override
   public long getPositionUs() {
-    return isUsingStandaloneClock ? standaloneClock.getPositionUs() : rendererClock.getPositionUs();
+    return isUsingStandaloneClock
+        ? standaloneClock.getPositionUs()
+        : Assertions.checkNotNull(rendererClock).getPositionUs();
   }
 
   @Override
@@ -160,6 +163,9 @@ import com.google.android.exoplayer2.util.StandaloneMediaClock;
       }
       return;
     }
+    // We are either already using the renderer clock or switching from the standalone to the
+    // renderer clock, so it must be non-null.
+    MediaClock rendererClock = Assertions.checkNotNull(this.rendererClock);
     long rendererClockPositionUs = rendererClock.getPositionUs();
     if (isUsingStandaloneClock) {
       // Ensure enabling the renderer clock doesn't jump backwards in time.