From 6380f26a7fee54a77c24d8234de92672e65aea0c Mon Sep 17 00:00:00 2001 From: danarapagna Date: Fri, 30 Mar 2018 15:48:06 -0700 Subject: [PATCH] Temp fix for b/77315136: Don't lock or check cache directories in SimpleCache To be immediately rolled back after submission Submitting on behalf of cblay. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=191128111 --- demos/main/src/main/proguard-rules.txt | 7 ------ .../upstream/cache/SimpleCache.java | 4 ---- .../upstream/cache/SimpleCacheTest.java | 22 +++++++++---------- 3 files changed, 11 insertions(+), 22 deletions(-) delete mode 100644 demos/main/src/main/proguard-rules.txt diff --git a/demos/main/src/main/proguard-rules.txt b/demos/main/src/main/proguard-rules.txt deleted file mode 100644 index cd201892ab..0000000000 --- a/demos/main/src/main/proguard-rules.txt +++ /dev/null @@ -1,7 +0,0 @@ -# Proguard rules specific to the main demo app. - -# Constructor accessed via reflection in PlayerActivity --dontnote com.google.android.exoplayer2.ext.ima.ImaAdsLoader --keepclassmembers class com.google.android.exoplayer2.ext.ima.ImaAdsLoader { - (android.content.Context, android.net.Uri); -} 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 c53f04eb10..98c1fc97f7 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 @@ -93,10 +93,6 @@ public final class SimpleCache implements Cache { * @param index The CachedContentIndex to be used. */ /*package*/ SimpleCache(File cacheDir, CacheEvictor evictor, CachedContentIndex index) { - if (!lockFolder(cacheDir)) { - throw new IllegalStateException("Another SimpleCache instance uses the folder: " + cacheDir); - } - this.cacheDir = cacheDir; this.evictor = evictor; this.index = index; diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java index 15e2b80f59..a35a86f933 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java @@ -296,17 +296,17 @@ public class SimpleCacheTest { } } - @Test - public void testMultipleSimpleCacheWithSameCacheDirThrowsException() throws Exception { - new SimpleCache(cacheDir, new NoOpCacheEvictor()); - - try { - new SimpleCache(cacheDir, new NoOpCacheEvictor()); - assertWithMessage("Exception was expected").fail(); - } catch (IllegalStateException e) { - // Expected. Do nothing. - } - } + // @Test + // public void testMultipleSimpleCacheWithSameCacheDirThrowsException() throws Exception { + // new SimpleCache(cacheDir, new NoOpCacheEvictor()); + // + // try { + // new SimpleCache(cacheDir, new NoOpCacheEvictor()); + // assertWithMessage("Exception was expected").fail(); + // } catch (IllegalStateException e) { + // // Expected. Do nothing. + // } + // } @Test public void testMultipleSimpleCacheWithSameCacheDirDoesNotThrowsExceptionAfterRelease()