Commit 67597ffc by olly Committed by Oliver Woodman

Keep player paused if it was paused when backgrounded

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=132857692
parent f2ddfb08
...@@ -111,6 +111,7 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay ...@@ -111,6 +111,7 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay
private DebugTextViewHelper debugViewHelper; private DebugTextViewHelper debugViewHelper;
private boolean playerNeedsSource; private boolean playerNeedsSource;
private boolean shouldAutoPlay;
private boolean shouldRestorePosition; private boolean shouldRestorePosition;
private int playerWindow; private int playerWindow;
private long playerPosition; private long playerPosition;
...@@ -120,6 +121,7 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay ...@@ -120,6 +121,7 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
shouldAutoPlay = true;
userAgent = Util.getUserAgent(this, "ExoPlayerDemo"); userAgent = Util.getUserAgent(this, "ExoPlayerDemo");
mediaDataSourceFactory = buildDataSourceFactory(true); mediaDataSourceFactory = buildDataSourceFactory(true);
mainHandler = new Handler(); mainHandler = new Handler();
...@@ -253,7 +255,7 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay ...@@ -253,7 +255,7 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay
player.seekTo(playerWindow, playerPosition); player.seekTo(playerWindow, playerPosition);
} }
} }
player.setPlayWhenReady(true); player.setPlayWhenReady(shouldAutoPlay);
debugViewHelper = new DebugTextViewHelper(player, debugTextView); debugViewHelper = new DebugTextViewHelper(player, debugTextView);
debugViewHelper.start(); debugViewHelper.start();
playerNeedsSource = true; playerNeedsSource = true;
...@@ -331,6 +333,7 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay ...@@ -331,6 +333,7 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay
if (player != null) { if (player != null) {
debugViewHelper.stop(); debugViewHelper.stop();
debugViewHelper = null; debugViewHelper = null;
shouldAutoPlay = player.getPlayWhenReady();
shouldRestorePosition = false; shouldRestorePosition = false;
Timeline timeline = player.getCurrentTimeline(); Timeline timeline = player.getCurrentTimeline();
if (timeline != null) { if (timeline != null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment