1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/tv/dvr/ui/DvrConflictFragment.java b/src/com/android/tv/dvr/ui/DvrConflictFragment.java
index 5e0a96bb..47a436da 100644
--- a/src/com/android/tv/dvr/ui/DvrConflictFragment.java
+++ b/src/com/android/tv/dvr/ui/DvrConflictFragment.java
@@ -92,6 +92,10 @@ public abstract class DvrConflictFragment extends DvrGuidedStepFragment {
                     getContext(), getConflicts());
         }
         dismissDialog();
+        // Finish the Recording setting Activity on dismissal.
+        if (getActivity() instanceof DvrRecordingSettingsActivity) {
+            getActivity().finish();
+        }
     }
 
     @Override