From db475fea86793c728365db059273e89b138f2927 Mon Sep 17 00:00:00 2001 From: tonihei Date: Wed, 28 Mar 2018 07:27:50 -0700 Subject: [PATCH] Add back accidentally deleted parameter in PlayerActivity. A merge error in a previous change removed the drmSessionManager from the player factory call. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=190769364 --- .../com/google/android/exoplayer2/demo/PlayerActivity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java index 98df1158fb..57444d0262 100644 --- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java +++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java @@ -340,7 +340,8 @@ public class PlayerActivity extends Activity lastSeenTrackGroupArray = null; eventLogger = new EventLogger(trackSelector); - player = ExoPlayerFactory.newSimpleInstance(renderersFactory, trackSelector); + player = + ExoPlayerFactory.newSimpleInstance(renderersFactory, trackSelector, drmSessionManager); player.addListener(new PlayerEventListener()); player.addListener(eventLogger); player.addMetadataOutput(eventLogger);