Merge pull request #408 from androidx/release-1.0.2

1.0.2

Author: icbaker

.github/ISSUE_TEMPLATE/bug.yml

@@ -20,6 +20,8 @@ body:
       label: Media3 Version
       description: What version of Media3 (or ExoPlayer) are you using?
       options:
+        - Media3 1.1.0-alpha01
+        - Media3 1.0.2
         - Media3 1.0.1
         - Media3 1.0.0
         - Media3 1.0.0-rc02
@@ -30,6 +32,8 @@ body:
         - Media3 1.0.0-alpha03
         - Media3 1.0.0-alpha02
         - Media3 1.0.0-alpha01
+        - Media3 `main` branch
+        - ExoPlayer 2.18.7
         - ExoPlayer 2.18.6
         - ExoPlayer 2.18.5
         - ExoPlayer 2.18.4
@@ -46,6 +50,7 @@ body:
         - ExoPlayer 2.14.2
         - ExoPlayer 2.14.1
         - ExoPlayer 2.14.0
+        - ExoPlayer `dev-v2` branch
         - Older (unsupported)
     validations:
       required: true

RELEASENOTES.md

@@ -1,5 +1,40 @@
 # Release notes
 
+### 1.0.2 (2023-05-18)
+
+This release corresponds to the
+[ExoPlayer 2.18.7 release](https://github.com/google/ExoPlayer/releases/tag/r2.18.7).
+
+This release contains the following changes since the
+[1.0.1 release](#101-2023-04-18):
+
+*   Core library:
+    *   Add `Buffer.isLastSample()` that denotes if `Buffer` contains flag
+        `C.BUFFER_FLAG_LAST_SAMPLE`.
+    *   Fix issue where last frame may not be rendered if the last sample with
+        frames is dequeued without reading the 'end of stream' sample.
+        ([#11079](https://github.com/google/ExoPlayer/issues/11079)).
+*   Extractors:
+    *   Fix parsing of H.265 SPS in MPEG-TS files by re-using the parsing logic
+        already used by RTSP and MP4 extractors
+        ([#303](https://github.com/androidx/media/issues/303)).
+*   Text:
+    *   SSA: Add support for UTF-16 files if they start with a byte order mark
+        ([#319](https://github.com/androidx/media/issues/319)).
+*   Session:
+    *   Fix issue where `MediaController` doesn't update its available commands
+        when connected to a legacy `MediaSessionCompat` that updates its
+        actions.
+    *   Fix bug that prevented the `MediaLibraryService` from returning null for
+        a call from System UI to `Callback.onGetLibraryRoot` with
+        `params.isRecent == true` on API 30
+        ([#355](https://github.com/androidx/media/issues/355)).
+    *   Fix memory leak of `MediaSessionService` or `MediaLibraryService`
+        ([#346](https://github.com/androidx/media/issues/346)).
+    *   Fix bug where a combined `Timeline` and position update in a
+        `MediaSession` may cause a `MediaController` to throw an
+        `IllegalStateException`.
+
 ### 1.0.1 (2023-04-18)
 
 This release corresponds to the

constants.gradle

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 project.ext {
-    releaseVersion = '1.0.1'
-    releaseVersionCode = 1_000_001_3_00
+    releaseVersion = '1.0.2'
+    releaseVersionCode = 1_000_002_3_00
     minSdkVersion = 16
     appTargetSdkVersion = 33
     // API version before restricting local file access.

core_settings.gradle

@@ -21,6 +21,8 @@ if (gradle.ext.has('androidxMediaModulePrefix')) {
     modulePrefix += gradle.ext.androidxMediaModulePrefix
 }
 
+rootProject.name = gradle.ext.androidxMediaProjectName
+
 include modulePrefix + 'lib-common'
 project(modulePrefix + 'lib-common').projectDir = new File(rootDir, 'libraries/common')
 

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

@@ -514,6 +514,7 @@ public void onTracksChanged(Tracks tracks) {
 
   private class PlayerErrorMessageProvider implements ErrorMessageProvider<PlaybackException> {
 
+    @OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)
     @Override
     public Pair<Integer, String> getErrorMessage(PlaybackException e) {
       String errorString = getString(R.string.error_generic);

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

@@ -27,6 +27,7 @@
 import android.content.res.AssetManager;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.JsonReader;
@@ -273,7 +274,7 @@ private void onSampleDownloadButtonClicked(PlaylistHolder playlistHolder) {
       Toast.makeText(getApplicationContext(), downloadUnsupportedStringId, Toast.LENGTH_LONG)
           .show();
     } else if (!notificationPermissionToastShown
-        && Util.SDK_INT >= 33
+        && Build.VERSION.SDK_INT >= 33
         && checkSelfPermission(Api33.getPostNotificationPermissionString())
             != PackageManager.PERMISSION_GRANTED) {
       downloadMediaItemWaitingForNotificationPermission = playlistHolder.mediaItems.get(0);

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

@@ -15,6 +15,7 @@
  */
 package androidx.media3.demo.session
 
+import android.annotation.SuppressLint
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent.*
@@ -29,6 +30,7 @@ import androidx.media3.common.MediaItem
 import androidx.media3.common.util.Util
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.session.*
+import androidx.media3.session.LibraryResult.RESULT_ERROR_NOT_SUPPORTED
 import androidx.media3.session.MediaSession.ControllerInfo
 import com.google.common.collect.ImmutableList
 import com.google.common.util.concurrent.Futures
@@ -95,7 +97,7 @@ class PlaybackService : MediaLibraryService() {
     ): MediaSession.ConnectionResult {
       val connectionResult = super.onConnect(session, controller)
       val availableSessionCommands = connectionResult.availableSessionCommands.buildUpon()
-      customCommands.forEach { commandButton ->
+      for (commandButton in customCommands) {
         // Add custom command to available session commands.
         commandButton.sessionCommand?.let { availableSessionCommands.add(it) }
       }
@@ -142,6 +144,12 @@ class PlaybackService : MediaLibraryService() {
       browser: ControllerInfo,
       params: LibraryParams?
     ): ListenableFuture<LibraryResult<MediaItem>> {
+      if (params != null && params.isRecent) {
+        // The service currently does not support playback resumption. Tell System UI by returning
+        // an error of type 'RESULT_ERROR_NOT_SUPPORTED' for a `params.isRecent` request. See
+        // https://github.com/androidx/media/issues/355
+        return Futures.immediateFuture(LibraryResult.ofError(RESULT_ERROR_NOT_SUPPORTED))
+      }
       return Futures.immediateFuture(LibraryResult.ofItem(MediaItemTree.getRootItem(), params))
     }
 
@@ -270,6 +278,7 @@ class PlaybackService : MediaLibraryService() {
      * by a media controller to resume playback when the {@link MediaSessionService} is in the
      * background.
      */
+    @SuppressLint("MissingPermission") // TODO: b/280766358 - Request this permission at runtime.
     override fun onForegroundServiceStartNotAllowedException() {
       val notificationManagerCompat = NotificationManagerCompat.from(this@PlaybackService)
       ensureNotificationChannel(notificationManagerCompat)

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

@@ -88,16 +88,6 @@ class PlayerActivity : AppCompatActivity() {
     initializeController()
   }
 
-  override fun onResume() {
-    super.onResume()
-    playerView.onResume()
-  }
-
-  override fun onPause() {
-    super.onPause()
-    playerView.onPause()
-  }
-
   override fun onStop() {
     super.onStop()
     playerView.player = null

libraries/common/build.gradle

@@ -23,7 +23,7 @@ rootProject.allprojects.forEach {
         evaluationDependsOn(':' + it.name)
     }
 }
-// copybara:media3-only
+
 android {
     buildTypes {
         debug {

libraries/common/src/main/java/androidx/media3/common/MediaLibraryInfo.java

@@ -29,11 +29,11 @@ public final class MediaLibraryInfo {
 
   /** The version of the library expressed as a string, for example "1.2.3" or "1.2.3-beta01". */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION_INT) or vice versa.
-  public static final String VERSION = "1.0.1";
+  public static final String VERSION = "1.0.2";
 
   /** The version of the library expressed as {@code TAG + "/" + VERSION}. */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
-  public static final String VERSION_SLASHY = "AndroidXMedia3/1.0.1";
+  public static final String VERSION_SLASHY = "AndroidXMedia3/1.0.2";
 
   /**
    * The version of the library expressed as an integer, for example 1002003300.
@@ -47,7 +47,7 @@ public final class MediaLibraryInfo {
    * (123-045-006-3-00).
    */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
-  public static final int VERSION_INT = 1_000_001_3_00;
+  public static final int VERSION_INT = 1_000_002_3_00;
 
   /** Whether the library was compiled with {@link Assertions} checks enabled. */
   public static final boolean ASSERTIONS_ENABLED = true;