Skip to content

SDK / exoplayer

Go to a project
Commit 81c37698 by tonihei Committed by Oliver Woodman
Options

Add missing @Nullable to equals implementations. 

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=195947382
parent a962f2d4
Inline Side-by-side
Showing with 72 additions and 43 deletions
extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
*/ */
package com.google.android.exoplayer2.ext.cast; package com.google.android.exoplayer2.ext.cast;
import android.support.annotation.Nullable;
import android.util.SparseIntArray; import android.util.SparseIntArray;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.Timeline;
...@@ -110,7 +111,7 @@ import java.util.Map; ...@@ -110,7 +111,7 @@ import java.util.Map;
// equals and hashCode implementations. // equals and hashCode implementations.
@Override @Override
public boolean equals(Object other) { public boolean equals(@Nullable Object other) {
if (this == other) { if (this == other) {
return true; return true;
} else if (!(other instanceof CastTimeline)) { } else if (!(other instanceof CastTimeline)) {
......
extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java
...@@ -170,7 +170,7 @@ public class OkHttpDataSource implements HttpDataSource { ...@@ -170,7 +170,7 @@ public class OkHttpDataSource implements HttpDataSource {
// Check for a valid response code. // Check for a valid response code.
if (!response.isSuccessful()) { if (!response.isSuccessful()) {
Map<String, List<String>> headers = response.headers().toMultimap(); Map<String, List<String>> headers = request.headers().toMultimap();
closeConnectionQuietly(); closeConnectionQuietly();
InvalidResponseCodeException exception = new InvalidResponseCodeException( InvalidResponseCodeException exception = new InvalidResponseCodeException(
responseCode, headers, dataSpec); responseCode, headers, dataSpec);
......
library/core/src/main/java/com/google/android/exoplayer2/PlaybackParameters.java
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
*/ */
package com.google.android.exoplayer2; package com.google.android.exoplayer2;
import android.support.annotation.Nullable;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
/** /**
...@@ -87,7 +88,7 @@ public final class PlaybackParameters { ...@@ -87,7 +88,7 @@ public final class PlaybackParameters {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/RendererConfiguration.java
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
*/ */
package com.google.android.exoplayer2; package com.google.android.exoplayer2;
import android.support.annotation.Nullable;
/** /**
* The configuration of a {@link Renderer}. * The configuration of a {@link Renderer}.
*/ */
...@@ -41,7 +43,7 @@ public final class RendererConfiguration { ...@@ -41,7 +43,7 @@ public final class RendererConfiguration {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/SeekParameters.java
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
*/ */
package com.google.android.exoplayer2; package com.google.android.exoplayer2;
import android.support.annotation.Nullable;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
/** /**
...@@ -71,7 +72,7 @@ public final class SeekParameters { ...@@ -71,7 +72,7 @@ public final class SeekParameters {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/audio/AudioAttributes.java
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
package com.google.android.exoplayer2.audio; package com.google.android.exoplayer2.audio;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.support.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
/** /**
...@@ -119,7 +120,7 @@ public final class AudioAttributes { ...@@ -119,7 +120,7 @@ public final class AudioAttributes {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java
...@@ -22,6 +22,7 @@ import android.content.Intent; ...@@ -22,6 +22,7 @@ import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.media.AudioFormat; import android.media.AudioFormat;
import android.media.AudioManager; import android.media.AudioManager;
import android.support.annotation.Nullable;
import java.util.Arrays; import java.util.Arrays;
/** /**
...@@ -96,7 +97,7 @@ public final class AudioCapabilities { ...@@ -96,7 +97,7 @@ public final class AudioCapabilities {
} }
@Override @Override
public boolean equals(Object other) { public boolean equals(@Nullable Object other) {
if (this == other) { if (this == other) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
...@@ -195,7 +195,7 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable { ...@@ -195,7 +195,7 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
...@@ -338,7 +338,7 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable { ...@@ -338,7 +338,7 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (!(obj instanceof SchemeData)) { if (!(obj instanceof SchemeData)) {
return false; return false;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/SeekMap.java
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
*/ */
package com.google.android.exoplayer2.extractor; package com.google.android.exoplayer2.extractor;
import android.support.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
...@@ -92,7 +93,7 @@ public interface SeekMap { ...@@ -92,7 +93,7 @@ public interface SeekMap {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/SeekPoint.java
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
*/ */
package com.google.android.exoplayer2.extractor; package com.google.android.exoplayer2.extractor;
import android.support.annotation.Nullable;
/** Defines a seek point in a media stream. */ /** Defines a seek point in a media stream. */
public final class SeekPoint { public final class SeekPoint {
...@@ -42,7 +44,7 @@ public final class SeekPoint { ...@@ -42,7 +44,7 @@ public final class SeekPoint {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
*/ */
package com.google.android.exoplayer2.extractor; package com.google.android.exoplayer2.extractor;
import android.support.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
...@@ -69,7 +70,7 @@ public interface TrackOutput { ...@@ -69,7 +70,7 @@ public interface TrackOutput {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
...@@ -639,7 +639,7 @@ public final class MediaCodecUtil { ...@@ -639,7 +639,7 @@ public final class MediaCodecUtil {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java
...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.metadata; ...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.metadata;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.support.annotation.Nullable;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
...@@ -76,7 +77,7 @@ public final class Metadata implements Parcelable { ...@@ -76,7 +77,7 @@ public final class Metadata implements Parcelable {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java
...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.metadata.emsg; ...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.metadata.emsg;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.support.annotation.Nullable;
import com.google.android.exoplayer2.metadata.Metadata; import com.google.android.exoplayer2.metadata.Metadata;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.util.Arrays; import java.util.Arrays;
...@@ -104,7 +105,7 @@ public final class EventMessage implements Metadata.Entry { ...@@ -104,7 +105,7 @@ public final class EventMessage implements Metadata.Entry {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java
...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.metadata.id3; ...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.metadata.id3;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.support.annotation.Nullable;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.util.Arrays; import java.util.Arrays;
...@@ -49,7 +50,7 @@ public final class ApicFrame extends Id3Frame { ...@@ -49,7 +50,7 @@ public final class ApicFrame extends Id3Frame {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java
...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.metadata.id3; ...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.metadata.id3;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.support.annotation.Nullable;
import java.util.Arrays; import java.util.Arrays;
/** /**
...@@ -37,7 +38,7 @@ public final class BinaryFrame extends Id3Frame { ...@@ -37,7 +38,7 @@ public final class BinaryFrame extends Id3Frame {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterFrame.java
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
package com.google.android.exoplayer2.metadata.id3; package com.google.android.exoplayer2.metadata.id3;
import android.os.Parcel; import android.os.Parcel;
import android.support.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.util.Arrays; import java.util.Arrays;
...@@ -80,7 +81,7 @@ public final class ChapterFrame extends Id3Frame { ...@@ -80,7 +81,7 @@ public final class ChapterFrame extends Id3Frame {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
package com.google.android.exoplayer2.metadata.id3; package com.google.android.exoplayer2.metadata.id3;
import android.os.Parcel; import android.os.Parcel;
import android.support.annotation.Nullable;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.util.Arrays; import java.util.Arrays;
...@@ -70,7 +71,7 @@ public final class ChapterTocFrame extends Id3Frame { ...@@ -70,7 +71,7 @@ public final class ChapterTocFrame extends Id3Frame {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/CommentFrame.java
...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.metadata.id3; ...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.metadata.id3;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.support.annotation.Nullable;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
/** /**
...@@ -45,7 +46,7 @@ public final class CommentFrame extends Id3Frame { ...@@ -45,7 +46,7 @@ public final class CommentFrame extends Id3Frame {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java
...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.metadata.id3; ...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.metadata.id3;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.support.annotation.Nullable;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.util.Arrays; import java.util.Arrays;
...@@ -49,7 +50,7 @@ public final class GeobFrame extends Id3Frame { ...@@ -49,7 +50,7 @@ public final class GeobFrame extends Id3Frame {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java
...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.metadata.id3; ...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.metadata.id3;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.support.annotation.Nullable;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.util.Arrays; import java.util.Arrays;
...@@ -43,7 +44,7 @@ public final class PrivFrame extends Id3Frame { ...@@ -43,7 +44,7 @@ public final class PrivFrame extends Id3Frame {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java
...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.metadata.id3; ...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.metadata.id3;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.support.annotation.Nullable;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
/** /**
...@@ -40,7 +41,7 @@ public final class TextInformationFrame extends Id3Frame { ...@@ -40,7 +41,7 @@ public final class TextInformationFrame extends Id3Frame {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/UrlLinkFrame.java
...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.metadata.id3; ...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.metadata.id3;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.support.annotation.Nullable;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
/** /**
...@@ -40,7 +41,7 @@ public final class UrlLinkFrame extends Id3Frame { ...@@ -40,7 +41,7 @@ public final class UrlLinkFrame extends Id3Frame {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadAction.java
...@@ -140,7 +140,7 @@ public abstract class DownloadAction { ...@@ -140,7 +140,7 @@ public abstract class DownloadAction {
DownloaderConstructorHelper downloaderConstructorHelper); DownloaderConstructorHelper downloaderConstructorHelper);
@Override @Override
public boolean equals(Object o) { public boolean equals(@Nullable Object o) {
if (o == null || getClass() != o.getClass()) { if (o == null || getClass() != o.getClass()) {
return false; return false;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloadAction.java
...@@ -84,7 +84,7 @@ public final class ProgressiveDownloadAction extends DownloadAction { ...@@ -84,7 +84,7 @@ public final class ProgressiveDownloadAction extends DownloadAction {
} }
@Override @Override
public boolean equals(Object o) { public boolean equals(@Nullable Object o) {
if (this == o) { if (this == o) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloadAction.java
...@@ -112,7 +112,7 @@ public abstract class SegmentDownloadAction<K extends Comparable<K>> extends Dow ...@@ -112,7 +112,7 @@ public abstract class SegmentDownloadAction<K extends Comparable<K>> extends Dow
protected abstract void writeKey(DataOutputStream output, K key) throws IOException; protected abstract void writeKey(DataOutputStream output, K key) throws IOException;
@Override @Override
public boolean equals(Object o) { public boolean equals(@Nullable Object o) {
if (this == o) { if (this == o) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
...@@ -145,7 +145,7 @@ public interface MediaSource { ...@@ -145,7 +145,7 @@ public interface MediaSource {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/source/TrackGroup.java
...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.source; ...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.source;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.support.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
...@@ -96,7 +97,7 @@ public final class TrackGroup implements Parcelable { ...@@ -96,7 +97,7 @@ public final class TrackGroup implements Parcelable {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/source/TrackGroupArray.java
...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.source; ...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.source;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.support.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import java.util.Arrays; import java.util.Arrays;
...@@ -98,7 +99,7 @@ public final class TrackGroupArray implements Parcelable { ...@@ -98,7 +99,7 @@ public final class TrackGroupArray implements Parcelable {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/trackselection/BaseTrackSelection.java
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
package com.google.android.exoplayer2.trackselection; package com.google.android.exoplayer2.trackselection;
import android.os.SystemClock; import android.os.SystemClock;
import android.support.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.source.TrackGroup; import com.google.android.exoplayer2.source.TrackGroup;
...@@ -183,7 +184,7 @@ public abstract class BaseTrackSelection implements TrackSelection { ...@@ -183,7 +184,7 @@ public abstract class BaseTrackSelection implements TrackSelection {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
...@@ -20,6 +20,7 @@ import android.graphics.Point; ...@@ -20,6 +20,7 @@ import android.graphics.Point;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Pair; import android.util.Pair;
import android.util.SparseArray; import android.util.SparseArray;
...@@ -771,7 +772,7 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -771,7 +772,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
...@@ -992,7 +993,7 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -992,7 +993,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
...@@ -2020,7 +2021,7 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -2020,7 +2021,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
} }
@Override @Override
public boolean equals(Object o) { public boolean equals(@Nullable Object o) {
if (this == o) { if (this == o) {
return true; return true;
} }
...@@ -2074,7 +2075,7 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -2074,7 +2075,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionArray.java
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
*/ */
package com.google.android.exoplayer2.trackselection; package com.google.android.exoplayer2.trackselection;
import android.support.annotation.Nullable;
import java.util.Arrays; import java.util.Arrays;
/** An array of {@link TrackSelection}s. */ /** An array of {@link TrackSelection}s. */
...@@ -64,7 +65,7 @@ public final class TrackSelectionArray { ...@@ -64,7 +65,7 @@ public final class TrackSelectionArray {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
*/ */
package com.google.android.exoplayer2.upstream.cache; package com.google.android.exoplayer2.upstream.cache;
import android.support.annotation.Nullable;
import com.google.android.exoplayer2.upstream.cache.Cache.CacheException; import com.google.android.exoplayer2.upstream.cache.Cache.CacheException;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import java.io.DataInputStream; import java.io.DataInputStream;
...@@ -236,7 +237,7 @@ import java.util.TreeSet; ...@@ -236,7 +237,7 @@ import java.util.TreeSet;
} }
@Override @Override
public boolean equals(Object o) { public boolean equals(@Nullable Object o) {
if (this == o) { if (this == o) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadata.java
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
*/ */
package com.google.android.exoplayer2.upstream.cache; package com.google.android.exoplayer2.upstream.cache;
import android.support.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
...@@ -131,7 +132,7 @@ public final class DefaultContentMetadata implements ContentMetadata { ...@@ -131,7 +132,7 @@ public final class DefaultContentMetadata implements ContentMetadata {
} }
@Override @Override
public boolean equals(Object o) { public boolean equals(@Nullable Object o) {
if (this == o) { if (this == o) {
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/video/ColorInfo.java
...@@ -17,10 +17,10 @@ package com.google.android.exoplayer2.video; ...@@ -17,10 +17,10 @@ package com.google.android.exoplayer2.video;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.support.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.util.Arrays; import java.util.Arrays;
/** /**
...@@ -85,7 +85,7 @@ public final class ColorInfo implements Parcelable { ...@@ -85,7 +85,7 @@ public final class ColorInfo implements Parcelable {
// Parcelable implementation. // Parcelable implementation.
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
} }
......
library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
...@@ -846,7 +846,7 @@ public final class AnalyticsCollectorTest { ...@@ -846,7 +846,7 @@ public final class AnalyticsCollectorTest {
} }
@Override @Override
public boolean equals(Object other) { public boolean equals(@Nullable Object other) {
if (!(other instanceof EventWindowAndPeriodId)) { if (!(other instanceof EventWindowAndPeriodId)) {
return false; return false;
} }
......
library/ui/src/main/res/values-de/strings.xml
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<string name="exo_track_selection_title_video">Video</string> <string name="exo_track_selection_title_video">Video</string>
<string name="exo_track_selection_title_audio">Audio</string> <string name="exo_track_selection_title_audio">Audio</string>
<string name="exo_track_selection_title_text">Text</string> <string name="exo_track_selection_title_text">Text</string>
<string name="exo_track_selection_none">Keiner</string> <string name="exo_track_selection_none">Ohne</string>
<string name="exo_track_selection_auto">Automatisch</string> <string name="exo_track_selection_auto">Automatisch</string>
<string name="exo_track_unknown">Unbekannt</string> <string name="exo_track_unknown">Unbekannt</string>
<string name="exo_track_resolution">%1$d × %2$d</string> <string name="exo_track_resolution">%1$d × %2$d</string>
...@@ -31,5 +31,5 @@ ...@@ -31,5 +31,5 @@
<string name="exo_track_surround_5_point_1">5.1-Surround-Sound</string> <string name="exo_track_surround_5_point_1">5.1-Surround-Sound</string>
<string name="exo_track_surround_7_point_1">7.1-Surround-Sound</string> <string name="exo_track_surround_7_point_1">7.1-Surround-Sound</string>
<string name="exo_track_bitrate">%1$.2f Mbit/s</string> <string name="exo_track_bitrate">%1$.2f Mbit/s</string>
<string name="exo_item_list">%1$s und %2$s</string> <string name="exo_item_list">%1$s, %2$s</string>
</resources> </resources>
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