diff options
| author | Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> | 2023-11-28 19:37:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-28 19:37:42 +0000 |
| commit | 7186979c75f25ebdb600ca75e842cc1a0cdd29f1 (patch) | |
| tree | 80bca5b4c0d9b810bebbf63a70bbd218c84b4499 | |
| parent | 5e347159c8a1937435307a61681921846c38d56c (diff) | |
| parent | 279537cff5b4babd5611da3853d60fbc4c2d7550 (diff) | |
| download | TV-7186979c75f25ebdb600ca75e842cc1a0cdd29f1.tar.gz | |
Check DvrScheduleManager null status am: e64c0d53a4 am: f3449bcdd4 am: 279537cff5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2829417
Change-Id: Ie202a4e78a39db13670e66d93696bd11de2ec3d5
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 a607772f..738759fc 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}. */ |