From 5ee122cac88b2340daf9e86d73642c038e42556e Mon Sep 17 00:00:00 2001 From: olly Date: Mon, 3 Apr 2017 04:06:46 -0700 Subject: [PATCH] Add VERSION_SLASHY to ExoPlayerLibraryInfo ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=151994281 --- .../com/google/android/exoplayer2/ExoPlayerImpl.java | 2 +- .../android/exoplayer2/ExoPlayerLibraryInfo.java | 12 ++++++++++-- .../com/google/android/exoplayer2/util/Util.java | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java index 7497ed0da9..7a3da68d02 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java @@ -76,7 +76,7 @@ import java.util.concurrent.CopyOnWriteArraySet; */ @SuppressLint("HandlerLeak") public ExoPlayerImpl(Renderer[] renderers, TrackSelector trackSelector, LoadControl loadControl) { - Log.i(TAG, "Init " + ExoPlayerLibraryInfo.VERSION + " [" + Util.DEVICE_DEBUG_INFO + "]"); + Log.i(TAG, "Init " + ExoPlayerLibraryInfo.VERSION_SLASHY + " [" + Util.DEVICE_DEBUG_INFO + "]"); Assertions.checkState(renderers.length > 0); this.renderers = Assertions.checkNotNull(renderers); this.trackSelector = Assertions.checkNotNull(trackSelector); diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java index bee9904590..74f622946e 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java @@ -21,17 +21,25 @@ package com.google.android.exoplayer2; public interface ExoPlayerLibraryInfo { /** - * The version of the library, expressed as a string. + * The version of the library expressed as a string, for example "1.2.3". */ + // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION_INT) or vice versa. String VERSION = "2.3.1"; /** - * The version of the library, expressed as an integer. + * The version of the library expressed as {@code "ExoPlayerLib/" + VERSION}. + */ + // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa. + String VERSION_SLASHY = "ExoPlayerLib/2.3.1"; + + /** + * The version of the library expressed as an integer, for example 1002003. *

* Three digits are used for each component of {@link #VERSION}. For example "1.2.3" has the * corresponding integer version 1002003 (001-002-003), and "123.45.6" has the corresponding * integer version 123045006 (123-045-006). */ + // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa. int VERSION_INT = 2003001; /** diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java index 73ea18e2ca..206349fa07 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java @@ -766,7 +766,7 @@ public final class Util { versionName = "?"; } return applicationName + "/" + versionName + " (Linux;Android " + Build.VERSION.RELEASE - + ") " + "ExoPlayerLib/" + ExoPlayerLibraryInfo.VERSION; + + ") " + ExoPlayerLibraryInfo.VERSION_SLASHY; } /**