Fix broken build

This reverts

c9889d1 Update aosp build to use a snapshot of exoplyer. by nchalko · 5
hours ago master
8952aa7 Clean format by nchalko · 20 hours ago
ba3fb16 Merge "Use a snapshot of exoplayer" by TreeHugger Robot · 18
hours ago
ff75e39 Project import generated by Copybara. by Live Channels Team · 22
hours ago
9737fc2 Use a snapshot of exoplayer by Nick Chalko · 20 hours ago
4a5144a Project import generated by Copybara. by Live Channels Team · 6
days ago

Bug: 72092981
Bug: 69474774
Change-Id: Ie756857c10bf052c60b6442c3d61252f65b49143

7 files changed, 24 insertions, 21 deletions

diff --git a/src/com/android/tv/dvr/ui/list/BaseDvrSchedulesFragment.java b/src/com/android/tv/dvr/ui/list/BaseDvrSchedulesFragment.java
index 84298bdf..42c7086a 100644
--- a/src/com/android/tv/dvr/ui/list/BaseDvrSchedulesFragment.java
+++ b/src/com/android/tv/dvr/ui/list/BaseDvrSchedulesFragment.java
@@ -23,8 +23,9 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import com.android.tv.ApplicationSingletons;
 import com.android.tv.R;
-import com.android.tv.TvSingletons;
+import com.android.tv.TvApplication;
 import com.android.tv.dvr.DvrDataManager;
 import com.android.tv.dvr.DvrScheduleManager;
 import com.android.tv.dvr.data.ScheduledRecording;
@@ -49,7 +50,7 @@ public abstract class BaseDvrSchedulesFragment extends DetailsFragment
         mRowsAdapter = onCreateRowsAdapter(presenterSelector);
         setAdapter(mRowsAdapter);
         mRowsAdapter.start();
-        TvSingletons singletons = TvSingletons.getSingletons(getContext());
+        ApplicationSingletons singletons = TvApplication.getSingletons(getContext());
         singletons.getDvrDataManager().addScheduledRecordingListener(this);
         singletons.getDvrScheduleManager().addOnConflictStateChangeListener(this);
         mEmptyInfoScreenView = (TextView) getActivity().findViewById(R.id.empty_info_screen);
@@ -95,7 +96,7 @@ public abstract class BaseDvrSchedulesFragment extends DetailsFragment
 
     @Override
     public void onDestroy() {
-        TvSingletons singletons = TvSingletons.getSingletons(getContext());
+        ApplicationSingletons singletons = TvApplication.getSingletons(getContext());
         singletons.getDvrScheduleManager().removeOnConflictStateChangeListener(this);
         singletons.getDvrDataManager().removeScheduledRecordingListener(this);
         mRowsAdapter.stop();
diff --git a/src/com/android/tv/dvr/ui/list/DvrSchedulesActivity.java b/src/com/android/tv/dvr/ui/list/DvrSchedulesActivity.java
index 82b85630..11df780c 100644
--- a/src/com/android/tv/dvr/ui/list/DvrSchedulesActivity.java
+++ b/src/com/android/tv/dvr/ui/list/DvrSchedulesActivity.java
@@ -21,7 +21,7 @@ import android.app.ProgressDialog;
 import android.os.Bundle;
 import android.support.annotation.IntDef;
 import com.android.tv.R;
-import com.android.tv.Starter;
+import com.android.tv.TvApplication;
 import com.android.tv.data.Program;
 import com.android.tv.dvr.data.SeriesRecording;
 import com.android.tv.dvr.provider.EpisodicProgramLoadTask;
@@ -53,7 +53,7 @@ public class DvrSchedulesActivity extends Activity {
 
     @Override
     public void onCreate(final Bundle savedInstanceState) {
-        Starter.start(this);
+        TvApplication.setCurrentRunningProcess(this, true);
         // Pass null to prevent automatically re-creating fragments
         super.onCreate(null);
         setContentView(R.layout.activity_dvr_schedules);
diff --git a/src/com/android/tv/dvr/ui/list/DvrSeriesSchedulesFragment.java b/src/com/android/tv/dvr/ui/list/DvrSeriesSchedulesFragment.java
index d376e358..6ec2e152 100644
--- a/src/com/android/tv/dvr/ui/list/DvrSeriesSchedulesFragment.java
+++ b/src/com/android/tv/dvr/ui/list/DvrSeriesSchedulesFragment.java
@@ -30,8 +30,9 @@ import android.transition.Fade;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import com.android.tv.ApplicationSingletons;
 import com.android.tv.R;
-import com.android.tv.TvSingletons;
+import com.android.tv.TvApplication;
 import com.android.tv.data.ChannelDataManager;
 import com.android.tv.data.Program;
 import com.android.tv.dvr.DvrDataManager;
@@ -140,7 +141,7 @@ public class DvrSeriesSchedulesFragment extends BaseDvrSchedulesFragment {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        TvSingletons singletons = TvSingletons.getSingletons(getContext());
+        ApplicationSingletons singletons = TvApplication.getSingletons(getContext());
         mChannelDataManager = singletons.getChannelDataManager();
         mChannelDataManager.addListener(mChannelListener);
         mDvrDataManager = singletons.getDvrDataManager();
diff --git a/src/com/android/tv/dvr/ui/list/ScheduleRowAdapter.java b/src/com/android/tv/dvr/ui/list/ScheduleRowAdapter.java
index 1215c19a..8dd6c322 100644
--- a/src/com/android/tv/dvr/ui/list/ScheduleRowAdapter.java
+++ b/src/com/android/tv/dvr/ui/list/ScheduleRowAdapter.java
@@ -26,7 +26,7 @@ import android.text.format.DateUtils;
 import android.util.ArraySet;
 import android.util.Log;
 import com.android.tv.R;
-import com.android.tv.TvSingletons;
+import com.android.tv.TvApplication;
 import com.android.tv.common.SoftPreconditions;
 import com.android.tv.dvr.DvrManager;
 import com.android.tv.dvr.data.ScheduledRecording;
@@ -79,11 +79,11 @@ class ScheduleRowAdapter extends ArrayObjectAdapter {
     public void start() {
         clear();
         List<ScheduledRecording> recordingList =
-                TvSingletons.getSingletons(mContext)
+                TvApplication.getSingletons(mContext)
                         .getDvrDataManager()
                         .getNonStartedScheduledRecordings();
         recordingList.addAll(
-                TvSingletons.getSingletons(mContext).getDvrDataManager().getStartedRecordings());
+                TvApplication.getSingletons(mContext).getDvrDataManager().getStartedRecordings());
         Collections.sort(
                 recordingList, ScheduledRecording.START_TIME_THEN_PRIORITY_THEN_ID_COMPARATOR);
         long deadLine = Utils.getLastMillisecondOfDay(System.currentTimeMillis());
@@ -136,7 +136,7 @@ class ScheduleRowAdapter extends ArrayObjectAdapter {
     /** Stops schedules row adapter. */
     public void stop() {
         mHandler.removeCallbacksAndMessages(null);
-        DvrManager dvrManager = TvSingletons.getSingletons(getContext()).getDvrManager();
+        DvrManager dvrManager = TvApplication.getSingletons(getContext()).getDvrManager();
         for (int i = 0; i < size(); i++) {
             if (get(i) instanceof ScheduleRow) {
                 ScheduleRow row = (ScheduleRow) get(i);
diff --git a/src/com/android/tv/dvr/ui/list/ScheduleRowPresenter.java b/src/com/android/tv/dvr/ui/list/ScheduleRowPresenter.java
index 5cab607a..67096e3b 100644
--- a/src/com/android/tv/dvr/ui/list/ScheduleRowPresenter.java
+++ b/src/com/android/tv/dvr/ui/list/ScheduleRowPresenter.java
@@ -38,7 +38,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 import com.android.tv.R;
-import com.android.tv.TvSingletons;
+import com.android.tv.TvApplication;
 import com.android.tv.common.SoftPreconditions;
 import com.android.tv.data.Channel;
 import com.android.tv.dialog.HalfSizedDialogFragment;
@@ -344,8 +344,8 @@ class ScheduleRowPresenter extends RowPresenter {
         setHeaderPresenter(null);
         setSelectEffectEnabled(false);
         mContext = context;
-        mDvrManager = TvSingletons.getSingletons(context).getDvrManager();
-        mDvrScheduleManager = TvSingletons.getSingletons(context).getDvrScheduleManager();
+        mDvrManager = TvApplication.getSingletons(context).getDvrManager();
+        mDvrScheduleManager = TvApplication.getSingletons(context).getDvrScheduleManager();
         mTunerConflictWillNotBeRecordedInfo =
                 mContext.getString(R.string.dvr_schedules_tuner_conflict_will_not_be_recorded_info);
         mTunerConflictWillBePartiallyRecordedInfo =
@@ -426,7 +426,7 @@ class ScheduleRowPresenter extends RowPresenter {
             switch (actions.length) {
                 case 2:
                     viewHolder.mSecondActionView.setImageResource(getImageForAction(actions[1]));
-                    // fall through
+                    // pass through
                 case 1:
                     viewHolder.mFirstActionView.setImageResource(getImageForAction(actions[0]));
                     break;
@@ -486,7 +486,7 @@ class ScheduleRowPresenter extends RowPresenter {
 
     private String getChannelNameText(ScheduleRow row) {
         Channel channel =
-                TvSingletons.getSingletons(mContext)
+                TvApplication.getSingletons(mContext)
                         .getChannelDataManager()
                         .getChannel(row.getChannelId());
         return channel == null
diff --git a/src/com/android/tv/dvr/ui/list/SchedulesHeaderRowPresenter.java b/src/com/android/tv/dvr/ui/list/SchedulesHeaderRowPresenter.java
index eb01aba2..03cc0a79 100644
--- a/src/com/android/tv/dvr/ui/list/SchedulesHeaderRowPresenter.java
+++ b/src/com/android/tv/dvr/ui/list/SchedulesHeaderRowPresenter.java
@@ -28,7 +28,7 @@ import android.view.ViewGroup;
 import android.view.animation.DecelerateInterpolator;
 import android.widget.TextView;
 import com.android.tv.R;
-import com.android.tv.TvSingletons;
+import com.android.tv.TvApplication;
 import com.android.tv.dvr.data.SeriesRecording;
 import com.android.tv.dvr.ui.DvrUiHelper;
 import com.android.tv.dvr.ui.list.SchedulesHeaderRow.SeriesRecordingHeaderRow;
@@ -158,11 +158,11 @@ abstract class SchedulesHeaderRowPresenter extends RowPresenter {
                                 SeriesRecording seriesRecording =
                                         SeriesRecording.buildFrom(header.getSeriesRecording())
                                                 .setPriority(
-                                                        TvSingletons.getSingletons(getContext())
+                                                        TvApplication.getSingletons(getContext())
                                                                 .getDvrScheduleManager()
                                                                 .suggestNewSeriesPriority())
                                                 .build();
-                                TvSingletons.getSingletons(getContext())
+                                TvApplication.getSingletons(getContext())
                                         .getDvrManager()
                                         .updateSeriesRecording(seriesRecording);
                                 DvrUiHelper.startSeriesSettingsActivity(
diff --git a/src/com/android/tv/dvr/ui/list/SeriesScheduleRowAdapter.java b/src/com/android/tv/dvr/ui/list/SeriesScheduleRowAdapter.java
index 9a9c94ea..692c0f99 100644
--- a/src/com/android/tv/dvr/ui/list/SeriesScheduleRowAdapter.java
+++ b/src/com/android/tv/dvr/ui/list/SeriesScheduleRowAdapter.java
@@ -23,8 +23,9 @@ import android.os.Build;
 import android.support.v17.leanback.widget.ClassPresenterSelector;
 import android.util.ArrayMap;
 import android.util.Log;
+import com.android.tv.ApplicationSingletons;
 import com.android.tv.R;
-import com.android.tv.TvSingletons;
+import com.android.tv.TvApplication;
 import com.android.tv.common.SoftPreconditions;
 import com.android.tv.data.Program;
 import com.android.tv.dvr.DvrDataManager;
@@ -64,7 +65,7 @@ class SeriesScheduleRowAdapter extends ScheduleRowAdapter {
         } else {
             mInputId = null;
         }
-        TvSingletons singletons = TvSingletons.getSingletons(context);
+        ApplicationSingletons singletons = TvApplication.getSingletons(context);
         mDvrManager = singletons.getDvrManager();
         mDataManager = singletons.getDvrDataManager();
         setHasStableIds(true);