Reformat after rebasing

Also fix some doc lint failures

Author: icbaker

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/DrmUtil.java

@@ -147,9 +147,9 @@ public static boolean isFailureToConstructResourceBusyException(@Nullable Throwa
    *
    * <p>Note that this method is executing the request synchronously and blocks until finished.
    *
-   * <p>The {@link LoadEventInfo} returned inside the {@link KeyResponse} will have the following
-   * fields unset, and they must be updated by caller before the {@link LoadEventInfo} is used
-   * elsewhere:
+   * <p>The {@link LoadEventInfo} returned inside the {@link MediaDrmCallback.Response} will have
+   * the following fields unset, and they must be updated by caller before the {@link LoadEventInfo}
+   * is used elsewhere:
    *
    * <ul>
    *   <li>{@link LoadEventInfo#loadTaskId}
@@ -160,7 +160,8 @@ public static boolean isFailureToConstructResourceBusyException(@Nullable Throwa
    * @param url The requested URL.
    * @param httpBody The HTTP request payload.
    * @param requestProperties A keyed map of HTTP header request properties.
-   * @return A {@link MediaDrmCallback.Response} that holds the response payload, and {@link LoadEventInfo}.
+   * @return A {@link MediaDrmCallback.Response} that holds the response payload, and {@link
+   *     LoadEventInfo}.
    * @throws MediaDrmCallbackException if an exception was encountered during the download.
    */
   public static MediaDrmCallback.Response executePost(

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/KeyRequestInfo.java

@@ -19,6 +19,7 @@
 
 import androidx.annotation.Nullable;
 import androidx.media3.common.DrmInitData.SchemeData;
+import androidx.media3.common.util.UnstableApi;
 import androidx.media3.exoplayer.source.LoadEventInfo;
 import com.google.common.collect.ImmutableList;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
@@ -27,6 +28,7 @@
 
 /** Information related to a completed DRM key request operation. */
 // TODO: #1001 - Add sessionId field.
+@UnstableApi
 public final class KeyRequestInfo {
 
   /** Builder for {@link KeyRequestInfo} instances. */

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/LocalMediaDrmCallback.java

@@ -39,7 +39,9 @@ public final class LocalMediaDrmCallback implements MediaDrmCallback {
    * @param keyResponse The fixed response for all key requests.
    */
   public LocalMediaDrmCallback(byte[] keyResponse) {
-    this.keyResponse = new Response(checkNotNull(keyResponse), new LoadEventInfo(-1, new DataSpec.Builder().build(), 0));
+    this.keyResponse =
+        new Response(
+            checkNotNull(keyResponse), new LoadEventInfo(-1, new DataSpec.Builder().build(), 0));
   }
 
   @Override

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/MediaDrmCallback.java

@@ -25,13 +25,12 @@
 @UnstableApi
 public interface MediaDrmCallback {
 
-  /**
-   * Response data from the {@link MediaDrmCallback} requests.
-   */
+  /** Response data from the {@link MediaDrmCallback} requests. */
   final class Response {
 
     /** The response from the license or provisioning server. */
     public final byte[] data;
+
     /** Information about the loading of {@link #data}. */
     public final LoadEventInfo loadEventInfo;
 
@@ -45,7 +44,7 @@ public Response(byte[] data, LoadEventInfo loadEventInfo) {
   /**
    * Executes a provisioning request.
    *
-   * <p>The {@link LoadEventInfo} returned inside the {@link KeyResponse} will have the following
+   * <p>The {@link LoadEventInfo} returned inside the {@link Response} will have the following
    * fields unset, and they must be updated by caller before the {@link LoadEventInfo} is used
    * elsewhere:
    *
@@ -65,7 +64,7 @@ Response executeProvisionRequest(UUID uuid, ProvisionRequest request)
   /**
    * Executes a key request.
    *
-   * <p>The {@link LoadEventInfo} returned inside the {@link KeyResponse} will have the following
+   * <p>The {@link LoadEventInfo} returned inside the {@link Response} will have the following
    * fields unset, and they must be updated by caller before the {@link LoadEventInfo} is used
    * elsewhere:
    *

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/util/EventLogger.java

@@ -517,7 +517,7 @@ public void onDrmKeysRemoved(EventTime eventTime) {
 
   @UnstableApi
   @Override
-  public void onDrmKeysLoaded(EventTime eventTime, @Nullable KeyRequestInfo info) {
+  public void onDrmKeysLoaded(EventTime eventTime, @Nullable KeyRequestInfo keyRequestInfo) {
     logd(eventTime, "drmKeysLoaded");
   }
 

libraries/exoplayer/src/test/java/androidx/media3/exoplayer/analytics/DefaultAnalyticsCollectorTest.java

@@ -108,8 +108,6 @@
 import androidx.media3.exoplayer.drm.DrmSession;
 import androidx.media3.exoplayer.drm.DrmSessionManager;
 import androidx.media3.exoplayer.drm.ExoMediaDrm;
-import androidx.media3.exoplayer.drm.ExoMediaDrm.KeyRequest;
-import androidx.media3.exoplayer.drm.ExoMediaDrm.ProvisionRequest;
 import androidx.media3.exoplayer.drm.MediaDrmCallback;
 import androidx.media3.exoplayer.drm.MediaDrmCallbackException;
 import androidx.media3.exoplayer.source.LoadEventInfo;