Merge Android Pie into masterandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-release

Bug: 112104996
Change-Id: Iec32f622f0bb1bc1583aefcbf6d115ad05baa693

7 files changed, 471 insertions, 473 deletions

diff --git a/src/com/android/tv/dvr/ui/playback/DvrPlaybackActivity.java b/src/com/android/tv/dvr/ui/playback/DvrPlaybackActivity.java
index 6824cfe2..b8b19adc 100644
--- a/src/com/android/tv/dvr/ui/playback/DvrPlaybackActivity.java
+++ b/src/com/android/tv/dvr/ui/playback/DvrPlaybackActivity.java
@@ -23,16 +23,13 @@ import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
-
 import com.android.tv.R;
-import com.android.tv.TvApplication;
+import com.android.tv.Starter;
 import com.android.tv.dialog.PinDialogFragment.OnPinCheckedListener;
 import com.android.tv.dvr.data.RecordedProgram;
 import com.android.tv.util.Utils;
 
-/**
- * Activity to play a {@link RecordedProgram}.
- */
+/** Activity to play a {@link RecordedProgram}. */
 public class DvrPlaybackActivity extends Activity implements OnPinCheckedListener {
     private static final String TAG = "DvrPlaybackActivity";
     private static final boolean DEBUG = false;
@@ -42,13 +39,14 @@ public class DvrPlaybackActivity extends Activity implements OnPinCheckedListene
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        TvApplication.setCurrentRunningProcess(this, true);
+        Starter.start(this);
         if (DEBUG) Log.d(TAG, "onCreate");
         super.onCreate(savedInstanceState);
         setIntent(createProgramIntent(getIntent()));
         setContentView(R.layout.activity_dvr_playback);
-        mOverlayFragment = (DvrPlaybackOverlayFragment) getFragmentManager()
-                .findFragmentById(R.id.dvr_playback_controls_fragment);
+        mOverlayFragment =
+                (DvrPlaybackOverlayFragment)
+                        getFragmentManager().findFragmentById(R.id.dvr_playback_controls_fragment);
     }
 
     @Override
@@ -68,7 +66,8 @@ public class DvrPlaybackActivity extends Activity implements OnPinCheckedListene
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
         float density = getResources().getDisplayMetrics().density;
-        mOverlayFragment.onWindowSizeChanged((int) (newConfig.screenWidthDp * density),
+        mOverlayFragment.onWindowSizeChanged(
+                (int) (newConfig.screenWidthDp * density),
                 (int) (newConfig.screenHeightDp * density));
     }
 
@@ -91,4 +90,4 @@ public class DvrPlaybackActivity extends Activity implements OnPinCheckedListene
     void setOnPinCheckListener(OnPinCheckedListener listener) {
         mOnPinCheckedListener = listener;
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/tv/dvr/ui/playback/DvrPlaybackCardPresenter.java b/src/com/android/tv/dvr/ui/playback/DvrPlaybackCardPresenter.java
index 8ef0041d..a6352d95 100644
--- a/src/com/android/tv/dvr/ui/playback/DvrPlaybackCardPresenter.java
+++ b/src/com/android/tv/dvr/ui/playback/DvrPlaybackCardPresenter.java
@@ -17,14 +17,11 @@
 package com.android.tv.dvr.ui.playback;
 
 import android.content.Context;
-
 import com.android.tv.R;
 import com.android.tv.dvr.ui.browse.RecordedProgramPresenter;
 import com.android.tv.dvr.ui.browse.RecordingCardView;
 
-/**
- * This class is used to generate Views and bind Objects for related recordings in DVR playback.
- */
+/** This class is used to generate Views and bind Objects for related recordings in DVR playback. */
 class DvrPlaybackCardPresenter extends RecordedProgramPresenter {
     private final int mRelatedRecordingCardWidth;
     private final int mRelatedRecordingCardHeight;
@@ -39,7 +36,12 @@ class DvrPlaybackCardPresenter extends RecordedProgramPresenter {
 
     @Override
     public DvrItemViewHolder onCreateDvrItemViewHolder() {
-        return new RecordedProgramViewHolder(new RecordingCardView(
-                getContext(), mRelatedRecordingCardWidth, mRelatedRecordingCardHeight, true), null);
+        return new RecordedProgramViewHolder(
+                new RecordingCardView(
+                        getContext(),
+                        mRelatedRecordingCardWidth,
+                        mRelatedRecordingCardHeight,
+                        true),
+                null);
     }
 }
diff --git a/src/com/android/tv/dvr/ui/playback/DvrPlaybackControlHelper.java b/src/com/android/tv/dvr/ui/playback/DvrPlaybackControlHelper.java
index 1a6ae187..59c90d11 100644
--- a/src/com/android/tv/dvr/ui/playback/DvrPlaybackControlHelper.java
+++ b/src/com/android/tv/dvr/ui/playback/DvrPlaybackControlHelper.java
@@ -44,8 +44,8 @@ import com.android.tv.util.TimeShiftUtils;
 import java.util.ArrayList;
 
 /**
- * A helper class to assist {@link DvrPlaybackOverlayFragment} to manage its controls row and
- * send command to the media controller. It also helps to update playback states displayed in the
+ * A helper class to assist {@link DvrPlaybackOverlayFragment} to manage its controls row and send
+ * command to the media controller. It also helps to update playback states displayed in the
  * fragment according to information the media session provides.
  */
 class DvrPlaybackControlHelper extends PlaybackControlGlue {
@@ -74,8 +74,9 @@ class DvrPlaybackControlHelper extends PlaybackControlGlue {
         mMediaController = activity.getMediaController();
         mMediaController.registerCallback(mMediaControllerCallback);
         mTransportControls = mMediaController.getTransportControls();
-        mExtraPaddingTopForNoDescription = activity.getResources()
-                .getDimensionPixelOffset(R.dimen.dvr_playback_controls_extra_padding_top);
+        mExtraPaddingTopForNoDescription =
+                activity.getResources()
+                        .getDimensionPixelOffset(R.dimen.dvr_playback_controls_extra_padding_top);
         mClosedCaptioningAction = new ClosedCaptioningAction(activity);
         mMultiAudioAction = new MultiAudioAction(activity);
         createControlsRowPresenter();
@@ -90,42 +91,47 @@ class DvrPlaybackControlHelper extends PlaybackControlGlue {
     private void createControlsRowPresenter() {
         AbstractDetailsDescriptionPresenter detailsPresenter =
                 new AbstractDetailsDescriptionPresenter() {
-            @Override
-            protected void onBindDescription(
-                    AbstractDetailsDescriptionPresenter.ViewHolder viewHolder, Object object) {
-                PlaybackControlGlue glue = (PlaybackControlGlue) object;
-                if (glue.hasValidMedia()) {
-                    viewHolder.getTitle().setText(glue.getMediaTitle());
-                    viewHolder.getSubtitle().setText(glue.getMediaSubtitle());
-                } else {
-                    viewHolder.getTitle().setText("");
-                    viewHolder.getSubtitle().setText("");
-                }
-                if (TextUtils.isEmpty(viewHolder.getSubtitle().getText())) {
-                    viewHolder.view.setPadding(viewHolder.view.getPaddingLeft(),
-                            mExtraPaddingTopForNoDescription,
-                            viewHolder.view.getPaddingRight(), viewHolder.view.getPaddingBottom());
-                }
-            }
-        };
+                    @Override
+                    protected void onBindDescription(
+                            AbstractDetailsDescriptionPresenter.ViewHolder viewHolder,
+                            Object object) {
+                        PlaybackControlGlue glue = (PlaybackControlGlue) object;
+                        if (glue.hasValidMedia()) {
+                            viewHolder.getTitle().setText(glue.getMediaTitle());
+                            viewHolder.getSubtitle().setText(glue.getMediaSubtitle());
+                        } else {
+                            viewHolder.getTitle().setText("");
+                            viewHolder.getSubtitle().setText("");
+                        }
+                        if (TextUtils.isEmpty(viewHolder.getSubtitle().getText())) {
+                            viewHolder.view.setPadding(
+                                    viewHolder.view.getPaddingLeft(),
+                                    mExtraPaddingTopForNoDescription,
+                                    viewHolder.view.getPaddingRight(),
+                                    viewHolder.view.getPaddingBottom());
+                        }
+                    }
+                };
         PlaybackControlsRowPresenter presenter =
                 new PlaybackControlsRowPresenter(detailsPresenter) {
-            @Override
-            protected void onBindRowViewHolder(RowPresenter.ViewHolder vh, Object item) {
-                super.onBindRowViewHolder(vh, item);
-                vh.setOnKeyListener(DvrPlaybackControlHelper.this);
-            }
-
-            @Override
-            protected void onUnbindRowViewHolder(RowPresenter.ViewHolder vh) {
-                super.onUnbindRowViewHolder(vh);
-                vh.setOnKeyListener(null);
-            }
-        };
-        presenter.setProgressColor(getContext().getResources()
-                .getColor(R.color.play_controls_progress_bar_watched));
-        presenter.setBackgroundColor(getContext().getResources()
-                .getColor(R.color.play_controls_body_background_enabled));
+                    @Override
+                    protected void onBindRowViewHolder(RowPresenter.ViewHolder vh, Object item) {
+                        super.onBindRowViewHolder(vh, item);
+                        vh.setOnKeyListener(DvrPlaybackControlHelper.this);
+                    }
+
+                    @Override
+                    protected void onUnbindRowViewHolder(RowPresenter.ViewHolder vh) {
+                        super.onUnbindRowViewHolder(vh);
+                        vh.setOnKeyListener(null);
+                    }
+                };
+        presenter.setProgressColor(
+                getContext().getResources().getColor(R.color.play_controls_progress_bar_watched));
+        presenter.setBackgroundColor(
+                getContext()
+                        .getResources()
+                        .getColor(R.color.play_controls_body_background_enabled));
         setControlsRowPresenter(presenter);
     }
 
@@ -166,37 +172,40 @@ class DvrPlaybackControlHelper extends PlaybackControlGlue {
             return false;
         }
         int state = playbackState.getState();
-        return state != PlaybackState.STATE_NONE && state != PlaybackState.STATE_CONNECTING
+        return state != PlaybackState.STATE_NONE
+                && state != PlaybackState.STATE_CONNECTING
                 && state != PlaybackState.STATE_PAUSED;
     }
 
-    /**
-     * Returns the ID of the media under playback.
-     */
+    /** Returns the ID of the media under playback. */
     public String getMediaId() {
         MediaMetadata mediaMetadata = mMediaController.getMetadata();
-        return mediaMetadata == null ? null
+        return mediaMetadata == null
+                ? null
                 : mediaMetadata.getString(MediaMetadata.METADATA_KEY_MEDIA_ID);
     }
 
     @Override
     public CharSequence getMediaTitle() {
         MediaMetadata mediaMetadata = mMediaController.getMetadata();
-        return mediaMetadata == null ? ""
+        return mediaMetadata == null
+                ? ""
                 : mediaMetadata.getString(MediaMetadata.METADATA_KEY_TITLE);
     }
 
     @Override
     public CharSequence getMediaSubtitle() {
         MediaMetadata mediaMetadata = mMediaController.getMetadata();
-        return mediaMetadata == null ? ""
+        return mediaMetadata == null
+                ? ""
                 : mediaMetadata.getString(MediaMetadata.METADATA_KEY_DISPLAY_SUBTITLE);
     }
 
     @Override
     public int getMediaDuration() {
         MediaMetadata mediaMetadata = mMediaController.getMetadata();
-        return mediaMetadata == null ? 0
+        return mediaMetadata == null
+                ? 0
                 : (int) mediaMetadata.getLong(MediaMetadata.METADATA_KEY_DURATION);
     }
 
@@ -225,19 +234,18 @@ class DvrPlaybackControlHelper extends PlaybackControlGlue {
         return (int) playbackState.getPosition();
     }
 
-    /**
-     * Unregister media controller's callback.
-     */
+    /** Unregister media controller's callback. */
     void unregisterCallback() {
         mMediaController.unregisterCallback(mMediaControllerCallback);
     }
 
     /**
      * Update the secondary controls row.
-     * @param hasClosedCaption {@code true} to show the closed caption selection button,
-     *                         {@code false} to hide it.
-     * @param hasMultiAudio {@code true} to show the audio track selection button,
-     *                      {@code false} to hide it.
+     *
+     * @param hasClosedCaption {@code true} to show the closed caption selection button, {@code
+     *     false} to hide it.
+     * @param hasMultiAudio {@code true} to show the audio track selection button, {@code false} to
+     *     hide it.
      */
     void updateSecondaryRow(boolean hasClosedCaption, boolean hasMultiAudio) {
         if (hasClosedCaption) {
@@ -274,7 +282,7 @@ class DvrPlaybackControlHelper extends PlaybackControlGlue {
             mTransportControls.play();
         } else if (speedId <= -PLAYBACK_SPEED_FAST_L0) {
             mTransportControls.rewind();
-        } else if (speedId >= PLAYBACK_SPEED_FAST_L0){
+        } else if (speedId >= PLAYBACK_SPEED_FAST_L0) {
             mTransportControls.fastForward();
         }
     }
@@ -284,12 +292,10 @@ class DvrPlaybackControlHelper extends PlaybackControlGlue {
         mTransportControls.pause();
     }
 
-    /**
-     * Notifies closed caption being enabled/disabled to update related UI.
-     */
+    /** Notifies closed caption being enabled/disabled to update related UI. */
     void onSubtitleTrackStateChanged(boolean enabled) {
-        mClosedCaptioningAction.setIndex(enabled ?
-                ClosedCaptioningAction.ON : ClosedCaptioningAction.OFF);
+        mClosedCaptioningAction.setIndex(
+                enabled ? ClosedCaptioningAction.ON : ClosedCaptioningAction.OFF);
     }
 
     private void onStateChanged(int state, long positionMs, int speedLevel) {
@@ -344,7 +350,9 @@ class DvrPlaybackControlHelper extends PlaybackControlGlue {
         args.putString(DvrPlaybackSideFragment.SELECTED_TRACK_ID, selectedTrackId);
         DvrPlaybackSideFragment sideFragment = new DvrPlaybackSideFragment();
         sideFragment.setArguments(args);
-        mFragment.getFragmentManager().beginTransaction()
+        mFragment
+                .getFragmentManager()
+                .beginTransaction()
                 .hide(mFragment)
                 .replace(R.id.dvr_playback_side_fragment, sideFragment)
                 .addToBackStack(null)
@@ -367,7 +375,7 @@ class DvrPlaybackControlHelper extends PlaybackControlGlue {
     private static class MultiAudioAction extends MultiAction {
         MultiAudioAction(Context context) {
             super(AUDIO_ACTION_ID);
-            setDrawables(new Drawable[]{context.getDrawable(R.drawable.ic_tvoption_multi_track)});
+            setDrawables(new Drawable[] {context.getDrawable(R.drawable.ic_tvoption_multi_track)});
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/tv/dvr/ui/playback/DvrPlaybackMediaSessionHelper.java b/src/com/android/tv/dvr/ui/playback/DvrPlaybackMediaSessionHelper.java
index 843d2dbe..bef036eb 100644
--- a/src/com/android/tv/dvr/ui/playback/DvrPlaybackMediaSessionHelper.java
+++ b/src/com/android/tv/dvr/ui/playback/DvrPlaybackMediaSessionHelper.java
@@ -28,17 +28,15 @@ import android.media.tv.TvContract;
 import android.os.AsyncTask;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
-
 import com.android.tv.R;
-import com.android.tv.TvApplication;
-import com.android.tv.common.SoftPreconditions;
-import com.android.tv.data.Channel;
+import com.android.tv.TvSingletons;
 import com.android.tv.data.ChannelDataManager;
+import com.android.tv.data.api.Channel;
 import com.android.tv.dvr.DvrWatchedPositionManager;
 import com.android.tv.dvr.data.RecordedProgram;
-import com.android.tv.util.ImageLoader;
 import com.android.tv.util.TimeShiftUtils;
 import com.android.tv.util.Utils;
+import com.android.tv.util.images.ImageLoader;
 
 class DvrPlaybackMediaSessionHelper {
     private static final String TAG = "DvrPlaybackMediaSessionHelper";
@@ -55,49 +53,52 @@ class DvrPlaybackMediaSessionHelper {
     private final DvrWatchedPositionManager mDvrWatchedPositionManager;
     private final ChannelDataManager mChannelDataManager;
 
-    public DvrPlaybackMediaSessionHelper(Activity activity, String mediaSessionTag,
-            DvrPlayer dvrPlayer, DvrPlaybackOverlayFragment overlayFragment) {
+    public DvrPlaybackMediaSessionHelper(
+            Activity activity,
+            String mediaSessionTag,
+            DvrPlayer dvrPlayer,
+            DvrPlaybackOverlayFragment overlayFragment) {
         mActivity = activity;
         mDvrPlayer = dvrPlayer;
         mDvrWatchedPositionManager =
-                TvApplication.getSingletons(activity).getDvrWatchedPositionManager();
-        mChannelDataManager = TvApplication.getSingletons(activity).getChannelDataManager();
-        mDvrPlayer.setCallback(new DvrPlayer.DvrPlayerCallback() {
-            @Override
-            public void onPlaybackStateChanged(int playbackState, int playbackSpeed) {
-                updateMediaSessionPlaybackState();
-            }
+                TvSingletons.getSingletons(activity).getDvrWatchedPositionManager();
+        mChannelDataManager = TvSingletons.getSingletons(activity).getChannelDataManager();
+        mDvrPlayer.setCallback(
+                new DvrPlayer.DvrPlayerCallback() {
+                    @Override
+                    public void onPlaybackStateChanged(int playbackState, int playbackSpeed) {
+                        updateMediaSessionPlaybackState();
+                    }
 
-            @Override
-            public void onPlaybackPositionChanged(long positionMs) {
-                updateMediaSessionPlaybackState();
-                if (mDvrPlayer.isPlaybackPrepared()) {
-                    mDvrWatchedPositionManager
-                            .setWatchedPosition(mDvrPlayer.getProgram().getId(), positionMs);
-                }
-            }
+                    @Override
+                    public void onPlaybackPositionChanged(long positionMs) {
+                        updateMediaSessionPlaybackState();
+                        if (mDvrPlayer.isPlaybackPrepared()) {
+                            mDvrWatchedPositionManager.setWatchedPosition(
+                                    mDvrPlayer.getProgram().getId(), positionMs);
+                        }
+                    }
 
-            @Override
-            public void onPlaybackEnded() {
-                // TODO: Deal with watched over recordings in DVR library
-                RecordedProgram nextEpisode =
-                        overlayFragment.getNextEpisode(mDvrPlayer.getProgram());
-                if (nextEpisode == null) {
-                    mDvrPlayer.reset();
-                    mActivity.finish();
-                } else {
-                    Intent intent = new Intent(activity, DvrPlaybackActivity.class);
-                    intent.putExtra(Utils.EXTRA_KEY_RECORDED_PROGRAM_ID, nextEpisode.getId());
-                    mActivity.startActivity(intent);
-                }
-            }
-        });
+                    @Override
+                    public void onPlaybackEnded() {
+                        // TODO: Deal with watched over recordings in DVR library
+                        RecordedProgram nextEpisode =
+                                overlayFragment.getNextEpisode(mDvrPlayer.getProgram());
+                        if (nextEpisode == null) {
+                            mDvrPlayer.reset();
+                            mActivity.finish();
+                        } else {
+                            Intent intent = new Intent(activity, DvrPlaybackActivity.class);
+                            intent.putExtra(
+                                    Utils.EXTRA_KEY_RECORDED_PROGRAM_ID, nextEpisode.getId());
+                            mActivity.startActivity(intent);
+                        }
+                    }
+                });
         initializeMediaSession(mediaSessionTag);
     }
 
-    /**
-     * Stops DVR player and release media session.
-     */
+    /** Stops DVR player and release media session. */
     public void release() {
         if (mDvrPlayer != null) {
             mDvrPlayer.reset();
@@ -108,13 +109,15 @@ class DvrPlaybackMediaSessionHelper {
         }
     }
 
-    /**
-     * Updates media session's playback state and speed.
-     */
+    /** Updates media session's playback state and speed. */
     public void updateMediaSessionPlaybackState() {
-        mMediaSession.setPlaybackState(new PlaybackState.Builder()
-                .setState(mDvrPlayer.getPlaybackState(), mDvrPlayer.getPlaybackPosition(),
-                        mSpeedLevel).build());
+        mMediaSession.setPlaybackState(
+                new PlaybackState.Builder()
+                        .setState(
+                                mDvrPlayer.getPlaybackState(),
+                                mDvrPlayer.getPlaybackPosition(),
+                                mSpeedLevel)
+                        .build());
     }
 
     /**
@@ -132,42 +135,35 @@ class DvrPlaybackMediaSessionHelper {
         }
     }
 
-    /**
-     * Returns the recorded program now playing.
-     */
+    /** Returns the recorded program now playing. */
     public RecordedProgram getProgram() {
         return mDvrPlayer.getProgram();
     }
 
-    /**
-     * Checks if the recorded program is the same as now playing one.
-     */
+    /** Checks if the recorded program is the same as now playing one. */
     public boolean isCurrentProgram(RecordedProgram program) {
         return program != null && program.equals(getProgram());
     }
 
-    /**
-     * Returns playback state.
-     */
+    /** Returns playback state. */
     public int getPlaybackState() {
         return mDvrPlayer.getPlaybackState();
     }
 
-    /**
-     * Returns the underlying DVR player.
-     */
+    /** Returns the underlying DVR player. */
     public DvrPlayer getDvrPlayer() {
         return mDvrPlayer;
     }
 
     private void initializeMediaSession(String mediaSessionTag) {
         mMediaSession = new MediaSession(mActivity, mediaSessionTag);
-        mMediaSession.setFlags(MediaSession.FLAG_HANDLES_MEDIA_BUTTONS
-                | MediaSession.FLAG_HANDLES_TRANSPORT_CONTROLS);
-        mNowPlayingCardWidth = mActivity.getResources()
-                .getDimensionPixelSize(R.dimen.notif_card_img_max_width);
-        mNowPlayingCardHeight = mActivity.getResources()
-                .getDimensionPixelSize(R.dimen.notif_card_img_height);
+        mMediaSession.setFlags(
+                MediaSession.FLAG_HANDLES_MEDIA_BUTTONS
+                        | MediaSession.FLAG_HANDLES_TRANSPORT_CONTROLS);
+        mNowPlayingCardWidth =
+                mActivity.getResources().getDimensionPixelSize(R.dimen.notif_card_img_max_width);
+        mNowPlayingCardHeight =
+                mActivity.getResources().getDimensionPixelSize(R.dimen.notif_card_img_height);
         mMediaSession.setCallback(new MediaSessionCallback());
         mActivity.setMediaController(
                 new MediaController(mActivity, mMediaSession.getSessionToken()));
@@ -179,11 +175,17 @@ class DvrPlaybackMediaSessionHelper {
         String cardTitleText = program.getTitle();
         if (TextUtils.isEmpty(cardTitleText)) {
             Channel channel = mChannelDataManager.getChannel(program.getChannelId());
-            cardTitleText = (channel != null) ? channel.getDisplayName()
-                    : mActivity.getString(R.string.no_program_information);
+            cardTitleText =
+                    (channel != null)
+                            ? channel.getDisplayName()
+                            : mActivity.getString(R.string.no_program_information);
         }
-        final MediaMetadata currentMetadata = updateMetadataTextInfo(program.getId(), cardTitleText,
-                program.getDescription(), mProgramDurationMs);
+        final MediaMetadata currentMetadata =
+                updateMetadataTextInfo(
+                        program.getId(),
+                        cardTitleText,
+                        program.getDescription(),
+                        mProgramDurationMs);
         String posterArtUri = program.getPosterArtUri();
         if (posterArtUri == null) {
             posterArtUri = TvContract.buildChannelLogoUri(program.getChannelId()).toString();
@@ -192,12 +194,18 @@ class DvrPlaybackMediaSessionHelper {
         mMediaSession.setActive(true);
     }
 
-    private void updatePosterArt(RecordedProgram program, MediaMetadata currentMetadata,
-            @Nullable Bitmap posterArt, @Nullable String posterArtUri) {
+    private void updatePosterArt(
+            RecordedProgram program,
+            MediaMetadata currentMetadata,
+            @Nullable Bitmap posterArt,
+            @Nullable String posterArtUri) {
         if (posterArt != null) {
             updateMetadataImageInfo(program, currentMetadata, posterArt, 0);
         } else if (posterArtUri != null) {
-            ImageLoader.loadBitmap(mActivity, posterArtUri, mNowPlayingCardWidth,
+            ImageLoader.loadBitmap(
+                    mActivity,
+                    posterArtUri,
+                    mNowPlayingCardWidth,
                     mNowPlayingCardHeight,
                     new ProgramPosterArtCallback(mActivity, program, currentMetadata));
         } else {
@@ -205,13 +213,12 @@ class DvrPlaybackMediaSessionHelper {
         }
     }
 
-    private class ProgramPosterArtCallback extends
-            ImageLoader.ImageLoaderCallback<Activity> {
+    private class ProgramPosterArtCallback extends ImageLoader.ImageLoaderCallback<Activity> {
         private final RecordedProgram mRecordedProgram;
         private final MediaMetadata mCurrentMetadata;
 
-        public ProgramPosterArtCallback(Activity activity, RecordedProgram program,
-                MediaMetadata metadata) {
+        public ProgramPosterArtCallback(
+                Activity activity, RecordedProgram program, MediaMetadata metadata) {
             super(activity);
             mRecordedProgram = program;
             mCurrentMetadata = metadata;
@@ -225,8 +232,8 @@ class DvrPlaybackMediaSessionHelper {
         }
     }
 
-    private MediaMetadata updateMetadataTextInfo(final long programId, final String title,
-            final String subtitle, final long duration) {
+    private MediaMetadata updateMetadataTextInfo(
+            final long programId, final String title, final String subtitle, final long duration) {
         MediaMetadata.Builder builder = new MediaMetadata.Builder();
         builder.putString(MediaMetadata.METADATA_KEY_MEDIA_ID, Long.toString(programId))
                 .putString(MediaMetadata.METADATA_KEY_TITLE, title)
@@ -239,8 +246,11 @@ class DvrPlaybackMediaSessionHelper {
         return metadata;
     }
 
-    private void updateMetadataImageInfo(final RecordedProgram program,
-            final MediaMetadata currentMetadata, final Bitmap posterArt, final int imageResId) {
+    private void updateMetadataImageInfo(
+            final RecordedProgram program,
+            final MediaMetadata currentMetadata,
+            final Bitmap posterArt,
+            final int imageResId) {
         if (mMediaSession != null && (posterArt != null || imageResId != 0)) {
             MediaMetadata.Builder builder = new MediaMetadata.Builder(currentMetadata);
             if (posterArt != null) {
@@ -255,7 +265,8 @@ class DvrPlaybackMediaSessionHelper {
 
                     @Override
                     protected void onPostExecute(Bitmap programPosterArt) {
-                        if (mMediaSession != null && programPosterArt != null
+                        if (mMediaSession != null
+                                && programPosterArt != null
                                 && isCurrentProgram(program)) {
                             builder.putBitmap(MediaMetadata.METADATA_KEY_ART, programPosterArt);
                             mMediaSession.setMetadata(builder.build());
diff --git a/src/com/android/tv/dvr/ui/playback/DvrPlaybackOverlayFragment.java b/src/com/android/tv/dvr/ui/playback/DvrPlaybackOverlayFragment.java
index 783ae682..d3374cfa 100644
--- a/src/com/android/tv/dvr/ui/playback/DvrPlaybackOverlayFragment.java
+++ b/src/com/android/tv/dvr/ui/playback/DvrPlaybackOverlayFragment.java
@@ -21,12 +21,12 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Point;
 import android.hardware.display.DisplayManager;
-import android.media.tv.TvContentRating;
-import android.media.tv.TvTrackInfo;
-import android.os.Bundle;
 import android.media.session.PlaybackState;
+import android.media.tv.TvContentRating;
 import android.media.tv.TvInputManager;
+import android.media.tv.TvTrackInfo;
 import android.media.tv.TvView;
+import android.os.Bundle;
 import android.support.v17.leanback.app.PlaybackFragment;
 import android.support.v17.leanback.app.PlaybackFragmentGlueHost;
 import android.support.v17.leanback.widget.ArrayObjectAdapter;
@@ -37,14 +37,13 @@ import android.support.v17.leanback.widget.ListRow;
 import android.support.v17.leanback.widget.Presenter;
 import android.support.v17.leanback.widget.RowPresenter;
 import android.support.v17.leanback.widget.SinglePresenterSelector;
+import android.util.Log;
 import android.view.Display;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;
-import android.util.Log;
-
 import com.android.tv.R;
-import com.android.tv.TvApplication;
+import com.android.tv.TvSingletons;
 import com.android.tv.data.BaseProgram;
 import com.android.tv.dialog.PinDialogFragment;
 import com.android.tv.dvr.DvrDataManager;
@@ -57,9 +56,8 @@ import com.android.tv.parental.ContentRatingsManager;
 import com.android.tv.util.TvSettings;
 import com.android.tv.util.TvTrackInfoUtils;
 import com.android.tv.util.Utils;
-
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 public class DvrPlaybackOverlayFragment extends PlaybackFragment {
     // TODO: Handles audio focus. Deals with block and ratings.
@@ -104,15 +102,25 @@ public class DvrPlaybackOverlayFragment extends PlaybackFragment {
     public void onCreate(Bundle savedInstanceState) {
         if (DEBUG) Log.d(TAG, "onCreate");
         super.onCreate(savedInstanceState);
-        mVerticalPaddingBase = getActivity().getResources()
-                .getDimensionPixelOffset(R.dimen.dvr_playback_overlay_padding_top_base);
-        mPaddingWithoutRelatedRow = getActivity().getResources()
-                .getDimensionPixelOffset(R.dimen.dvr_playback_overlay_padding_top_no_related_row);
-        mPaddingWithoutSecondaryRow = getActivity().getResources()
-                .getDimensionPixelOffset(R.dimen.dvr_playback_overlay_padding_top_no_secondary_row);
-        mDvrDataManager = TvApplication.getSingletons(getActivity()).getDvrDataManager();
-        mContentRatingsManager = TvApplication.getSingletons(getContext())
-                .getTvInputManagerHelper().getContentRatingsManager();
+        mVerticalPaddingBase =
+                getActivity()
+                        .getResources()
+                        .getDimensionPixelOffset(R.dimen.dvr_playback_overlay_padding_top_base);
+        mPaddingWithoutRelatedRow =
+                getActivity()
+                        .getResources()
+                        .getDimensionPixelOffset(
+                                R.dimen.dvr_playback_overlay_padding_top_no_related_row);
+        mPaddingWithoutSecondaryRow =
+                getActivity()
+                        .getResources()
+                        .getDimensionPixelOffset(
+                                R.dimen.dvr_playback_overlay_padding_top_no_secondary_row);
+        mDvrDataManager = TvSingletons.getSingletons(getActivity()).getDvrDataManager();
+        mContentRatingsManager =
+                TvSingletons.getSingletons(getContext())
+                        .getTvInputManagerHelper()
+                        .getContentRatingsManager();
         if (!mDvrDataManager.isRecordedProgramLoadFinished()) {
             mDvrDataManager.addRecordedProgramLoadFinishedListener(
                     new DvrDataManager.OnRecordedProgramLoadFinishedListener() {
@@ -124,14 +132,14 @@ public class DvrPlaybackOverlayFragment extends PlaybackFragment {
                                 preparePlayback(getActivity().getIntent());
                             }
                         }
-                    }
-            );
+                    });
         } else if (!handleIntent(getActivity().getIntent(), true)) {
             return;
         }
         Point size = new Point();
         ((DisplayManager) getContext().getSystemService(Context.DISPLAY_SERVICE))
-                .getDisplay(Display.DEFAULT_DISPLAY).getSize(size);
+                .getDisplay(Display.DEFAULT_DISPLAY)
+                .getSize(size);
         mWindowWidth = size.x;
         mWindowHeight = size.y;
         mWindowAspectRatio = mAppliedAspectRatio = (float) mWindowWidth / mWindowHeight;
@@ -152,19 +160,20 @@ public class DvrPlaybackOverlayFragment extends PlaybackFragment {
         mTvView = (TvView) getActivity().findViewById(R.id.dvr_tv_view);
         mBlockScreenView = getActivity().findViewById(R.id.block_screen);
         mDvrPlayer = new DvrPlayer(mTvView);
-        mMediaSessionHelper = new DvrPlaybackMediaSessionHelper(
-                getActivity(), MEDIA_SESSION_TAG, mDvrPlayer, this);
+        mMediaSessionHelper =
+                new DvrPlaybackMediaSessionHelper(
+                        getActivity(), MEDIA_SESSION_TAG, mDvrPlayer, this);
         mPlaybackControlHelper = new DvrPlaybackControlHelper(getActivity(), this);
         mRelatedRecordingsRow = getRelatedRecordingsRow();
         mDvrPlayer.setOnTracksAvailabilityChangedListener(
                 new DvrPlayer.OnTracksAvailabilityChangedListener() {
                     @Override
-                    public void onTracksAvailabilityChanged(boolean hasClosedCaption,
-                            boolean hasMultiAudio) {
+                    public void onTracksAvailabilityChanged(
+                            boolean hasClosedCaption, boolean hasMultiAudio) {
                         mPlaybackControlHelper.updateSecondaryRow(hasClosedCaption, hasMultiAudio);
                         if (hasClosedCaption) {
-                            mDvrPlayer.setOnTrackSelectedListener(TvTrackInfo.TYPE_SUBTITLE,
-                                    mOnSubtitleTrackSelectedListener);
+                            mDvrPlayer.setOnTrackSelectedListener(
+                                    TvTrackInfo.TYPE_SUBTITLE, mOnSubtitleTrackSelectedListener);
                             selectBestMatchedTrack(TvTrackInfo.TYPE_SUBTITLE);
                         } else {
                             mDvrPlayer.setOnTrackSelectedListener(TvTrackInfo.TYPE_SUBTITLE, null);
@@ -175,15 +184,18 @@ public class DvrPlaybackOverlayFragment extends PlaybackFragment {
                         updateVerticalPosition();
                         mPlaybackControlHelper.getHost().notifyPlaybackRowChanged();
                     }
-        });
-        mDvrPlayer.setOnAspectRatioChangedListener(new DvrPlayer.OnAspectRatioChangedListener() {
-            @Override
-            public void onAspectRatioChanged(float videoAspectRatio) {
-                updateAspectRatio(videoAspectRatio);
-            }
-        });
-        mPinChecked = getActivity().getIntent()
-                .getBooleanExtra(Utils.EXTRA_KEY_RECORDED_PROGRAM_PIN_CHECKED, false);
+                });
+        mDvrPlayer.setOnAspectRatioChangedListener(
+                new DvrPlayer.OnAspectRatioChangedListener() {
+                    @Override
+                    public void onAspectRatioChanged(float videoAspectRatio) {
+                        updateAspectRatio(videoAspectRatio);
+                    }
+                });
+        mPinChecked =
+                getActivity()
+                        .getIntent()
+                        .getBooleanExtra(Utils.EXTRA_KEY_RECORDED_PROGRAM_PIN_CHECKED, false);
         mDvrPlayer.setOnContentBlockedListener(
                 new DvrPlayer.OnContentBlockedListener() {
                     @Override
@@ -221,20 +233,25 @@ public class DvrPlaybackOverlayFragment extends PlaybackFragment {
                                         PinDialogFragment.DIALOG_TAG);
                     }
                 });
-        setOnItemViewClickedListener(new BaseOnItemViewClickedListener() {
-            @Override
-            public void onItemClicked(Presenter.ViewHolder itemViewHolder, Object item,
-                    RowPresenter.ViewHolder rowViewHolder, Object row) {
-                if (itemViewHolder.view instanceof RecordingCardView) {
-                    setFadingEnabled(false);
-                    long programId = ((RecordedProgram) itemViewHolder.view.getTag()).getId();
-                    if (DEBUG) Log.d(TAG, "Play Related Recording:" + programId);
-                    Intent intent = new Intent(getContext(), DvrPlaybackActivity.class);
-                    intent.putExtra(Utils.EXTRA_KEY_RECORDED_PROGRAM_ID, programId);
-                    getContext().startActivity(intent);
-                }
-            }
-        });
+        setOnItemViewClickedListener(
+                new BaseOnItemViewClickedListener() {
+                    @Override
+                    public void onItemClicked(
+                            Presenter.ViewHolder itemViewHolder,
+                            Object item,
+                            RowPresenter.ViewHolder rowViewHolder,
+                            Object row) {
+                        if (itemViewHolder.view instanceof RecordingCardView) {
+                            setFadingEnabled(false);
+                            long programId =
+                                    ((RecordedProgram) itemViewHolder.view.getTag()).getId();
+                            if (DEBUG) Log.d(TAG, "Play Related Recording:" + programId);
+                            Intent intent = new Intent(getContext(), DvrPlaybackActivity.class);
+                            intent.putExtra(Utils.EXTRA_KEY_RECORDED_PROGRAM_ID, programId);
+                            getContext().startActivity(intent);
+                        }
+                    }
+                });
         if (mProgram != null) {
             setUpRows();
             preparePlayback(getActivity().getIntent());
@@ -265,9 +282,7 @@ public class DvrPlaybackOverlayFragment extends PlaybackFragment {
         super.onDestroy();
     }
 
-    /**
-     * Passes the intent to the fragment.
-     */
+    /** Passes the intent to the fragment. */
     public void onNewIntent(Intent intent) {
         if (mDvrDataManager.isRecordedProgramLoadFinished() && handleIntent(intent, false)) {
             preparePlayback(intent);
@@ -275,8 +290,8 @@ public class DvrPlaybackOverlayFragment extends PlaybackFragment {
     }
 
     /**
-     * Should be called when windows' size is changed in order to notify DVR player
-     * to update it's view width/height and position.
+     * Should be called when windows' size is changed in order to notify DVR player to update it's
+     * view width/height and position.
      */
     public void onWindowSizeChanged(final int windowWidth, final int windowHeight) {
         mWindowWidth = windowWidth;
@@ -285,9 +300,7 @@ public class DvrPlaybackOverlayFragment extends PlaybackFragment {
         updateAspectRatio(mAppliedAspectRatio);
     }
 
-    /**
-     * Returns next recorded episode in the same series as now playing program.
-     */
+    /** Returns next recorded episode in the same series as now playing program. */
     public RecordedProgram getNextEpisode(RecordedProgram program) {
         int position = mRelatedRecordingsRowAdapter.findInsertPosition(program);
         if (position == mRelatedRecordingsRowAdapter.size()) {
@@ -299,9 +312,9 @@ public class DvrPlaybackOverlayFragment extends PlaybackFragment {
 
     /**
      * Returns the tracks of the give type of the current playback.
-
-     * @param trackType Should be {@link TvTrackInfo#TYPE_SUBTITLE}
-     *                  or {@link TvTrackInfo#TYPE_AUDIO}. Or returns {@code null}.
+     *
+     * @param trackType Should be {@link TvTrackInfo#TYPE_SUBTITLE} or {@link
+     *     TvTrackInfo#TYPE_AUDIO}. Or returns {@code null}.
      */
     public ArrayList<TvTrackInfo> getTracks(int trackType) {
         if (trackType == TvTrackInfo.TYPE_AUDIO) {
@@ -312,18 +325,16 @@ public class DvrPlaybackOverlayFragment extends PlaybackFragment {
         return null;
     }
 
-    /**
-     * Returns the ID of the selected track of the given type.
-     */
+    /** Returns the ID of the selected track of the given type. */
     public String getSelectedTrackId(int trackType) {
         return mDvrPlayer.getSelectedTrackId(trackType);
     }
 
     /**
      * Returns the language setting of the given track type.
-
-     * @param trackType Should be {@link TvTrackInfo#TYPE_SUBTITLE}
-     *                  or {@link TvTrackInfo#TYPE_AUDIO}.
+     *
+     * @param trackType Should be {@link TvTrackInfo#TYPE_SUBTITLE} or {@link
+     *     TvTrackInfo#TYPE_AUDIO}.
      * @return {@code null} if no language has been set for the given track type.
      */
     TvTrackInfo getTrackSetting(int trackType) {
@@ -332,10 +343,11 @@ public class DvrPlaybackOverlayFragment extends PlaybackFragment {
 
     /**
      * Selects the given audio or subtitle track for DVR playback.
-     * @param trackType Should be {@link TvTrackInfo#TYPE_SUBTITLE}
-     *                  or {@link TvTrackInfo#TYPE_AUDIO}.
+     *
+     * @param trackType Should be {@link TvTrackInfo#TYPE_SUBTITLE} or {@link
+     *     TvTrackInfo#TYPE_AUDIO}.
      * @param selectedTrack {@code null} to disable the audio or subtitle track according to
-     *                      trackType.
+     *     trackType.
      */
     void selectTrack(int trackType, TvTrackInfo selectedTrack) {
         if (mDvrPlayer.isPlaybackPrepared()) {
@@ -346,8 +358,11 @@ public class DvrPlaybackOverlayFragment extends PlaybackFragment {
     private boolean handleIntent(Intent intent, boolean finishActivity) {
         mProgram = getProgramFromIntent(intent);
         if (mProgram == null) {
-            Toast.makeText(getActivity(), getString(R.string.dvr_program_not_found),
-                    Toast.LENGTH_SHORT).show();
+            Toast.makeText(
+                            getActivity(),
+                            getString(R.string.dvr_program_not_found),
+                            Toast.LENGTH_SHORT)
+                    .show();
             if (finishActivity) {
                 getActivity().finish();
             }
@@ -359,12 +374,18 @@ public class DvrPlaybackOverlayFragment extends PlaybackFragment {
     private void selectBestMatchedTrack(int trackType) {
         TvTrackInfo selectedTrack = getTrackSetting(trackType);
         if (selectedTrack != null) {
-            TvTrackInfo bestMatchedTrack = TvTrackInfoUtils.getBestTrackInfo(getTracks(trackType),
-                    selectedTrack.getId(), selectedTrack.getLanguage(),
-                    trackType == TvTrackInfo.TYPE_AUDIO ? selectedTrack.getAudioChannelCount() : 0);
-            if (bestMatchedTrack != null && (trackType == TvTrackInfo.TYPE_AUDIO || Utils
-                    .isEqualLanguage(bestMatchedTrack.getLanguage(),
-                            selectedTrack.getLanguage()))) {
+            TvTrackInfo bestMatchedTrack =
+                    TvTrackInfoUtils.getBestTrackInfo(
+                            getTracks(trackType),
+                            selectedTrack.getId(),
+                            selectedTrack.getLanguage(),
+                            trackType == TvTrackInfo.TYPE_AUDIO
+                                    ? selectedTrack.getAudioChannelCount()
+                                    : 0);
+            if (bestMatchedTrack != null
+                    && (trackType == TvTrackInfo.TYPE_AUDIO
+                            || Utils.isEqualLanguage(
+                                    bestMatchedTrack.getLanguage(), selectedTrack.getLanguage()))) {
                 selectTrack(trackType, bestMatchedTrack);
                 return;
             }
@@ -421,7 +442,7 @@ public class DvrPlaybackOverlayFragment extends PlaybackFragment {
         }
         if (mRelatedRecordingsRowAdapter.size() == 0) {
             mRowsAdapter.remove(mRelatedRecordingsRow);
-        } else if (wasEmpty){
+        } else if (wasEmpty) {
             mRowsAdapter.add(mRelatedRecordingsRow);
         }
         updateVerticalPosition();
@@ -446,8 +467,9 @@ public class DvrPlaybackOverlayFragment extends PlaybackFragment {
     private ListRow getRelatedRecordingsRow() {
         mRelatedRecordingCardPresenter = new DvrPlaybackCardPresenter(getActivity());
         mRelatedRecordingsRowAdapter = new RelatedRecordingsAdapter(mRelatedRecordingCardPresenter);
-        HeaderItem header = new HeaderItem(0,
-                getActivity().getString(R.string.dvr_playback_related_recordings));
+        HeaderItem header =
+                new HeaderItem(
+                        0, getActivity().getString(R.string.dvr_playback_related_recordings));
         return new ListRow(header, mRelatedRecordingsRowAdapter);
     }
 
@@ -457,8 +479,8 @@ public class DvrPlaybackOverlayFragment extends PlaybackFragment {
     }
 
     private long getSeekTimeFromIntent(Intent intent) {
-        return intent.getLongExtra(Utils.EXTRA_KEY_RECORDED_PROGRAM_SEEK_TIME,
-                TvInputManager.TIME_SHIFT_INVALID_TIME);
+        return intent.getLongExtra(
+                Utils.EXTRA_KEY_RECORDED_PROGRAM_SEEK_TIME, TvInputManager.TIME_SHIFT_INVALID_TIME);
     }
 
     private void updateVerticalPosition() {
@@ -491,4 +513,4 @@ public class DvrPlaybackOverlayFragment extends PlaybackFragment {
             return item.getId();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/tv/dvr/ui/playback/DvrPlaybackSideFragment.java b/src/com/android/tv/dvr/ui/playback/DvrPlaybackSideFragment.java
index e49870f1..b4481df8 100644
--- a/src/com/android/tv/dvr/ui/playback/DvrPlaybackSideFragment.java
+++ b/src/com/android/tv/dvr/ui/playback/DvrPlaybackSideFragment.java
@@ -26,24 +26,16 @@ import android.transition.Transition;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-
 import com.android.tv.R;
 import com.android.tv.util.TvSettings;
-
 import java.util.List;
 import java.util.Locale;
 
-/**
- * Fragment for DVR playback closed-caption/multi-audio settings.
- */
+/** Fragment for DVR playback closed-caption/multi-audio settings. */
 public class DvrPlaybackSideFragment extends GuidedStepFragment {
-    /**
-     * The tag for passing track infos to side fragments.
-     */
+    /** The tag for passing track infos to side fragments. */
     public static final String TRACK_INFOS = "dvr_key_track_infos";
-    /**
-     * The tag for passing selected track's ID to side fragments.
-     */
+    /** The tag for passing selected track's ID to side fragments. */
     public static final String SELECTED_TRACK_ID = "dvr_key_selected_track_id";
 
     private static final int ACTION_ID_NO_SUBTITLE = -1;
@@ -60,39 +52,42 @@ public class DvrPlaybackSideFragment extends GuidedStepFragment {
         mTrackInfos = getArguments().getParcelableArrayList(TRACK_INFOS);
         mTrackType = mTrackInfos.get(0).getType();
         mSelectedTrackId = getArguments().getString(SELECTED_TRACK_ID);
-        mOverlayFragment = ((DvrPlaybackOverlayFragment) getFragmentManager()
-                .findFragmentById(R.id.dvr_playback_controls_fragment));
+        mOverlayFragment =
+                ((DvrPlaybackOverlayFragment)
+                        getFragmentManager().findFragmentById(R.id.dvr_playback_controls_fragment));
         super.onCreate(savedInstanceState);
     }
 
     @Override
-    public View onCreateBackgroundView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
+    public View onCreateBackgroundView(
+            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View backgroundView = super.onCreateBackgroundView(inflater, container, savedInstanceState);
-        backgroundView.setBackgroundColor(getResources()
-                .getColor(R.color.lb_playback_controls_background_light));
+        backgroundView.setBackgroundColor(
+                getResources().getColor(R.color.lb_playback_controls_background_light));
         return backgroundView;
     }
 
     @Override
     public void onCreateActions(@NonNull List<GuidedAction> actions, Bundle savedInstanceState) {
         if (mTrackType == TvTrackInfo.TYPE_SUBTITLE) {
-            actions.add(new GuidedAction.Builder(getActivity())
-                    .id(ACTION_ID_NO_SUBTITLE)
-                    .title(getString(R.string.closed_caption_option_item_off))
-                    .checkSetId(CHECK_SET_ID)
-                    .checked(mSelectedTrackId == null)
-                    .build());
+            actions.add(
+                    new GuidedAction.Builder(getActivity())
+                            .id(ACTION_ID_NO_SUBTITLE)
+                            .title(getString(R.string.closed_caption_option_item_off))
+                            .checkSetId(CHECK_SET_ID)
+                            .checked(mSelectedTrackId == null)
+                            .build());
         }
         for (int i = 0; i < mTrackInfos.size(); i++) {
             TvTrackInfo info = mTrackInfos.get(i);
             boolean checked = TextUtils.equals(info.getId(), mSelectedTrackId);
-            GuidedAction action = new GuidedAction.Builder(getActivity())
-                    .id(i)
-                    .title(getTrackLabel(info, i))
-                    .checkSetId(CHECK_SET_ID)
-                    .checked(checked)
-                    .build();
+            GuidedAction action =
+                    new GuidedAction.Builder(getActivity())
+                            .id(i)
+                            .title(getTrackLabel(info, i))
+                            .checkSetId(CHECK_SET_ID)
+                            .checked(checked)
+                            .build();
             actions.add(action);
             if (checked) {
                 mSelectedTrack = info;
@@ -136,8 +131,8 @@ public class DvrPlaybackSideFragment extends GuidedStepFragment {
         if (track.getLanguage() != null) {
             return new Locale(track.getLanguage()).getDisplayName();
         }
-        return track.getType() == TvTrackInfo.TYPE_SUBTITLE ?
-                getString(R.string.closed_caption_unknown_language, trackIndex + 1)
+        return track.getType() == TvTrackInfo.TYPE_SUBTITLE
+                ? getString(R.string.closed_caption_unknown_language, trackIndex + 1)
                 : getString(R.string.multi_audio_unknown_language);
     }
 
@@ -151,4 +146,4 @@ public class DvrPlaybackSideFragment extends GuidedStepFragment {
             t.excludeTarget(R.id.guidedstep_background, true);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/tv/dvr/ui/playback/DvrPlayer.java b/src/com/android/tv/dvr/ui/playback/DvrPlayer.java
index 7226c666..85bb31b2 100644
--- a/src/com/android/tv/dvr/ui/playback/DvrPlayer.java
+++ b/src/com/android/tv/dvr/ui/playback/DvrPlayer.java
@@ -24,9 +24,7 @@ import android.media.tv.TvTrackInfo;
 import android.media.tv.TvView;
 import android.text.TextUtils;
 import android.util.Log;
-
 import com.android.tv.dvr.data.RecordedProgram;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -35,17 +33,13 @@ class DvrPlayer {
     private static final String TAG = "DvrPlayer";
     private static final boolean DEBUG = false;
 
-    /**
-     * The max rewinding speed supported by DVR player.
-     */
+    /** The max rewinding speed supported by DVR player. */
     public static final int MAX_REWIND_SPEED = 256;
-    /**
-     * The max fast-forwarding speed supported by DVR player.
-     */
+    /** The max fast-forwarding speed supported by DVR player. */
     public static final int MAX_FAST_FORWARD_SPEED = 256;
 
     private static final long SEEK_POSITION_MARGIN_MS = TimeUnit.SECONDS.toMillis(2);
-    private static final long REWIND_POSITION_MARGIN_MS = 32;  // Workaround value. b/29994826
+    private static final long REWIND_POSITION_MARGIN_MS = 32; // Workaround value. b/29994826
 
     private RecordedProgram mProgram;
     private long mInitialSeekPositionMs;
@@ -71,49 +65,39 @@ class DvrPlayer {
 
     public static class DvrPlayerCallback {
         /**
-         * Called when the playback position is changed. The normal updating frequency is
-         * around 1 sec., which is restricted to the implementation of
-         * {@link android.media.tv.TvInputService}.
+         * Called when the playback position is changed. The normal updating frequency is around 1
+         * sec., which is restricted to the implementation of {@link
+         * android.media.tv.TvInputService}.
          */
-        public void onPlaybackPositionChanged(long positionMs) { }
-        /**
-         * Called when the playback state or the playback speed is changed.
-         */
-        public void onPlaybackStateChanged(int playbackState, int playbackSpeed) { }
-        /**
-         * Called when the playback toward the end.
-         */
-        public void onPlaybackEnded() { }
+        public void onPlaybackPositionChanged(long positionMs) {}
+        /** Called when the playback state or the playback speed is changed. */
+        public void onPlaybackStateChanged(int playbackState, int playbackSpeed) {}
+        /** Called when the playback toward the end. */
+        public void onPlaybackEnded() {}
     }
 
     public interface OnAspectRatioChangedListener {
         /**
          * Called when the Video's aspect ratio is changed.
          *
-         * @param videoAspectRatio The aspect ratio of video. 0 stands for unknown ratios.
-         *                         Listeners should handle it carefully.
+         * @param videoAspectRatio The aspect ratio of video. 0 stands for unknown ratios. Listeners
+         *     should handle it carefully.
          */
         void onAspectRatioChanged(float videoAspectRatio);
     }
 
     public interface OnContentBlockedListener {
-        /**
-         * Called when the Video's aspect ratio is changed.
-         */
+        /** Called when the Video's aspect ratio is changed. */
         void onContentBlocked(TvContentRating rating);
     }
 
     public interface OnTracksAvailabilityChangedListener {
-        /**
-         * Called when the Video's subtitle or audio tracks are changed.
-         */
+        /** Called when the Video's subtitle or audio tracks are changed. */
         void onTracksAvailabilityChanged(boolean hasClosedCaption, boolean hasMultiAudio);
     }
 
     public interface OnTrackSelectedListener {
-        /**
-         * Called when certain subtitle or audio track is selected.
-         */
+        /** Called when certain subtitle or audio track is selected. */
         void onTrackSelected(String selectedTrackId);
     }
 
@@ -143,9 +127,7 @@ class DvrPlayer {
         mCallback.onPlaybackStateChanged(mPlaybackState, 1);
     }
 
-    /**
-     * Resumes playback.
-     */
+    /** Resumes playback. */
     public void play() throws IllegalStateException {
         if (DEBUG) Log.d(TAG, "play()");
         if (!isPlaybackPrepared()) {
@@ -163,9 +145,7 @@ class DvrPlayer {
         mCallback.onPlaybackStateChanged(mPlaybackState, 1);
     }
 
-    /**
-     * Pauses playback.
-     */
+    /** Pauses playback. */
     public void pause() throws IllegalStateException {
         if (DEBUG) Log.d(TAG, "pause()");
         if (!isPlaybackPrepared()) {
@@ -187,8 +167,8 @@ class DvrPlayer {
     }
 
     /**
-     * Fast-forwards playback with the given speed. If the given speed is larger than
-     * {@value #MAX_FAST_FORWARD_SPEED}, uses {@value #MAX_FAST_FORWARD_SPEED}.
+     * Fast-forwards playback with the given speed. If the given speed is larger than {@value
+     * #MAX_FAST_FORWARD_SPEED}, uses {@value #MAX_FAST_FORWARD_SPEED}.
      */
     public void fastForward(int speed) throws IllegalStateException {
         if (DEBUG) Log.d(TAG, "fastForward()");
@@ -209,8 +189,8 @@ class DvrPlayer {
     }
 
     /**
-     * Rewinds playback with the given speed. If the given speed is larger than
-     * {@value #MAX_REWIND_SPEED}, uses {@value #MAX_REWIND_SPEED}.
+     * Rewinds playback with the given speed. If the given speed is larger than {@value
+     * #MAX_REWIND_SPEED}, uses {@value #MAX_REWIND_SPEED}.
      */
     public void rewind(int speed) throws IllegalStateException {
         if (DEBUG) Log.d(TAG, "rewind()");
@@ -230,9 +210,7 @@ class DvrPlayer {
         mCallback.onPlaybackStateChanged(mPlaybackState, speed);
     }
 
-    /**
-     * Seeks playback to the specified position.
-     */
+    /** Seeks playback to the specified position. */
     public void seekTo(long positionMs) throws IllegalStateException {
         if (DEBUG) Log.d(TAG, "seekTo()");
         if (!isPlaybackPrepared()) {
@@ -244,17 +222,15 @@ class DvrPlayer {
         positionMs = getRealSeekPosition(positionMs, SEEK_POSITION_MARGIN_MS);
         if (DEBUG) Log.d(TAG, "Now: " + getPlaybackPosition() + ", shift to: " + positionMs);
         mTvView.timeShiftSeekTo(positionMs + mStartPositionMs);
-        if (mPlaybackState == PlaybackState.STATE_FAST_FORWARDING ||
-                mPlaybackState == PlaybackState.STATE_REWINDING) {
+        if (mPlaybackState == PlaybackState.STATE_FAST_FORWARDING
+                || mPlaybackState == PlaybackState.STATE_REWINDING) {
             mPlaybackState = PlaybackState.STATE_PLAYING;
             mTvView.timeShiftResume();
             mCallback.onPlaybackStateChanged(mPlaybackState, 1);
         }
     }
 
-    /**
-     * Resets playback.
-     */
+    /** Resets playback. */
     public void reset() {
         if (DEBUG) Log.d(TAG, "reset()");
         mCallback.onPlaybackStateChanged(PlaybackState.STATE_NONE, 1);
@@ -269,9 +245,7 @@ class DvrPlayer {
         mSelectedSubtitleTrackId = null;
     }
 
-    /**
-     * Sets callbacks for playback.
-     */
+    /** Sets callbacks for playback. */
     public void setCallback(DvrPlayerCallback callback) {
         if (callback != null) {
             mCallback = callback;
@@ -280,23 +254,17 @@ class DvrPlayer {
         }
     }
 
-    /**
-     * Sets the listener to aspect ratio changing.
-     */
+    /** Sets the listener to aspect ratio changing. */
     public void setOnAspectRatioChangedListener(OnAspectRatioChangedListener listener) {
         mOnAspectRatioChangedListener = listener;
     }
 
-    /**
-     * Sets the listener to content blocking.
-     */
+    /** Sets the listener to content blocking. */
     public void setOnContentBlockedListener(OnContentBlockedListener listener) {
         mOnContentBlockedListener = listener;
     }
 
-    /**
-     * Sets the listener to tracks changing.
-     */
+    /** Sets the listener to tracks changing. */
     public void setOnTracksAvailabilityChangedListener(
             OnTracksAvailabilityChangedListener listener) {
         mOnTracksAvailabilityChangedListener = listener;
@@ -305,8 +273,8 @@ class DvrPlayer {
     /**
      * Sets the listener to tracks of the given type being selected.
      *
-     * @param trackType should be either {@link TvTrackInfo#TYPE_AUDIO}
-     *                  or {@link TvTrackInfo#TYPE_SUBTITLE}.
+     * @param trackType should be either {@link TvTrackInfo#TYPE_AUDIO} or {@link
+     *     TvTrackInfo#TYPE_SUBTITLE}.
      */
     public void setOnTrackSelectedListener(int trackType, OnTrackSelectedListener listener) {
         if (trackType == TvTrackInfo.TYPE_AUDIO) {
@@ -316,9 +284,7 @@ class DvrPlayer {
         }
     }
 
-    /**
-     * Gets the listener to tracks of the given type being selected.
-     */
+    /** Gets the listener to tracks of the given type being selected. */
     public OnTrackSelectedListener getOnTrackSelectedListener(int trackType) {
         if (trackType == TvTrackInfo.TYPE_AUDIO) {
             return mOnAudioTrackSelectedListener;
@@ -328,9 +294,7 @@ class DvrPlayer {
         return null;
     }
 
-    /**
-     * Sets recorded programs for playback. If the player is playing another program, stops it.
-     */
+    /** Sets recorded programs for playback. If the player is playing another program, stops it. */
     public void setProgram(RecordedProgram program, long initialSeekPositionMs) {
         if (mProgram != null && mProgram.equals(program)) {
             return;
@@ -342,51 +306,37 @@ class DvrPlayer {
         mProgram = program;
     }
 
-    /**
-     * Returns the recorded program now playing.
-     */
+    /** Returns the recorded program now playing. */
     public RecordedProgram getProgram() {
         return mProgram;
     }
 
-    /**
-     * Returns the currrent playback posistion in msecs.
-     */
+    /** Returns the currrent playback posistion in msecs. */
     public long getPlaybackPosition() {
         return mTimeShiftCurrentPositionMs;
     }
 
-    /**
-     * Returns the playback speed currently used.
-     */
+    /** Returns the playback speed currently used. */
     public int getPlaybackSpeed() {
         return (int) mPlaybackParams.getSpeed();
     }
 
-    /**
-     * Returns the playback state defined in {@link android.media.session.PlaybackState}.
-     */
+    /** Returns the playback state defined in {@link android.media.session.PlaybackState}. */
     public int getPlaybackState() {
         return mPlaybackState;
     }
 
-    /**
-     * Returns the subtitle tracks of the current playback.
-     */
+    /** Returns the subtitle tracks of the current playback. */
     public ArrayList<TvTrackInfo> getSubtitleTracks() {
         return new ArrayList<>(mTvView.getTracks(TvTrackInfo.TYPE_SUBTITLE));
     }
 
-    /**
-     * Returns the audio tracks of the current playback.
-     */
+    /** Returns the audio tracks of the current playback. */
     public ArrayList<TvTrackInfo> getAudioTracks() {
         return new ArrayList<>(mTvView.getTracks(TvTrackInfo.TYPE_AUDIO));
     }
 
-    /**
-     * Returns the ID of the selected track of the given type.
-     */
+    /** Returns the ID of the selected track of the given type. */
     public String getSelectedTrackId(int trackType) {
         if (trackType == TvTrackInfo.TYPE_AUDIO) {
             return mSelectedAudioTrackId;
@@ -396,9 +346,7 @@ class DvrPlayer {
         return null;
     }
 
-    /**
-     * Returns if playback of the recorded program is started.
-     */
+    /** Returns if playback of the recorded program is started. */
     public boolean isPlaybackPrepared() {
         return mPlaybackState != PlaybackState.STATE_NONE
                 && mPlaybackState != PlaybackState.STATE_CONNECTING;
@@ -449,125 +397,138 @@ class DvrPlayer {
     }
 
     private void setTvViewCallbacks() {
-        mTvView.setTimeShiftPositionCallback(new TvView.TimeShiftPositionCallback() {
-            @Override
-            public void onTimeShiftStartPositionChanged(String inputId, long timeMs) {
-                if (DEBUG) Log.d(TAG, "onTimeShiftStartPositionChanged:" + timeMs);
-                mStartPositionMs = timeMs;
-                if (mTimeShiftPlayAvailable) {
-                    resumeToWatchedPositionIfNeeded();
-                }
-            }
+        mTvView.setTimeShiftPositionCallback(
+                new TvView.TimeShiftPositionCallback() {
+                    @Override
+                    public void onTimeShiftStartPositionChanged(String inputId, long timeMs) {
+                        if (DEBUG) Log.d(TAG, "onTimeShiftStartPositionChanged:" + timeMs);
+                        mStartPositionMs = timeMs;
+                        if (mTimeShiftPlayAvailable) {
+                            resumeToWatchedPositionIfNeeded();
+                        }
+                    }
 
-            @Override
-            public void onTimeShiftCurrentPositionChanged(String inputId, long timeMs) {
-                if (DEBUG) Log.d(TAG, "onTimeShiftCurrentPositionChanged: " + timeMs);
-                if (!mTimeShiftPlayAvailable) {
-                    // Workaround of b/31436263
-                    return;
-                }
-                // Workaround of b/32211561, TIF won't report start position when TIS report
-                // its start position as 0. In that case, we have to do the prework of playback
-                // on the first time we get current position, and the start position should be 0
-                // at that time.
-                if (mStartPositionMs == TvInputManager.TIME_SHIFT_INVALID_TIME) {
-                    mStartPositionMs = 0;
-                    resumeToWatchedPositionIfNeeded();
-                }
-                timeMs -= mStartPositionMs;
-                if (mPlaybackState == PlaybackState.STATE_REWINDING
-                        && timeMs <= REWIND_POSITION_MARGIN_MS) {
-                    play();
-                } else {
-                    mTimeShiftCurrentPositionMs = getRealSeekPosition(timeMs, 0);
-                    mCallback.onPlaybackPositionChanged(mTimeShiftCurrentPositionMs);
-                    if (timeMs >= mProgram.getDurationMillis()) {
-                        pause();
-                        mCallback.onPlaybackEnded();
+                    @Override
+                    public void onTimeShiftCurrentPositionChanged(String inputId, long timeMs) {
+                        if (DEBUG) Log.d(TAG, "onTimeShiftCurrentPositionChanged: " + timeMs);
+                        if (!mTimeShiftPlayAvailable) {
+                            // Workaround of b/31436263
+                            return;
+                        }
+                        // Workaround of b/32211561, TIF won't report start position when TIS report
+                        // its start position as 0. In that case, we have to do the prework of
+                        // playback
+                        // on the first time we get current position, and the start position should
+                        // be 0
+                        // at that time.
+                        if (mStartPositionMs == TvInputManager.TIME_SHIFT_INVALID_TIME) {
+                            mStartPositionMs = 0;
+                            resumeToWatchedPositionIfNeeded();
+                        }
+                        timeMs -= mStartPositionMs;
+                        if (mPlaybackState == PlaybackState.STATE_REWINDING
+                                && timeMs <= REWIND_POSITION_MARGIN_MS) {
+                            play();
+                        } else {
+                            mTimeShiftCurrentPositionMs = getRealSeekPosition(timeMs, 0);
+                            mCallback.onPlaybackPositionChanged(mTimeShiftCurrentPositionMs);
+                            if (timeMs >= mProgram.getDurationMillis()) {
+                                pause();
+                                mCallback.onPlaybackEnded();
+                            }
+                        }
                     }
-                }
-            }
-        });
-        mTvView.setCallback(new TvView.TvInputCallback() {
-            @Override
-            public void onTimeShiftStatusChanged(String inputId, int status) {
-                if (DEBUG) Log.d(TAG, "onTimeShiftStatusChanged:" + status);
-                if (status == TvInputManager.TIME_SHIFT_STATUS_AVAILABLE
-                        && mPlaybackState == PlaybackState.STATE_CONNECTING) {
-                    mTimeShiftPlayAvailable = true;
-                    if (mStartPositionMs != TvInputManager.TIME_SHIFT_INVALID_TIME) {
-                        // onTimeShiftStatusChanged is sometimes called after
-                        // onTimeShiftStartPositionChanged is called. In this case,
-                        // resumeToWatchedPositionIfNeeded needs to be called here.
-                        resumeToWatchedPositionIfNeeded();
+                });
+        mTvView.setCallback(
+                new TvView.TvInputCallback() {
+                    @Override
+                    public void onTimeShiftStatusChanged(String inputId, int status) {
+                        if (DEBUG) Log.d(TAG, "onTimeShiftStatusChanged:" + status);
+                        if (status == TvInputManager.TIME_SHIFT_STATUS_AVAILABLE
+                                && mPlaybackState == PlaybackState.STATE_CONNECTING) {
+                            mTimeShiftPlayAvailable = true;
+                            if (mStartPositionMs != TvInputManager.TIME_SHIFT_INVALID_TIME) {
+                                // onTimeShiftStatusChanged is sometimes called after
+                                // onTimeShiftStartPositionChanged is called. In this case,
+                                // resumeToWatchedPositionIfNeeded needs to be called here.
+                                resumeToWatchedPositionIfNeeded();
+                            }
+                        }
                     }
-                }
-            }
-
-            @Override
-            public void onTracksChanged(String inputId, List<TvTrackInfo> tracks) {
-                boolean hasClosedCaption =
-                        !mTvView.getTracks(TvTrackInfo.TYPE_SUBTITLE).isEmpty();
-                boolean hasMultiAudio = mTvView.getTracks(TvTrackInfo.TYPE_AUDIO).size() > 1;
-                if ((hasClosedCaption != mHasClosedCaption || hasMultiAudio != mHasMultiAudio)
-                        && mOnTracksAvailabilityChangedListener != null) {
-                    mOnTracksAvailabilityChangedListener
-                            .onTracksAvailabilityChanged(hasClosedCaption, hasMultiAudio);
-                }
-                mHasClosedCaption = hasClosedCaption;
-                mHasMultiAudio = hasMultiAudio;
-            }
 
-            @Override
-            public void onTrackSelected(String inputId, int type, String trackId) {
-                if (type == TvTrackInfo.TYPE_AUDIO || type == TvTrackInfo.TYPE_SUBTITLE) {
-                    setSelectedTrackId(type, trackId);
-                    OnTrackSelectedListener listener = getOnTrackSelectedListener(type);
-                    if (listener != null) {
-                        listener.onTrackSelected(trackId);
+                    @Override
+                    public void onTracksChanged(String inputId, List<TvTrackInfo> tracks) {
+                        boolean hasClosedCaption =
+                                !mTvView.getTracks(TvTrackInfo.TYPE_SUBTITLE).isEmpty();
+                        boolean hasMultiAudio =
+                                mTvView.getTracks(TvTrackInfo.TYPE_AUDIO).size() > 1;
+                        if ((hasClosedCaption != mHasClosedCaption
+                                        || hasMultiAudio != mHasMultiAudio)
+                                && mOnTracksAvailabilityChangedListener != null) {
+                            mOnTracksAvailabilityChangedListener.onTracksAvailabilityChanged(
+                                    hasClosedCaption, hasMultiAudio);
+                        }
+                        mHasClosedCaption = hasClosedCaption;
+                        mHasMultiAudio = hasMultiAudio;
                     }
-                } else if (type == TvTrackInfo.TYPE_VIDEO && trackId != null
-                        && mOnAspectRatioChangedListener != null) {
-                    List<TvTrackInfo> trackInfos = mTvView.getTracks(TvTrackInfo.TYPE_VIDEO);
-                    if (trackInfos != null) {
-                        for (TvTrackInfo trackInfo : trackInfos) {
-                            if (trackInfo.getId().equals(trackId)) {
-                                float videoAspectRatio;
-                                int videoWidth = trackInfo.getVideoWidth();
-                                int videoHeight = trackInfo.getVideoHeight();
-                                if (videoWidth > 0 && videoHeight > 0) {
-                                    videoAspectRatio = trackInfo.getVideoPixelAspectRatio()
-                                            * trackInfo.getVideoWidth() / trackInfo.getVideoHeight();
-                                } else {
-                                    // Aspect ratio is unknown. Pass the message to listeners.
-                                    videoAspectRatio = 0;
-                                }
-                                if (DEBUG) Log.d(TAG, "Aspect Ratio: " + videoAspectRatio);
-                                if (mAspectRatio != videoAspectRatio || videoAspectRatio == 0) {
-                                    mOnAspectRatioChangedListener
-                                            .onAspectRatioChanged(videoAspectRatio);
-                                    mAspectRatio = videoAspectRatio;
-                                    return;
+
+                    @Override
+                    public void onTrackSelected(String inputId, int type, String trackId) {
+                        if (type == TvTrackInfo.TYPE_AUDIO || type == TvTrackInfo.TYPE_SUBTITLE) {
+                            setSelectedTrackId(type, trackId);
+                            OnTrackSelectedListener listener = getOnTrackSelectedListener(type);
+                            if (listener != null) {
+                                listener.onTrackSelected(trackId);
+                            }
+                        } else if (type == TvTrackInfo.TYPE_VIDEO
+                                && trackId != null
+                                && mOnAspectRatioChangedListener != null) {
+                            List<TvTrackInfo> trackInfos =
+                                    mTvView.getTracks(TvTrackInfo.TYPE_VIDEO);
+                            if (trackInfos != null) {
+                                for (TvTrackInfo trackInfo : trackInfos) {
+                                    if (trackInfo.getId().equals(trackId)) {
+                                        float videoAspectRatio;
+                                        int videoWidth = trackInfo.getVideoWidth();
+                                        int videoHeight = trackInfo.getVideoHeight();
+                                        if (videoWidth > 0 && videoHeight > 0) {
+                                            videoAspectRatio =
+                                                    trackInfo.getVideoPixelAspectRatio()
+                                                            * trackInfo.getVideoWidth()
+                                                            / trackInfo.getVideoHeight();
+                                        } else {
+                                            // Aspect ratio is unknown. Pass the message to
+                                            // listeners.
+                                            videoAspectRatio = 0;
+                                        }
+                                        if (DEBUG) Log.d(TAG, "Aspect Ratio: " + videoAspectRatio);
+                                        if (mAspectRatio != videoAspectRatio
+                                                || videoAspectRatio == 0) {
+                                            mOnAspectRatioChangedListener.onAspectRatioChanged(
+                                                    videoAspectRatio);
+                                            mAspectRatio = videoAspectRatio;
+                                            return;
+                                        }
+                                    }
                                 }
                             }
                         }
                     }
-                }
-            }
 
-            @Override
-            public void onContentBlocked(String inputId, TvContentRating rating) {
-                if (mOnContentBlockedListener != null) {
-                    mOnContentBlockedListener.onContentBlocked(rating);
-                }
-            }
-        });
+                    @Override
+                    public void onContentBlocked(String inputId, TvContentRating rating) {
+                        if (mOnContentBlockedListener != null) {
+                            mOnContentBlockedListener.onContentBlocked(rating);
+                        }
+                    }
+                });
     }
 
     private void resumeToWatchedPositionIfNeeded() {
         if (mInitialSeekPositionMs != TvInputManager.TIME_SHIFT_INVALID_TIME) {
-            mTvView.timeShiftSeekTo(getRealSeekPosition(mInitialSeekPositionMs,
-                    SEEK_POSITION_MARGIN_MS) + mStartPositionMs);
+            mTvView.timeShiftSeekTo(
+                    getRealSeekPosition(mInitialSeekPositionMs, SEEK_POSITION_MARGIN_MS)
+                            + mStartPositionMs);
             mInitialSeekPositionMs = TvInputManager.TIME_SHIFT_INVALID_TIME;
         }
         if (mPauseOnPrepared) {
@@ -580,4 +541,4 @@ class DvrPlayer {
         }
         mCallback.onPlaybackStateChanged(mPlaybackState, 1);
     }
-}
\ No newline at end of file
+}