From 72728ba0544245b3fa20557864b67ea54d2f75db Mon Sep 17 00:00:00 2001
From: claincly <claincly@google.com>
Date: Mon, 20 Jul 2020 13:22:36 +0100
Subject: [PATCH] Remove Media Tunneling support in demo app

- Removed Tunneling option from popup menu
- Removed intent parameter regarding tunneling
- Removed string definition regarding tunneling

PiperOrigin-RevId: 322123578
---
 .../java/com/google/android/exoplayer2/demo/IntentUtil.java | 1 -
 .../com/google/android/exoplayer2/demo/PlayerActivity.java  | 4 ----
 .../android/exoplayer2/demo/SampleChooserActivity.java      | 6 ------
 demos/main/src/main/res/menu/sample_chooser_menu.xml        | 4 ----
 demos/main/src/main/res/values/strings.xml                  | 2 --
 5 files changed, 17 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/IntentUtil.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/IntentUtil.java
index 474ec25db6..7a27b600be 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/IntentUtil.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/IntentUtil.java
@@ -93,7 +93,6 @@ public class IntentUtil {
   public static final String DRM_SCHEME_UUID_EXTRA = "drm_scheme_uuid";
 
   public static final String PREFER_EXTENSION_DECODERS_EXTRA = "prefer_extension_decoders";
-  public static final String TUNNELING_EXTRA = "tunneling";
 
   /** Creates a list of {@link MediaItem media items} from an {@link Intent}. */
   public static List<MediaItem> createMediaItemsFromIntent(
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 5983f41255..3f80390618 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
@@ -155,10 +155,6 @@ public class PlayerActivity extends AppCompatActivity
     } else {
       DefaultTrackSelector.ParametersBuilder builder =
           new DefaultTrackSelector.ParametersBuilder(/* context= */ this);
-      boolean tunneling = intent.getBooleanExtra(IntentUtil.TUNNELING_EXTRA, false);
-      if (Util.SDK_INT >= 21 && tunneling) {
-        builder.setTunnelingAudioSessionId(C.generateAudioSessionIdV21(/* context= */ this));
-      }
       trackSelectorParameters = builder.build();
       clearStartPosition();
     }
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
index bd340b7436..036ea47f7e 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
@@ -80,7 +80,6 @@ public class SampleChooserActivity extends AppCompatActivity
   private SampleAdapter sampleAdapter;
   private MenuItem preferExtensionDecodersMenuItem;
   private MenuItem randomAbrMenuItem;
-  private MenuItem tunnelingMenuItem;
   private ExpandableListView sampleListView;
 
   @Override
@@ -138,10 +137,6 @@ public class SampleChooserActivity extends AppCompatActivity
     preferExtensionDecodersMenuItem = menu.findItem(R.id.prefer_extension_decoders);
     preferExtensionDecodersMenuItem.setVisible(useExtensionRenderers);
     randomAbrMenuItem = menu.findItem(R.id.random_abr);
-    tunnelingMenuItem = menu.findItem(R.id.tunneling);
-    if (Util.SDK_INT < 21) {
-      tunnelingMenuItem.setEnabled(false);
-    }
     return true;
   }
 
@@ -240,7 +235,6 @@ public class SampleChooserActivity extends AppCompatActivity
             ? IntentUtil.ABR_ALGORITHM_RANDOM
             : IntentUtil.ABR_ALGORITHM_DEFAULT;
     intent.putExtra(IntentUtil.ABR_ALGORITHM_EXTRA, abrAlgorithm);
-    intent.putExtra(IntentUtil.TUNNELING_EXTRA, isNonNullAndChecked(tunnelingMenuItem));
     IntentUtil.addToIntent(playlistHolder.mediaItems, intent);
     startActivity(intent);
     return true;
diff --git a/demos/main/src/main/res/menu/sample_chooser_menu.xml b/demos/main/src/main/res/menu/sample_chooser_menu.xml
index f95c0b6460..9934e9db95 100644
--- a/demos/main/src/main/res/menu/sample_chooser_menu.xml
+++ b/demos/main/src/main/res/menu/sample_chooser_menu.xml
@@ -23,8 +23,4 @@
       android:title="@string/random_abr"
       android:checkable="true"
       app:showAsAction="never"/>
-  <item android:id="@+id/tunneling"
-      android:title="@string/tunneling"
-      android:checkable="true"
-      app:showAsAction="never"/>
 </menu>
diff --git a/demos/main/src/main/res/values/strings.xml b/demos/main/src/main/res/values/strings.xml
index fab74d03cc..d61f08852c 100644
--- a/demos/main/src/main/res/values/strings.xml
+++ b/demos/main/src/main/res/values/strings.xml
@@ -69,6 +69,4 @@
 
   <string name="random_abr">Enable random ABR</string>
 
-  <string name="tunneling">Request multimedia tunneling</string>
-
 </resources>