From 68ef1d3e97cbb45a34c83d1faf787a7da0d9134b Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 20 Mar 2019 21:35:20 +0000
Subject: [PATCH] Temporarily disable cache UID creation.

PiperOrigin-RevId: 239476751
---
 .../exoplayer2/upstream/cache/Cache.java      |  3 +++
 .../upstream/cache/SimpleCache.java           | 21 ++++++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
index c477c87952..c673768a7a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
@@ -77,6 +77,9 @@ public interface Cache {
       super(cause);
     }
 
+    public CacheException(String message, Throwable cause) {
+      super(message, cause);
+    }
   }
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index 3e0d06ea12..b7440e531c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -557,16 +557,18 @@ public final class SimpleCache implements Cache {
   private void initialize() {
     if (!cacheDir.exists()) {
       if (!cacheDir.mkdirs()) {
-        initializationException =
-            new CacheException("Failed to create cache directory: " + cacheDir);
+        String message = "Failed to create cache directory: " + cacheDir;
+        Log.e(TAG, message);
+        initializationException = new CacheException(message);
         return;
       }
     }
 
     File[] files = cacheDir.listFiles();
     if (files == null) {
-      initializationException =
-          new CacheException("Failed to list cache directory files: " + cacheDir);
+      String message = "Failed to list cache directory files: " + cacheDir;
+      Log.e(TAG, message);
+      initializationException = new CacheException(message);
       return;
     }
 
@@ -575,8 +577,11 @@ public final class SimpleCache implements Cache {
       try {
         uid = createUid(cacheDir);
       } catch (IOException e) {
-        initializationException = new CacheException("Failed to create cache UID: " + cacheDir);
-        return;
+        String message = "Failed to create cache UID: " + cacheDir;
+        Log.e(TAG, message, e);
+        // TODO: Reinstate this only when a database index is used [Internal ref: b/128933265].
+        // initializationException = new CacheException(message, e);
+        // return;
       }
     }
 
@@ -591,7 +596,9 @@ public final class SimpleCache implements Cache {
         loadDirectory(cacheDir, /* isRoot= */ true, files, /* fileMetadata= */ null);
       }
     } catch (IOException e) {
-      initializationException = new CacheException(e);
+      String message = "Failed to initialize cache indices: " + cacheDir;
+      Log.e(TAG, message, e);
+      initializationException = new CacheException(message, e);
       return;
     }