1 files changed, 5 insertions, 7 deletions
diff --git a/usbtuner/src/com/android/usbtuner/tvinput/InternalTunerTvInputService.java b/usbtuner/src/com/android/usbtuner/tvinput/InternalTunerTvInputService.java
index adc4f14a..b4e97833 100644
--- a/usbtuner/src/com/android/usbtuner/tvinput/InternalTunerTvInputService.java
+++ b/usbtuner/src/com/android/usbtuner/tvinput/InternalTunerTvInputService.java
@@ -24,8 +24,8 @@ import android.media.tv.TvInputInfo;
 import android.os.Environment;
 import android.util.Log;
 
-import com.android.usbtuner.exoplayer.CacheManager;
-import com.android.usbtuner.exoplayer.TrickplayStorageManager;
+import com.android.usbtuner.exoplayer.cache.CacheManager;
+import com.android.usbtuner.exoplayer.cache.TrickplayStorageManager;
 import com.android.usbtuner.util.SystemPropertiesProxy;
 import com.android.usbtuner.util.TisConfiguration;
 import org.xmlpull.v1.XmlPullParserException;
@@ -57,7 +57,7 @@ public class InternalTunerTvInputService extends BaseTunerTvInputService {
     }
 
     @Override
-    protected void maybeInitCacheManager() {
+    protected CacheManager createCacheManager() {
         int maxCacheSizeMb = SystemPropertiesProxy.getInt(MAX_CACHE_SIZE_KEY, MAX_CACHE_SIZE_DEF);
         if (maxCacheSizeMb >= MIN_CACHE_SIZE_DEF) {
             boolean useExternalStorage = Environment.MEDIA_MOUNTED.equals(
@@ -67,21 +67,20 @@ public class InternalTunerTvInputService extends BaseTunerTvInputService {
             boolean allowToUseInternalStorage = true;
             if (useExternalStorage || allowToUseInternalStorage) {
                 File baseDir = useExternalStorage ? getExternalCacheDir() : getCacheDir();
-                mCacheManager = new CacheManager(
+                return new CacheManager(
                         new TrickplayStorageManager(getApplicationContext(), baseDir,
                                 1024L * 1024 * maxCacheSizeMb));
             }
         }
+        return null;
     }
 
     @Override
     public TvInputInfo onHardwareAdded(TvInputHardwareInfo hardwareInfo) {
         if (DEBUG) Log.d(TAG, "onHardwareAdded: " + hardwareInfo.toString());
-
         if (mTvInputId != null) {
             return null;
         }
-
         TvInputInfo info = null;
         if (hardwareInfo.getType() == TvInputHardwareInfo.TV_INPUT_TYPE_TUNER &&
                 TisConfiguration.getTunerHwDeviceId(this) == hardwareInfo.getDeviceId()) {
@@ -101,7 +100,6 @@ public class InternalTunerTvInputService extends BaseTunerTvInputService {
     @Override
     public String onHardwareRemoved(TvInputHardwareInfo hardwareInfo) {
         if (DEBUG) Log.d(TAG, "onHardwareRemoved: " + hardwareInfo.toString());
-
         return null;
     }
 }