From 0477d0d338e0bfe62f1d49fa928519f5f35fa3b5 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Wed, 8 Mar 2023 15:15:34 +0000
Subject: [PATCH] Restrict the visibility of some `DefaultDrmSession` methods

These are only used from within the package, so demote them from public
to package-private.

PiperOrigin-RevId: 515029018
---
 RELEASENOTES.md                                           | 8 ++++++++
 .../androidx/media3/exoplayer/drm/DefaultDrmSession.java  | 8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 966d76176c..3d6f16349c 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -16,6 +16,14 @@
         `AudioProcessors` are active, e.g. for gapless trimming
         ([#10847](https://github.com/google/ExoPlayer/issues/10847)).
     *   Encapsulate Opus frames in Ogg packets in direct playbacks (offload).
+*   DRM:
+    *   Reduce the visibility of several internal-only methods on
+        `DefaultDrmSession` that aren't expected to be called from outside the
+        DRM package:
+        *   `void onMediaDrmEvent(int)`
+        *   `void provision()`
+        *   `void onProvisionCompleted()`
+        *   `onProvisionError(Exception, boolean)`
 *   Transformer:
     *   Remove `Transformer.Builder.setMediaSourceFactory(MediaSource.Factory)`.
         Use `ExoPlayerAssetLoader.Factory(MediaSource.Factory)` and
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/DefaultDrmSession.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/DefaultDrmSession.java
index c64eb57dab..92a6e281f9 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/DefaultDrmSession.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/DefaultDrmSession.java
@@ -216,7 +216,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
     return Arrays.equals(this.sessionId, sessionId);
   }
 
-  public void onMediaDrmEvent(int what) {
+  /* package */ void onMediaDrmEvent(int what) {
     switch (what) {
       case ExoMediaDrm.EVENT_KEY_REQUIRED:
         onKeysRequired();
@@ -228,7 +228,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
 
   // Provisioning implementation.
 
-  public void provision() {
+  /* package */ void provision() {
     currentProvisionRequest = mediaDrm.getProvisionRequest();
     Util.castNonNull(requestHandler)
         .post(
@@ -237,13 +237,13 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
             /* allowRetry= */ true);
   }
 
-  public void onProvisionCompleted() {
+  /* package */ void onProvisionCompleted() {
     if (openInternal()) {
       doLicense(true);
     }
   }
 
-  public void onProvisionError(Exception error, boolean thrownByExoMediaDrm) {
+  /* package */ void onProvisionError(Exception error, boolean thrownByExoMediaDrm) {
     onError(
         error,
         thrownByExoMediaDrm