Fix PGS subtitles rendered with border and no fill color

.github/ISSUE_TEMPLATE/bug.yml

@@ -5,41 +5,27 @@ body:
   - type: markdown
     attributes:
       value: |
-        We can only process bug reports that are actionable. Unclear bug reports or reports with
-        insufficient information may not get attention.
+        We can only process bug reports that are actionable. Unclear bug reports or reports with insufficient information may not get attention.
 
         Before filing a bug:
         -------------------------
 
-        - Search existing issues, including issues that are closed:
-          https://github.com/androidx/media/issues?q=is%3Aissue
-        - For ExoPlayer-related bugs, please also check for existing issues on the ExoPlayer
-          tracker: https://github.com/google/ExoPlayer/issues?q=is%3Aissue
+        - Search existing issues, including issues that are closed: https://github.com/androidx/media/issues?q=is%3Aissue
+        - For ExoPlayer-related bugs, please also check for existing issues on the ExoPlayer tracker: https://github.com/google/ExoPlayer/issues?q=is%3Aissue
   - type: dropdown
     attributes:
       label: Version
       description: What version of Media3 (or ExoPlayer) are you using?
       options:
-        - Media3 1.1.1
-        - Media3 1.1.0
-        - Media3 1.0.2
-        - Media3 1.0.1
-        - Media3 1.0.0
-        - Media3 1.0.0-rc02
-        - Media3 1.0.0-rc01
-        - Media3 1.0.0-beta03
-        - Media3 1.0.0-beta02
-        - Media3 1.0.0-beta01
-        - Media3 1.0.0-alpha03
-        - Media3 1.0.0-alpha02
-        - Media3 1.0.0-alpha01
-        - Media3 `main` branch
+        - Media3 1.2.1
+        - Media3 1.2.0
+        - Media3 main branch
         - Media3 pre-release (alpha, beta or RC not in this list)
-        - ExoPlayer 2.19.1
-        - ExoPlayer 2.19.0
-        - ExoPlayer 2.18.7
-        - ExoPlayer 2.18.6
-        - ExoPlayer 2.18.5
+        - Media3 1.1.1 / ExoPlayer 2.19.1
+        - Media3 1.1.0 / ExoPlayer 2.19.0
+        - Media3 1.0.2 / ExoPlayer 2.18.7
+        - Media3 1.0.1 / ExoPlayer 2.18.6
+        - Media3 1.0.0 / ExoPlayer 2.18.5
         - ExoPlayer 2.18.4
         - ExoPlayer 2.18.3
         - ExoPlayer 2.18.2
@@ -54,14 +40,14 @@ body:
         - ExoPlayer 2.14.2
         - ExoPlayer 2.14.1
         - ExoPlayer 2.14.0
-        - ExoPlayer `dev-v2` branch
+        - ExoPlayer dev-v2 branch
         - Older (unsupported)
     validations:
       required: true
   - type: textarea
     attributes:
       label: More version details
-      description: |
+      description: >
         Required if you selected `main` or `dev-v2` (please provide an exact commit SHA),
         or 'pre-release' or 'older' (please provide the version).
   - type: textarea

api.txt

@@ -226,8 +226,8 @@ package androidx.media3.common {
 
   public final class MediaItem {
     method public androidx.media3.common.MediaItem.Builder buildUpon();
-    method public static androidx.media3.common.MediaItem fromUri(String);
     method public static androidx.media3.common.MediaItem fromUri(android.net.Uri);
+    method public static androidx.media3.common.MediaItem fromUri(String);
     field public static final String DEFAULT_MEDIA_ID = "";
     field public static final androidx.media3.common.MediaItem EMPTY;
     field public final androidx.media3.common.MediaItem.ClippingConfiguration clippingConfiguration;
@@ -264,8 +264,8 @@ package androidx.media3.common {
     method public androidx.media3.common.MediaItem.Builder setRequestMetadata(androidx.media3.common.MediaItem.RequestMetadata);
     method public androidx.media3.common.MediaItem.Builder setSubtitleConfigurations(java.util.List<androidx.media3.common.MediaItem.SubtitleConfiguration>);
     method public androidx.media3.common.MediaItem.Builder setTag(@Nullable Object);
-    method public androidx.media3.common.MediaItem.Builder setUri(@Nullable String);
     method public androidx.media3.common.MediaItem.Builder setUri(@Nullable android.net.Uri);
+    method public androidx.media3.common.MediaItem.Builder setUri(@Nullable String);
   }
 
   public static class MediaItem.ClippingConfiguration {
@@ -617,8 +617,8 @@ package androidx.media3.common {
 
   public class PlaybackException extends java.lang.Exception {
     method @CallSuper public boolean errorInfoEquals(@Nullable androidx.media3.common.PlaybackException);
-    method public static String getErrorCodeName(@androidx.media3.common.PlaybackException.ErrorCode int);
     method public final String getErrorCodeName();
+    method public static String getErrorCodeName(@androidx.media3.common.PlaybackException.ErrorCode int);
     field public static final int CUSTOM_ERROR_CODE_BASE = 1000000; // 0xf4240
     field public static final int ERROR_CODE_AUDIO_TRACK_INIT_FAILED = 5001; // 0x1389
     field public static final int ERROR_CODE_AUDIO_TRACK_WRITE_FAILED = 5002; // 0x138a
@@ -674,8 +674,8 @@ package androidx.media3.common {
     method public void addListener(androidx.media3.common.Player.Listener);
     method public void addMediaItem(androidx.media3.common.MediaItem);
     method public void addMediaItem(int, androidx.media3.common.MediaItem);
-    method public void addMediaItems(java.util.List<androidx.media3.common.MediaItem>);
     method public void addMediaItems(int, java.util.List<androidx.media3.common.MediaItem>);
+    method public void addMediaItems(java.util.List<androidx.media3.common.MediaItem>);
     method public boolean canAdvertiseSession();
     method public void clearMediaItems();
     method public void clearVideoSurface();
@@ -751,8 +751,8 @@ package androidx.media3.common {
     method public void replaceMediaItems(int, int, java.util.List<androidx.media3.common.MediaItem>);
     method public void seekBack();
     method public void seekForward();
-    method public void seekTo(long);
     method public void seekTo(int, long);
+    method public void seekTo(long);
     method public void seekToDefaultPosition();
     method public void seekToDefaultPosition(int);
     method public void seekToNext();
@@ -765,8 +765,8 @@ package androidx.media3.common {
     method @Deprecated public void setDeviceVolume(@IntRange(from=0) int);
     method public void setDeviceVolume(@IntRange(from=0) int, int);
     method public void setMediaItem(androidx.media3.common.MediaItem);
-    method public void setMediaItem(androidx.media3.common.MediaItem, long);
     method public void setMediaItem(androidx.media3.common.MediaItem, boolean);
+    method public void setMediaItem(androidx.media3.common.MediaItem, long);
     method public void setMediaItems(java.util.List<androidx.media3.common.MediaItem>);
     method public void setMediaItems(java.util.List<androidx.media3.common.MediaItem>, boolean);
     method public void setMediaItems(java.util.List<androidx.media3.common.MediaItem>, int, long);
@@ -1522,8 +1522,8 @@ package androidx.media3.session {
     method public final void addListener(androidx.media3.common.Player.Listener);
     method public final void addMediaItem(androidx.media3.common.MediaItem);
     method public final void addMediaItem(int, androidx.media3.common.MediaItem);
-    method public final void addMediaItems(java.util.List<androidx.media3.common.MediaItem>);
     method public final void addMediaItems(int, java.util.List<androidx.media3.common.MediaItem>);
+    method public final void addMediaItems(java.util.List<androidx.media3.common.MediaItem>);
     method public final boolean canAdvertiseSession();
     method public final void clearMediaItems();
     method public final void clearVideoSurface();
@@ -1590,8 +1590,8 @@ package androidx.media3.session {
     method public final boolean isLoading();
     method public final boolean isPlaying();
     method public final boolean isPlayingAd();
-    method public final boolean isSessionCommandAvailable(@androidx.media3.session.SessionCommand.CommandCode int);
     method public final boolean isSessionCommandAvailable(androidx.media3.session.SessionCommand);
+    method public final boolean isSessionCommandAvailable(@androidx.media3.session.SessionCommand.CommandCode int);
     method public final void moveMediaItem(int, int);
     method public final void moveMediaItems(int, int, int);
     method public final void pause();
@@ -1606,8 +1606,8 @@ package androidx.media3.session {
     method public final void replaceMediaItems(int, int, java.util.List<androidx.media3.common.MediaItem>);
     method public final void seekBack();
     method public final void seekForward();
-    method public final void seekTo(long);
     method public final void seekTo(int, long);
+    method public final void seekTo(long);
     method public final void seekToDefaultPosition();
     method public final void seekToDefaultPosition(int);
     method public final void seekToNext();
@@ -1621,17 +1621,17 @@ package androidx.media3.session {
     method @Deprecated public final void setDeviceVolume(@IntRange(from=0) int);
     method public final void setDeviceVolume(@IntRange(from=0) int, @androidx.media3.common.C.VolumeFlags int);
     method public final void setMediaItem(androidx.media3.common.MediaItem);
-    method public final void setMediaItem(androidx.media3.common.MediaItem, long);
     method public final void setMediaItem(androidx.media3.common.MediaItem, boolean);
+    method public final void setMediaItem(androidx.media3.common.MediaItem, long);
     method public final void setMediaItems(java.util.List<androidx.media3.common.MediaItem>);
     method public final void setMediaItems(java.util.List<androidx.media3.common.MediaItem>, boolean);
     method public final void setMediaItems(java.util.List<androidx.media3.common.MediaItem>, int, long);
     method public final void setPlayWhenReady(boolean);
     method public final void setPlaybackParameters(androidx.media3.common.PlaybackParameters);
     method public final void setPlaybackSpeed(float);
     method public final void setPlaylistMetadata(androidx.media3.common.MediaMetadata);
-    method public final com.google.common.util.concurrent.ListenableFuture<androidx.media3.session.SessionResult> setRating(String, androidx.media3.common.Rating);
     method public final com.google.common.util.concurrent.ListenableFuture<androidx.media3.session.SessionResult> setRating(androidx.media3.common.Rating);
+    method public final com.google.common.util.concurrent.ListenableFuture<androidx.media3.session.SessionResult> setRating(String, androidx.media3.common.Rating);
     method public final void setRepeatMode(@androidx.media3.common.Player.RepeatMode int);
     method public final void setShuffleModeEnabled(boolean);
     method public final void setTrackSelectionParameters(androidx.media3.common.TrackSelectionParameters);
@@ -1743,8 +1743,8 @@ package androidx.media3.session {
     method public default void onDisconnected(androidx.media3.session.MediaSession, androidx.media3.session.MediaSession.ControllerInfo);
     method @Deprecated @androidx.media3.session.SessionResult.Code public default int onPlayerCommandRequest(androidx.media3.session.MediaSession, androidx.media3.session.MediaSession.ControllerInfo, @androidx.media3.common.Player.Command int);
     method public default void onPostConnect(androidx.media3.session.MediaSession, androidx.media3.session.MediaSession.ControllerInfo);
-    method public default com.google.common.util.concurrent.ListenableFuture<androidx.media3.session.SessionResult> onSetRating(androidx.media3.session.MediaSession, androidx.media3.session.MediaSession.ControllerInfo, String, androidx.media3.common.Rating);
     method public default com.google.common.util.concurrent.ListenableFuture<androidx.media3.session.SessionResult> onSetRating(androidx.media3.session.MediaSession, androidx.media3.session.MediaSession.ControllerInfo, androidx.media3.common.Rating);
+    method public default com.google.common.util.concurrent.ListenableFuture<androidx.media3.session.SessionResult> onSetRating(androidx.media3.session.MediaSession, androidx.media3.session.MediaSession.ControllerInfo, String, androidx.media3.common.Rating);
   }
 
   public static final class MediaSession.ConnectionResult {

constants.gradle

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 project.ext {
-    releaseVersion = '1.2.0-alpha02'
-    releaseVersionCode = 1_002_000_0_02
+    releaseVersion = '1.2.1'
+    releaseVersionCode = 1_002_001_3_00
     minSdkVersion = 16
     // See https://developer.android.com/training/cars/media/automotive-os#automotive-module
     automotiveMinSdkVersion = 28
@@ -57,7 +57,7 @@ project.ext {
     androidxTestServicesStorageVersion = '1.4.2'
     androidxTestTruthVersion = '1.5.0'
     truthVersion = '1.1.3'
-    okhttpVersion = '4.11.0'
+    okhttpVersion = '4.12.0'
     modulePrefix = ':'
     if (gradle.ext.has('androidxMediaModulePrefix')) {
         modulePrefix += gradle.ext.androidxMediaModulePrefix

demos/cast/src/main/java/androidx/media3/demo/cast/package-info.java

@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 @NonNullApi
+@OptIn(markerClass = UnstableApi.class)
 package androidx.media3.demo.cast;
 
+import androidx.annotation.OptIn;
 import androidx.media3.common.util.NonNullApi;
+import androidx.media3.common.util.UnstableApi;

demos/gl/src/main/java/androidx/media3/demo/gl/package-info.java

@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 @NonNullApi
+@OptIn(markerClass = UnstableApi.class)
 package androidx.media3.demo.gl;
 
+import androidx.annotation.OptIn;
 import androidx.media3.common.util.NonNullApi;
+import androidx.media3.common.util.UnstableApi;

demos/main/build.gradle

@@ -72,17 +72,6 @@ android {
 dependencies {
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
-    // Demonstrate downgrading the annotation-experimental version to avoid
-    // transitively depending on the Kotlin standard library (which was
-    // introduced as a dependency in annotation-experimental:1.3.0). This demo
-    // app still depends on Kotlin via the IMA extension and UI modules, but
-    // this shows how an app can avoid the Kotlin dependency if they don't use
-    // these modules.
-    implementation('androidx.annotation:annotation-experimental') {
-        version {
-            strictly '1.2.0'
-        }
-    }
     implementation 'androidx.appcompat:appcompat:' + androidxAppCompatVersion
     implementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     implementation 'com.google.android.material:material:' + androidxMaterialVersion

demos/main/src/main/assets/media.exolist.json

@@ -143,6 +143,12 @@
         "drm_scheme": "widevine",
         "drm_license_uri": "https://proxy.uat.widevine.com/proxy?video_id=GTS_HW_SECURE_ALL&provider=widevine_test"
       },
+      {
+        "name": "20s license with renewal",
+        "uri": "https://storage.googleapis.com/wvmedia/cenc/h264/tears/tears.mpd",
+        "drm_scheme": "widevine",
+        "drm_license_uri": "https://proxy.uat.widevine.com/proxy?video_id=GTS_CAN_RENEW&provider=widevine_test"
+      },
       {
         "name": "30s license (fails at ~30s)",
         "uri": "https://storage.googleapis.com/wvmedia/cenc/h264/tears/tears.mpd",

demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java

@@ -93,11 +93,11 @@ public class PlayerActivity extends AppCompatActivity
 
   @Nullable private AdsLoader clientSideAdsLoader;
 
-  // TODO: Annotate this and serverSideAdsLoaderState below with @OptIn when it can be applied to
-  // fields (needs http://r.android.com/2004032 to be released into a version of
-  // androidx.annotation:annotation-experimental).
-  @Nullable private ImaServerSideAdInsertionMediaSource.AdsLoader serverSideAdsLoader;
+  @OptIn(markerClass = UnstableApi.class)
+  @Nullable
+  private ImaServerSideAdInsertionMediaSource.AdsLoader serverSideAdsLoader;
 
+  @OptIn(markerClass = UnstableApi.class)
   private ImaServerSideAdInsertionMediaSource.AdsLoader.@MonotonicNonNull State
       serverSideAdsLoaderState;
 

demos/session/src/main/AndroidManifest.xml

@@ -61,6 +61,7 @@
       <intent-filter>
         <action android:name="androidx.media3.session.MediaSessionService"/>
         <action android:name="android.media.browse.MediaBrowserService"/>
+        <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH"/>
       </intent-filter>
     </service>
 

demos/session/src/main/java/androidx/media3/demo/session/MainActivity.kt

@@ -15,8 +15,11 @@
  */
 package androidx.media3.demo.session
 
+import android.Manifest
 import android.content.ComponentName
 import android.content.Context
+import android.content.pm.PackageManager
+import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.MenuItem
@@ -25,6 +28,7 @@ import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import android.widget.ListView
 import android.widget.TextView
+import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
@@ -81,6 +85,14 @@ class MainActivity : AppCompatActivity() {
         }
       }
     )
+
+    if (
+      Build.VERSION.SDK_INT >= 33 &&
+        checkSelfPermission(Manifest.permission.POST_NOTIFICATIONS) !=
+          PackageManager.PERMISSION_GRANTED
+    ) {
+      requestPermissions(arrayOf(Manifest.permission.POST_NOTIFICATIONS), /* requestCode= */ 0)
+    }
   }
 
   override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -101,6 +113,23 @@ class MainActivity : AppCompatActivity() {
     super.onStop()
   }
 
+  override fun onRequestPermissionsResult(
+    requestCode: Int,
+    permissions: Array<out String>,
+    grantResults: IntArray
+  ) {
+    super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+    if (grantResults.isEmpty()) {
+      // Empty results are triggered if a permission is requested while another request was already
+      // pending and can be safely ignored in this case.
+      return
+    }
+    if (grantResults[0] != PackageManager.PERMISSION_GRANTED) {
+      Toast.makeText(applicationContext, R.string.notification_permission_denied, Toast.LENGTH_LONG)
+        .show()
+    }
+  }
+
   private fun initializeBrowser() {
     browserFuture =
       MediaBrowser.Builder(

demos/session/src/main/java/androidx/media3/demo/session/PlayableFolderActivity.kt

@@ -43,7 +43,7 @@ import com.google.common.util.concurrent.ListenableFuture
 class PlayableFolderActivity : AppCompatActivity() {
   private lateinit var browserFuture: ListenableFuture<MediaBrowser>
   private val browser: MediaBrowser?
-    get() = if (browserFuture.isDone) browserFuture.get() else null
+    get() = if (browserFuture.isDone && !browserFuture.isCancelled) browserFuture.get() else null
 
   private lateinit var mediaList: ListView
   private lateinit var mediaListAdapter: PlayableMediaItemArrayAdapter
@@ -88,7 +88,7 @@ class PlayableFolderActivity : AppCompatActivity() {
       browser.shuffleModeEnabled = true
       browser.prepare()
       browser.play()
-      browser?.sessionActivity?.send()
+      browser.sessionActivity?.send()
     }
 
     findViewById<Button>(R.id.play_button).setOnClickListener {