Merge pull request #336 from androidx/release-1.0.1-stable

1.0.1

Author: rohitjoins

.github/ISSUE_TEMPLATE/bug.yml

@@ -20,6 +20,7 @@ body:
       label: Media3 Version
       description: What version of Media3 (or ExoPlayer) are you using?
       options:
+        - Media3 1.0.1
         - Media3 1.0.0
         - Media3 1.0.0-rc02
         - Media3 1.0.0-rc01
@@ -29,6 +30,7 @@ body:
         - Media3 1.0.0-alpha03
         - Media3 1.0.0-alpha02
         - Media3 1.0.0-alpha01
+        - ExoPlayer 2.18.6
         - ExoPlayer 2.18.5
         - ExoPlayer 2.18.4
         - ExoPlayer 2.18.3

.github/ISSUE_TEMPLATE/question.md

@@ -36,7 +36,7 @@ In case your question is related to a piece of media:
   - Authentication HTTP headers
 
 Don't forget to check ExoPlayer's supported formats and devices, if applicable
-(https://exoplayer.dev/supported-formats.html).
+(https://developer.android.com/guide/topics/media/exoplayer/supported-formats).
 
 If there's something you don't want to post publicly, please submit the issue,
 then email the link/bug report to dev.exoplayer@gmail.com using a subject in the

CONTRIBUTING.md

@@ -23,6 +23,21 @@ We will also consider high quality pull requests. These should merge
 into the `main` branch. Before a pull request can be accepted you must submit
 a Contributor License Agreement, as described below.
 
+### Code style
+
+We follow the
+[Google Java Style Guide](https://google.github.io/styleguide/javaguide.html)
+and use [`google-java-format`](https://github.com/google/google-java-format) to
+automatically reformat the code. Please consider auto-formatting your changes
+before opening a PR (we will otherwise do this ourselves before merging). You
+can use the various IDE integrations available, or bulk-reformat all the changes
+you made on top of `main` using
+[`google-java-format-diff.py`](https://github.com/google/google-java-format/blob/master/scripts/google-java-format-diff.py):
+
+```shell
+$ git diff -U0 main... | google-java-format-diff.py -p1 -i
+```
+
 ## Contributor license agreement
 
 Contributions to any Google project must be accompanied by a Contributor

RELEASENOTES.md

@@ -1,5 +1,44 @@
 # Release notes
 
+### 1.0.1 (2023-04-18)
+
+This release corresponds to the
+[ExoPlayer 2.18.6 release](https://github.com/google/ExoPlayer/releases/tag/r2.18.6).
+
+*   Core library:
+    *   Reset target live stream override when seeking to default position
+        ([#11051](https://github.com/google/ExoPlayer/pull/11051)).
+    *   Fix bug where empty sample streams in the media could cause playback to
+        be stuck.
+*   Session:
+    *   Fix bug where multiple identical queue items published by a legacy
+        `MediaSessionCompat` result in an exception in `MediaController`
+        ([#290](https://github.com/androidx/media/issues/290)).
+    *   Add missing forwarding of `MediaSession.broadcastCustomCommand` to the
+        legacy `MediaControllerCompat.Callback.onSessionEvent`
+        ([#293](https://github.com/androidx/media/issues/293)).
+    *   Fix bug where calling `MediaSession.setPlayer` doesn't update the
+        available commands.
+    *   Fix issue that `TrackSelectionOverride` instances sent from a
+        `MediaController` are ignored if they reference a group with
+        `Format.metadata`
+        ([#296](https://github.com/androidx/media/issues/296)).
+    *   Fix issue where `Player.COMMAND_GET_CURRENT_MEDIA_ITEM` needs to be
+        available to access metadata via the legacy `MediaSessionCompat`.
+    *   Fix issue where `MediaSession` instances on a background thread cause
+        crashes when used in `MediaSessionService`
+        ([#318](https://github.com/androidx/media/issues/318)).
+    *   Fix issue where a media button receiver was declared by the library
+        without the app having intended this
+        ([#314](https://github.com/androidx/media/issues/314)).
+*   DASH:
+    *   Fix handling of empty segment timelines
+        ([#11014](https://github.com/google/ExoPlayer/issues/11014)).
+*   RTSP:
+    *   Retry with TCP if RTSP Setup with UDP fails with RTSP Error 461
+        UnsupportedTransport
+        ([#11069](https://github.com/google/ExoPlayer/issues/11069)).
+
 ### 1.0.0 (2023-03-22)
 
 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.0'
-    releaseVersionCode = 1_000_000_3_00
+    releaseVersion = '1.0.1'
+    releaseVersionCode = 1_000_001_3_00
     minSdkVersion = 16
     appTargetSdkVersion = 33
     // API version before restricting local file access.

demos/gl/build.gradle

@@ -27,6 +27,7 @@ android {
         versionCode project.ext.releaseVersionCode
         minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.appTargetSdkVersion
+        multiDexEnabled true
     }
 
     buildTypes {

demos/main/src/main/res/values/strings.xml

@@ -21,7 +21,7 @@
 
   <string name="unexpected_intent_action">Unexpected intent action: <xliff:g id="action">%1$s</xliff:g></string>
 
-  <string name="error_cleartext_not_permitted">Cleartext HTTP traffic not permitted. See https://exoplayer.dev/issues/cleartext-not-permitted</string>
+  <string name="error_cleartext_not_permitted">Cleartext HTTP traffic not permitted. See https://developer.android.com/guide/topics/media/issues/cleartext-not-permitted</string>
 
   <string name="error_generic">Playback failed</string>
 

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

@@ -26,6 +26,7 @@ import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import android.widget.ListView
 import android.widget.TextView
+import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.media3.common.MediaItem
@@ -73,20 +74,24 @@ class MainActivity : AppCompatActivity() {
         val intent = Intent(this, PlayerActivity::class.java)
         startActivity(intent)
       }
+
+    onBackPressedDispatcher.addCallback(
+      object : OnBackPressedCallback(/* enabled= */ true) {
+        override fun handleOnBackPressed() {
+          popPathStack()
+        }
+      }
+    )
   }
 
   override fun onOptionsItemSelected(item: MenuItem): Boolean {
     if (item.itemId == android.R.id.home) {
-      onBackPressed()
+      onBackPressedDispatcher.onBackPressed()
       return true
     }
     return super.onOptionsItemSelected(item)
   }
 
-  override fun onBackPressed() {
-    popPathStack()
-  }
-
   override fun onStart() {
     super.onStart()
     initializeBrowser()

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

@@ -135,6 +135,7 @@ class PlayerActivity : AppCompatActivity() {
     updateMediaMetadataUI(controller.mediaMetadata)
     updateShuffleSwitchUI(controller.shuffleModeEnabled)
     updateRepeatSwitchUI(controller.repeatMode)
+    playerView.setShowSubtitleButton(controller.currentTracks.isTypeSupported(TRACK_TYPE_TEXT))
 
     controller.addListener(
       object : Player.Listener {

demos/transformer/README.md

@@ -61,6 +61,6 @@ manual steps.
     (this will only appear if the AAR is present), then build and run the demo
     app and select a MediaPipe-based effect.
 
-[Transformer]: https://exoplayer.dev/transforming-media.html
+[Transformer]: https://developer.android.com/guide/topics/media/transforming-media
 [MediaPipe]: https://google.github.io/mediapipe/
 [build an AAR]: https://google.github.io/mediapipe/getting_started/android_archive_library.html