From 91764baa90cc493aef77212b0756c02ec57aecbd Mon Sep 17 00:00:00 2001
From: rohks <rohks@google.com>
Date: Mon, 21 Aug 2023 15:32:24 +0100
Subject: [PATCH] Add nullness annotations to `SimpleCache`

#fixit

PiperOrigin-RevId: 558783228
---
 .../androidx/media3/datasource/cache/SimpleCache.java    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/libraries/datasource/src/main/java/androidx/media3/datasource/cache/SimpleCache.java b/libraries/datasource/src/main/java/androidx/media3/datasource/cache/SimpleCache.java
index 44dde6ce66..493736a176 100644
--- a/libraries/datasource/src/main/java/androidx/media3/datasource/cache/SimpleCache.java
+++ b/libraries/datasource/src/main/java/androidx/media3/datasource/cache/SimpleCache.java
@@ -652,7 +652,8 @@ public final class SimpleCache implements Cache {
       updateFile = true;
     }
     SimpleCacheSpan newSpan =
-        contentIndex.get(key).setLastTouchTimestamp(span, lastTouchTimestamp, updateFile);
+        Assertions.checkNotNull(contentIndex.get(key))
+            .setLastTouchTimestamp(span, lastTouchTimestamp, updateFile);
     notifySpanTouched(span, newSpan);
     return newSpan;
   }
@@ -673,7 +674,7 @@ public final class SimpleCache implements Cache {
     }
     while (true) {
       SimpleCacheSpan span = cachedContent.getSpan(position, length);
-      if (span.isCached && span.file.length() != span.length) {
+      if (span.isCached && Assertions.checkNotNull(span.file).length() != span.length) {
         // The file has been modified or deleted underneath us. It's likely that other files will
         // have been modified too, so scan the whole in-memory representation.
         removeStaleSpans();
@@ -701,7 +702,7 @@ public final class SimpleCache implements Cache {
     }
     totalSpace -= span.length;
     if (fileIndex != null) {
-      String fileName = span.file.getName();
+      String fileName = Assertions.checkNotNull(span.file).getName();
       try {
         fileIndex.remove(fileName);
       } catch (IOException e) {
@@ -722,7 +723,7 @@ public final class SimpleCache implements Cache {
     ArrayList<CacheSpan> spansToBeRemoved = new ArrayList<>();
     for (CachedContent cachedContent : contentIndex.getAll()) {
       for (CacheSpan span : cachedContent.getSpans()) {
-        if (span.file.length() != span.length) {
+        if (Assertions.checkNotNull(span.file).length() != span.length) {
           spansToBeRemoved.add(span);
         }
       }