Commit 05a98a7b by olly Committed by Oliver Woodman

Code shrinking doesn't like Class.super.defaultMethodName

Just not doing it seems simplier and more obviously correct
than suppressing the warnings in our proguard file.

Issue: #4890

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=217675527
parent 86fdcb08
...@@ -23,6 +23,7 @@ import com.google.android.exoplayer2.util.Log; ...@@ -23,6 +23,7 @@ import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -261,9 +262,7 @@ public final class DefaultDataSource implements DataSource { ...@@ -261,9 +262,7 @@ public final class DefaultDataSource implements DataSource {
@Override @Override
public Map<String, List<String>> getResponseHeaders() { public Map<String, List<String>> getResponseHeaders() {
return dataSource == null return dataSource == null ? Collections.emptyMap() : dataSource.getResponseHeaders();
? DataSource.super.getResponseHeaders()
: dataSource.getResponseHeaders();
} }
@Override @Override
......
...@@ -34,6 +34,7 @@ import java.io.InterruptedIOException; ...@@ -34,6 +34,7 @@ import java.io.InterruptedIOException;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -367,7 +368,7 @@ public final class CacheDataSource implements DataSource { ...@@ -367,7 +368,7 @@ public final class CacheDataSource implements DataSource {
// TODO: Implement. // TODO: Implement.
return isReadingFromUpstream() return isReadingFromUpstream()
? upstreamDataSource.getResponseHeaders() ? upstreamDataSource.getResponseHeaders()
: DataSource.super.getResponseHeaders(); : Collections.emptyMap();
} }
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment