diff options
| author | Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> | 2023-11-28 18:48:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-28 18:48:04 +0000 |
| commit | 279537cff5b4babd5611da3853d60fbc4c2d7550 (patch) | |
| tree | 79d4e417f09cecd935a64e2eede5f1441b60be4d | |
| parent | 4c677f3fbd471892f1a5d4bae2cb1f5cb679796e (diff) | |
| parent | f3449bcdd4d9c95960b71e59be5e4c79385ceb72 (diff) | |
| download | TV-279537cff5b4babd5611da3853d60fbc4c2d7550.tar.gz | |
Check DvrScheduleManager null status am: e64c0d53a4 am: f3449bcdd4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2829417
Change-Id: I7816e7bd0536d5527d7cd8581ada831ec0cf00ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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}. */ |