1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/tv/tuner/exoplayer/buffer/DvrStorageManager.java b/src/com/android/tv/tuner/exoplayer/buffer/DvrStorageManager.java
index f9efa0de..6a0502a7 100644
--- a/src/com/android/tv/tuner/exoplayer/buffer/DvrStorageManager.java
+++ b/src/com/android/tv/tuner/exoplayer/buffer/DvrStorageManager.java
@@ -61,8 +61,11 @@ public class DvrStorageManager implements BufferManager.StorageManager {
     @Override
     public void clearStorage() {
         if (mIsRecording) {
-            for (File file : mBufferDir.listFiles()) {
-                file.delete();
+            File[] files = mBufferDir.listFiles();
+            if (files != null && files.length > 0) {
+                for (File file : files) {
+                    file.delete();
+                }
             }
         }
     }