Merge pull request #2832 from nift4:media3log

PiperOrigin-RevId: 827490914

Author: copybara-github

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoDecoderGLSurfaceView.java

@@ -22,10 +22,10 @@
 import android.opengl.GLES20;
 import android.opengl.GLSurfaceView;
 import android.util.AttributeSet;
-import android.util.Log;
 import androidx.annotation.Nullable;
 import androidx.media3.common.util.GlProgram;
 import androidx.media3.common.util.GlUtil;
+import androidx.media3.common.util.Log;
 import androidx.media3.common.util.NullableType;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.decoder.VideoDecoderOutputBuffer;

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/spherical/ProjectionRenderer.java

@@ -19,11 +19,11 @@
 
 import android.opengl.GLES11Ext;
 import android.opengl.GLES20;
-import android.util.Log;
 import androidx.annotation.Nullable;
 import androidx.media3.common.C;
 import androidx.media3.common.util.GlProgram;
 import androidx.media3.common.util.GlUtil;
+import androidx.media3.common.util.Log;
 import java.nio.FloatBuffer;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 

libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/reader/RtpPcmReader.java

@@ -18,8 +18,8 @@
 import static androidx.media3.exoplayer.rtsp.reader.RtpReaderUtils.toSampleTimeUs;
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import android.util.Log;
 import androidx.media3.common.C;
+import androidx.media3.common.util.Log;
 import androidx.media3.common.util.ParsableByteArray;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.util.Util;

libraries/session/src/main/java/androidx/media3/session/MediaButtonReceiver.java

@@ -140,7 +140,7 @@ protected final void handleIntentAndMaybeStartTheService(
     if (intent == null
         || !Objects.equals(intent.getAction(), Intent.ACTION_MEDIA_BUTTON)
         || !intent.hasExtra(Intent.EXTRA_KEY_EVENT)) {
-      android.util.Log.d(TAG, "Ignore unsupported intent: " + intent);
+      Log.d(TAG, "Ignore unsupported intent: " + intent);
       return;
     }
 
@@ -163,7 +163,7 @@ protected final void handleIntentAndMaybeStartTheService(
         // playback is started and the MediaSessionService/MediaLibraryService is put into the
         // foreground (see https://developer.android.com/media/legacy/media-buttons and
         // https://developer.android.com/about/versions/oreo/android-8.0-changes#back-all).
-        android.util.Log.w(
+        Log.w(
             TAG,
             "Ignore key event that is not a `play` command on API 26 or above to avoid an"
                 + " 'ForegroundServiceDidNotStartInTimeException'");

libraries/session/src/main/java/androidx/media3/session/legacy/MediaBrowserCompat.java

@@ -65,12 +65,12 @@
 import android.os.RemoteException;
 import android.support.v4.os.ResultReceiver;
 import android.text.TextUtils;
-import android.util.Log;
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.RestrictTo;
 import androidx.collection.ArrayMap;
+import androidx.media3.common.util.Log;
 import androidx.media3.common.util.NullableType;
 import androidx.media3.session.legacy.MediaControllerCompat.TransportControls;
 import java.lang.annotation.Retention;
@@ -108,7 +108,6 @@
 @RestrictTo(LIBRARY)
 public final class MediaBrowserCompat {
   static final String TAG = "MediaBrowserCompat";
-  static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
   /**
    * Used as an int extra field to denote the page number to subscribe. The value of {@code
@@ -1219,9 +1218,7 @@ public void onLoadChildren(
       // Check that the subscription is still subscribed.
       Subscription subscription = parentId == null ? null : subscriptions.get(parentId);
       if (subscription == null) {
-        if (DEBUG) {
-          Log.d(TAG, "onLoadChildren for id that isn't subscribed id=" + parentId);
-        }
+        Log.d(TAG, "onLoadChildren for id that isn't subscribed id=" + parentId);
         return;
       }
 

libraries/session/src/main/java/androidx/media3/session/legacy/MediaBrowserServiceCompat.java

@@ -66,7 +66,6 @@
 import android.service.media.MediaBrowserService;
 import android.support.v4.os.ResultReceiver;
 import android.text.TextUtils;
-import android.util.Log;
 import androidx.annotation.CallSuper;
 import androidx.annotation.IntDef;
 import androidx.annotation.MainThread;
@@ -75,6 +74,7 @@
 import androidx.annotation.RestrictTo;
 import androidx.collection.ArrayMap;
 import androidx.core.util.Pair;
+import androidx.media3.common.util.Log;
 import androidx.media3.common.util.NullableType;
 import androidx.media3.common.util.Util;
 import androidx.media3.session.legacy.MediaSessionManager.RemoteUserInfo;
@@ -119,7 +119,6 @@
 @RestrictTo(LIBRARY)
 public abstract class MediaBrowserServiceCompat extends Service {
   static final String TAG = "MBServiceCompat";
-  static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
   private static final float EPSILON = 0.00001f;
 
@@ -1542,15 +1541,13 @@ void performLoadChildren(
           @Override
           void onResultSent(@Nullable List<MediaBrowserCompat.MediaItem> list) {
             if (connections.get(checkNotNull(connection.callbacks).asBinder()) != connection) {
-              if (DEBUG) {
-                Log.d(
-                    TAG,
-                    "Not sending onLoadChildren result for connection that has"
-                        + " been disconnected. pkg="
-                        + connection.pkg
-                        + " id="
-                        + parentId);
-              }
+              Log.d(
+                  TAG,
+                  "Not sending onLoadChildren result for connection that has"
+                      + " been disconnected. pkg="
+                      + connection.pkg
+                      + " id="
+                      + parentId);
               return;
             }
 

libraries/session/src/main/java/androidx/media3/session/legacy/MediaButtonReceiver.java

@@ -27,12 +27,12 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.Build;
-import android.util.Log;
 import android.view.KeyEvent;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.RestrictTo;
 import androidx.core.content.ContextCompat;
+import androidx.media3.common.util.Log;
 import java.util.List;
 
 /**

libraries/session/src/main/java/androidx/media3/session/legacy/MediaControllerCompat.java

@@ -39,13 +39,13 @@
 import android.os.RemoteException;
 import android.os.ResultReceiver;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.KeyEvent;
 import androidx.annotation.GuardedBy;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.RestrictTo;
 import androidx.media3.common.AudioAttributes;
+import androidx.media3.common.util.Log;
 import androidx.media3.session.legacy.MediaSessionCompat.QueueItem;
 import androidx.media3.session.legacy.PlaybackStateCompat.CustomAction;
 import androidx.versionedparcelable.ParcelUtils;

libraries/session/src/main/java/androidx/media3/session/legacy/MediaMetadataCompat.java

@@ -25,11 +25,11 @@
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.util.Log;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.annotation.StringDef;
 import androidx.collection.ArrayMap;
+import androidx.media3.common.util.Log;
 import androidx.media3.session.legacy.MediaControllerCompat.TransportControls;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

libraries/session/src/main/java/androidx/media3/session/legacy/MediaSessionCompat.java

@@ -49,14 +49,14 @@
 import android.os.ResultReceiver;
 import android.os.SystemClock;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.KeyEvent;
 import android.view.ViewConfiguration;
 import androidx.annotation.GuardedBy;
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.RestrictTo;
+import androidx.media3.common.util.Log;
 import androidx.media3.common.util.NullableType;
 import androidx.media3.session.legacy.MediaSessionManager.RemoteUserInfo;
 import androidx.versionedparcelable.ParcelUtils;