diff options
| author | Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> | 2023-11-14 21:48:11 +0530 |
|---|---|---|
| committer | Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> | 2023-11-14 21:48:11 +0530 |
| commit | e64c0d53a4b8f8e71e504f6eeb7ecd858802e3f1 (patch) | |
| tree | 82a5884842f2930dc89d52c8360f820510fab5d4 | |
| parent | 206f12c97d2617210b3edf1f54d689b74fa786a7 (diff) | |
| download | TV-e64c0d53a4b8f8e71e504f6eeb7ecd858802e3f1.tar.gz | |
Check DvrScheduleManager null status
When there is a get operation for DvrManager in TvApplication, check
that the DvrScheduleManager is already assigned and not null before
attempting the constructor call to DvrManager. The DvrManager
constructor requires the DvrScheduleManager object to be not null.
Bug: 298929825
Test: Build
Change-Id: I04e63b2ca6e7e701ece7fa391516f203e79ba36b
| -rw-r--r-- | src/com/android/tv/TvApplication.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/tv/TvApplication.java b/src/com/android/tv/TvApplication.java index 5ab8f033..c5e4f32e 100644 --- a/src/com/android/tv/TvApplication.java +++ b/src/com/android/tv/TvApplication.java @@ -255,7 +255,9 @@ public abstract class TvApplication extends BaseApplication implements TvSinglet @Override @Nullable public DvrManager getDvrManager() { - return (CommonFeatures.DVR.isEnabled(this)) ? mDvrManager.get() : null; + return (CommonFeatures.DVR.isEnabled(this) && mDvrScheduleManager != null) + ? mDvrManager.get() + : null; } /** Returns the {@link DvrScheduleManager}. */ |