aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRidhim Rastogi <ridhim.rastogi@ittiam.com>2019-05-28 10:12:39 -0700
committerNick Chalko <nchalko@google.com>2019-05-29 21:54:14 -0700
commit2f8cef52f5cb9270918db2a2045ea6a37f247b9e (patch)
treeb0f9225bc131d634efb9a06355851fda5a78fde8 /src
parentbf5fa1c0251797cecb36bebc24c034ebab483ffb (diff)
downloadTV-2f8cef52f5cb9270918db2a2045ea6a37f247b9e.tar.gz
FIX: Prevent NPE at DvrManager.forgetStorage
Remove RecordingStorageStatusManager call before DvrManager is created. Live Channels: Import of http://pa/1358279 Bug: 79426520 Change-Id: Ie1149dcf14f4b82374007a4a10a88f00745e9bf4 PiperOrigin-RevId: 250308723
Diffstat (limited to 'src')
-rw-r--r--src/com/android/tv/dvr/DvrStorageStatusManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/tv/dvr/DvrStorageStatusManager.java b/src/com/android/tv/dvr/DvrStorageStatusManager.java
index dc347a9e..a0ae8939 100644
--- a/src/com/android/tv/dvr/DvrStorageStatusManager.java
+++ b/src/com/android/tv/dvr/DvrStorageStatusManager.java
@@ -114,7 +114,7 @@ public class DvrStorageStatusManager extends RecordingStorageStatusManager {
return;
}
for (TvInputInfo info : tvInputInfoList) {
- if (CommonUtils.isBundledInput(info.getId())) {
+ if (CommonUtils.isBundledInput(info.getId()) && dvrManager != null) {
dvrManager.forgetStorage(info.getId());
}
}