Updates samples for v3.30.1

PiperOrigin-RevId: 527962228

AdvancedExample/app/build.gradle

@@ -1,6 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
+    namespace "com.google.ads.interactivemedia.v3.samples.videoplayerapp"
     compileSdkVersion 33
 
     // Java 11+ required by Gradle 7.0.2
@@ -12,7 +13,7 @@ android {
     defaultConfig {
         applicationId "com.google.ads.interactivemedia.v3.samples.videoplayerapp"
         minSdkVersion 16
-        targetSdkVersion 32
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
@@ -34,10 +35,10 @@ dependencies {
     implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.media3:media3-ui:1.0.0'
-    implementation 'androidx.media3:media3-exoplayer:1.0.0'
-    implementation 'androidx.media3:media3-exoplayer-hls:1.0.0'
-    implementation 'androidx.media3:media3-exoplayer-dash:1.0.0'
+    implementation 'androidx.media3:media3-ui:1.0.1'
+    implementation 'androidx.media3:media3-exoplayer:1.0.1'
+    implementation 'androidx.media3:media3-exoplayer-hls:1.0.1'
+    implementation 'androidx.media3:media3-exoplayer-dash:1.0.1'
     implementation 'androidx.mediarouter:mediarouter:1.3.1'
     implementation 'androidx.recyclerview:recyclerview:1.3.0'
     implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.30.1'

AdvancedExample/app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.ads.interactivemedia.v3.samples.videoplayerapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Required permissions for the video player -->
     <uses-permission android:name="android.permission.INTERNET"/>
@@ -10,7 +9,8 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
-        android:networkSecurityConfig="@xml/network_security_config">
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:taskAffinity="">
         <activity
             android:name=".MyActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"

BasicExample/app/build.gradle

@@ -1,6 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
+    namespace "com.google.ads.interactivemedia.v3.samples.videoplayerapp"
     compileSdkVersion 33
 
     // Java 11+ required by Gradle 7.0.2
@@ -12,7 +13,7 @@ android {
     defaultConfig {
         applicationId "com.google.ads.interactivemedia.v3.samples.videoplayerapp"
         minSdkVersion 16
-        targetSdkVersion 32
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
@@ -33,10 +34,10 @@ repositories {
 dependencies {
     implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.media3:media3-ui:1.0.0'
-    implementation 'androidx.media3:media3-exoplayer:1.0.0'
-    implementation 'androidx.media3:media3-exoplayer-hls:1.0.0'
-    implementation 'androidx.media3:media3-exoplayer-dash:1.0.0'
+    implementation 'androidx.media3:media3-ui:1.0.1'
+    implementation 'androidx.media3:media3-exoplayer:1.0.1'
+    implementation 'androidx.media3:media3-exoplayer-hls:1.0.1'
+    implementation 'androidx.media3:media3-exoplayer-dash:1.0.1'
     implementation 'androidx.mediarouter:mediarouter:1.3.1'
     implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.30.1'
 }

BasicExample/app/src/main/AndroidManifest.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.ads.interactivemedia.v3.samples.videoplayerapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Required permissions for the video player -->
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name">
+        android:label="@string/app_name"
+        android:taskAffinity="">
         <activity
             android:name=".MyActivity"
 

BasicExample/app/src/main/java/com/google/ads/interactivemedia/v3/samples/videoplayerapp/MyActivity.java

@@ -25,17 +25,16 @@
 import android.widget.ImageButton;
 import android.widget.ScrollView;
 import android.widget.TextView;
-import androidx.annotation.OptIn;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.ui.PlayerView;
 import com.google.ads.interactivemedia.v3.samples.samplevideoplayer.SampleVideoPlayer;
 
 /** Main Activity that plays media using {@link SampleVideoPlayer}. */
-@OptIn(markerClass = UnstableApi.class)
+@UnstableApi
 public class MyActivity extends Activity {
 
   private static final String DEFAULT_STREAM_URL =
-      "https://storage.googleapis.com/testtopbox-public/video_content/bbb/master.m3u8";
+      "https://storage.googleapis.com/interactive-media-ads/media/bbb.m3u8";
   private static final String APP_LOG_TAG = "ImaDaiExample";
 
   protected SampleVideoPlayer sampleVideoPlayer;

BasicExample/app/src/main/java/com/google/ads/interactivemedia/v3/samples/videoplayerapp/SampleAdsWrapper.java

@@ -16,12 +16,12 @@
 
 package com.google.ads.interactivemedia.v3.samples.videoplayerapp;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;
 import android.view.ViewGroup;
 import android.webkit.WebView;
 import androidx.annotation.Nullable;
+import androidx.media3.common.util.UnstableApi;
 import com.google.ads.interactivemedia.v3.api.AdErrorEvent;
 import com.google.ads.interactivemedia.v3.api.AdEvent;
 import com.google.ads.interactivemedia.v3.api.AdsLoader;
@@ -42,6 +42,7 @@
 import java.util.List;
 
 /** This class adds ad-serving support to Sample HlsVideoPlayer */
+@UnstableApi
 public class SampleAdsWrapper
     implements AdEvent.AdEventListener, AdErrorEvent.AdErrorListener, AdsLoader.AdsLoadedListener {
 
@@ -105,7 +106,6 @@ public SampleAdsWrapper(Context context, SampleVideoPlayer videoPlayer, ViewGrou
     createAdsLoader();
   }
 
-  @TargetApi(19)
   private void enableWebViewDebugging() {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
       WebView.setWebContentsDebuggingEnabled(true);

ExoPlayerExample/app/build.gradle

@@ -34,12 +34,11 @@ repositories {
 dependencies {
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.media3:media3-ui:1.0.0-beta03'
-    implementation 'androidx.media3:media3-exoplayer:1.0.0-beta03'
-    implementation 'androidx.media3:media3-exoplayer-hls:1.0.0-beta03'
-    implementation 'androidx.media3:media3-exoplayer-dash:1.0.0-beta03'
-    implementation 'com.android.support.constraint:constraint-layout:2.0.4'
+    implementation 'androidx.media3:media3-ui:1.0.1'
+    implementation 'androidx.media3:media3-exoplayer:1.0.1'
+    implementation 'androidx.media3:media3-exoplayer-hls:1.0.1'
+    implementation 'androidx.media3:media3-exoplayer-dash:1.0.1'
 
     // The library adds the IMA ExoPlayer integration for ads.
-    implementation 'androidx.media3:media3-exoplayer-ima:1.0.0-beta03'
+    implementation 'androidx.media3:media3-exoplayer-ima:1.0.1'
 }

SampleVideoPlayer/app/build.gradle

@@ -1,7 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 32
+    namespace "com.google.ads.interactivemedia.v3.samples.videoplayerapp"
+    compileSdkVersion 33
 
     // Java 11+ required by Gradle 7.0.2
     compileOptions {
@@ -12,9 +13,10 @@ android {
     defaultConfig {
         applicationId "com.google.ads.interactivemedia.v3.samples.videoplayerapp"
         minSdkVersion 16
-        targetSdkVersion 32
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
+        multiDexEnabled true
     }
     buildTypes {
         release {
@@ -30,9 +32,10 @@ repositories {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'androidx.media3:media3-ui:1.0.0-beta02'
-    implementation 'androidx.media3:media3-exoplayer:1.0.0-beta02'
-    implementation 'androidx.media3:media3-exoplayer-hls:1.0.0-beta02'
-    implementation 'androidx.media3:media3-exoplayer-dash:1.0.0-beta02'
+    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.media3:media3-ui:1.0.1'
+    implementation 'androidx.media3:media3-exoplayer:1.0.1'
+    implementation 'androidx.media3:media3-exoplayer-hls:1.0.1'
+    implementation 'androidx.media3:media3-exoplayer-dash:1.0.1'
 }

SampleVideoPlayer/app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.ads.interactivemedia.v3.samples.videoplayerapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Required permissions for the video player -->
     <uses-permission android:name="android.permission.INTERNET"/>
@@ -9,7 +8,8 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme"
+        android:taskAffinity="">
         <activity
             android:name=".MyActivity"
             android:label="@string/app_name"

SampleVideoPlayer/app/src/main/java/com/google/ads/interactivemedia/v3/samples/samplevideoplayer/SampleVideoPlayer.java

@@ -71,7 +71,6 @@ private void initPlayer() {
 
     DataSource.Factory dataSourceFactory = new DefaultDataSource.Factory(context);
     DefaultMediaSourceFactory mediaSourceFactory = new DefaultMediaSourceFactory(dataSourceFactory);
-    mediaSourceFactory.setAdViewProvider(playerView);
     player = new ExoPlayer.Builder(context).setMediaSourceFactory(mediaSourceFactory).build();
     playerView.setPlayer(
         new ForwardingPlayer(player) {

SampleVideoPlayer/app/src/main/java/com/google/ads/interactivemedia/v3/samples/videoplayerapp/MyActivity.java

@@ -24,14 +24,15 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.ui.PlayerView;
+import androidx.multidex.MultiDex;
 import com.google.ads.interactivemedia.v3.samples.samplevideoplayer.SampleVideoPlayer;
 
 /** Main Activity that plays media using {@link SampleVideoPlayer}. */
 @OptIn(markerClass = UnstableApi.class)
 public class MyActivity extends AppCompatActivity {
 
   private static final String DEFAULT_STREAM_URL =
-      "https://storage.googleapis.com/testtopbox-public/video_content/bbb/master.m3u8";
+      "https://storage.googleapis.com/interactive-media-ads/media/bbb.m3u8";
   private static final String APP_LOG_TAG = "ImaDaiExample";
 
   protected SampleVideoPlayer sampleVideoPlayer;
@@ -42,6 +43,8 @@ protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_my);
     View rootView = findViewById(R.id.videoLayout);
+    MultiDex.install(rootView.getContext());
+
     sampleVideoPlayer =
         new SampleVideoPlayer(
             rootView.getContext(), (PlayerView) rootView.findViewById(R.id.playerView));