Clean format
PiperOrigin-RevId: 182120361
Change-Id: I745580915289c34dad1c2bb799dc9211801492f5
(cherry picked from commit 8952aa72b74f51442aca561c37ebc52a75a7ff70)
diff --git a/Android.mk b/Android.mk
index 6151c18..91e5be4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -63,9 +63,6 @@
--version-name "$(version_name_package)" \
--version-code $(version_code_package) \
-#LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-
LOCAL_JNI_SHARED_LIBRARIES := libtunertvinput_jni
LOCAL_AAPT_FLAGS += --extra-packages com.android.tv.tuner
@@ -80,7 +77,8 @@
LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
lib-exoplayer:libs/exoplayer-r1.5.16.aar \
- lib-exoplayer-v2-core:libs/exoplayer-core-2-SNAPHOT-20180114.aar \
+ lib-exoplayer-v2:libs/exoplayer-2.6.1.aar \
+ lib-exoplayer-v2-core:libs/exoplayer-core-2.6.1.aar \
# TODO use external/jsr330
LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += auto-value-jar:../../../prebuilts/tools/common/m2/repository/com/google/auto/value/auto-value/1.5.2/auto-value-1.5.2.jar
diff --git a/src/com/android/tv/data/epg/EpgFetcherImpl.java b/src/com/android/tv/data/epg/EpgFetcherImpl.java
index fbbb0dd..523fc50 100644
--- a/src/com/android/tv/data/epg/EpgFetcherImpl.java
+++ b/src/com/android/tv/data/epg/EpgFetcherImpl.java
@@ -147,8 +147,7 @@
epgReader,
performanceMonitor,
clock,
- routineIntervalMs
- );
+ routineIntervalMs);
}
@VisibleForTesting
@@ -158,8 +157,7 @@
EpgReader epgReader,
PerformanceMonitor performanceMonitor,
Clock clock,
- long routineIntervalMs
- ) {
+ long routineIntervalMs) {
mContext = context;
mChannelDataManager = channelDataManager;
mEpgReader = epgReader;
diff --git a/tuner/Android.mk b/tuner/Android.mk
index 24676f2..8bf51b5 100644
--- a/tuner/Android.mk
+++ b/tuner/Android.mk
@@ -25,6 +25,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
tv-common \
lib-exoplayer \
+ lib-exoplayer-v2 \
lib-exoplayer-v2-core \
android-support-annotations \
android-support-compat \
