diff --git a/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/CommonConstants.java b/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/CommonConstants.java index b7c70c4825..b310ad34fc 100644 --- a/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/CommonConstants.java +++ b/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/CommonConstants.java @@ -18,10 +18,8 @@ package androidx.media3.test.session.common; import android.content.ComponentName; import android.net.Uri; import android.os.Bundle; -import androidx.media3.common.util.UnstableApi; /** Common constants for testing purpose. */ -@UnstableApi public class CommonConstants { public static final String SUPPORT_APP_PACKAGE_NAME = "androidx.media3.test.session"; diff --git a/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/CustomParcelable.java b/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/CustomParcelable.java index fa37b7c19b..1665ea5326 100644 --- a/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/CustomParcelable.java +++ b/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/CustomParcelable.java @@ -18,11 +18,9 @@ package androidx.media3.test.session.common; import android.annotation.SuppressLint; import android.os.Parcel; import android.os.Parcelable; -import androidx.media3.common.util.UnstableApi; /** Custom Parcelable class to test sending/receiving user parcelables between processes. */ @SuppressLint("BanParcelableUsage") -@UnstableApi public class CustomParcelable implements Parcelable { private int value; diff --git a/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/HandlerThreadTestRule.java b/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/HandlerThreadTestRule.java index 9619724018..15031974c2 100644 --- a/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/HandlerThreadTestRule.java +++ b/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/HandlerThreadTestRule.java @@ -16,12 +16,10 @@ package androidx.media3.test.session.common; import android.os.HandlerThread; -import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.Util; import org.junit.rules.ExternalResource; /** TestRule for providing a handler and an executor for {@link HandlerThread}. */ -@UnstableApi public final class HandlerThreadTestRule extends ExternalResource { private final String threadName; diff --git a/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/MainLooperTestRule.java b/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/MainLooperTestRule.java index 8e5fe58e3d..fbc4f0fa81 100644 --- a/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/MainLooperTestRule.java +++ b/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/MainLooperTestRule.java @@ -18,7 +18,6 @@ package androidx.media3.test.session.common; import android.content.Context; import android.media.AudioManager; import android.os.Looper; -import androidx.media3.common.util.UnstableApi; import androidx.test.core.app.ApplicationProvider; import androidx.test.platform.app.InstrumentationRegistry; import org.junit.rules.TestRule; @@ -26,7 +25,6 @@ import org.junit.runner.Description; import org.junit.runners.model.Statement; /** TestRule for preparing main looper. */ -@UnstableApi public final class MainLooperTestRule implements TestRule { @Override diff --git a/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/MediaBrowserConstants.java b/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/MediaBrowserConstants.java index 6cf1ce19e1..9ef0441900 100644 --- a/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/MediaBrowserConstants.java +++ b/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/MediaBrowserConstants.java @@ -16,12 +16,10 @@ package androidx.media3.test.session.common; import android.os.Bundle; -import androidx.media3.common.util.UnstableApi; import java.util.ArrayList; import java.util.List; /** Constants for calling MediaBrowser methods. */ -@UnstableApi public class MediaBrowserConstants { public static final String ROOT_ID = "rootId"; diff --git a/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/MediaBrowserServiceCompatConstants.java b/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/MediaBrowserServiceCompatConstants.java index f864078f07..31e16aecc8 100644 --- a/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/MediaBrowserServiceCompatConstants.java +++ b/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/MediaBrowserServiceCompatConstants.java @@ -15,10 +15,7 @@ */ package androidx.media3.test.session.common; -import androidx.media3.common.util.UnstableApi; - /** Constants for calling MediaBrowserServiceCompat methods. */ -@UnstableApi public class MediaBrowserServiceCompatConstants { public static final String TEST_CONNECT_REJECTED = "testConnect_rejected"; diff --git a/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/MediaSessionConstants.java b/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/MediaSessionConstants.java index 8b15263fea..480fe012ac 100644 --- a/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/MediaSessionConstants.java +++ b/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/MediaSessionConstants.java @@ -15,10 +15,7 @@ */ package androidx.media3.test.session.common; -import androidx.media3.common.util.UnstableApi; - /** Constants for calling MediaSession methods. */ -@UnstableApi public class MediaSessionConstants { // Test method names diff --git a/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/MockActivity.java b/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/MockActivity.java index 454280c11f..e851fa73c9 100644 --- a/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/MockActivity.java +++ b/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/MockActivity.java @@ -16,8 +16,6 @@ package androidx.media3.test.session.common; import android.app.Activity; -import androidx.media3.common.util.UnstableApi; /** An empty activity used for testing. */ -@UnstableApi public class MockActivity extends Activity {} diff --git a/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/PollingCheck.java b/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/PollingCheck.java index cf4df31057..6d32dfc318 100644 --- a/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/PollingCheck.java +++ b/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/PollingCheck.java @@ -17,13 +17,10 @@ package androidx.media3.test.session.common; import static com.google.common.truth.Truth.assertWithMessage; -import androidx.media3.common.util.UnstableApi; - /** * Utility used for testing that allows to poll for a certain condition to happen within a timeout. */ // It's forked from androidx.testutils.PollingCheck. -@UnstableApi public abstract class PollingCheck { private static final long TIME_SLICE_MS = 50; private final long timeoutMs; diff --git a/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/SurfaceActivity.java b/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/SurfaceActivity.java index 1f5aecdddb..59de1ae7d9 100644 --- a/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/SurfaceActivity.java +++ b/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/SurfaceActivity.java @@ -21,10 +21,8 @@ import android.view.SurfaceHolder; import android.view.SurfaceView; import android.view.TextureView; import android.view.ViewGroup; -import androidx.media3.common.util.UnstableApi; /** An activity used for surface test */ -@UnstableApi public class SurfaceActivity extends Activity { private ViewGroup rootViewGroup; diff --git a/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/TestHandler.java b/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/TestHandler.java index 06236f4dd6..893df554af 100644 --- a/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/TestHandler.java +++ b/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/TestHandler.java @@ -21,13 +21,11 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS; import android.os.Handler; import android.os.Looper; -import androidx.media3.common.util.UnstableApi; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicReference; /** Handler for testing. */ -@UnstableApi public class TestHandler extends Handler { private static final long DEFAULT_TIMEOUT_MS = LONG_TIMEOUT_MS; diff --git a/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/TestUtils.java b/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/TestUtils.java index 5a6e05df29..7c74dcde4f 100644 --- a/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/TestUtils.java +++ b/libraries/test_session_common/src/main/java/androidx/media3/test/session/common/TestUtils.java @@ -29,7 +29,6 @@ import android.view.WindowManager; import androidx.annotation.Nullable; import androidx.annotation.UiThread; import androidx.media3.common.Player; -import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.Util; import com.google.common.collect.ImmutableList; import java.io.ByteArrayOutputStream; @@ -38,7 +37,6 @@ import java.io.InputStream; import java.util.Locale; /** Provides utility methods for testing purpose. */ -@UnstableApi public class TestUtils { public static final long TIMEOUT_MS = 5_000; diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/LocalMockMediaBrowserServiceCompat.java b/libraries/test_session_current/src/main/java/androidx/media3/session/LocalMockMediaBrowserServiceCompat.java index 2a6cea5af4..206a39884a 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/LocalMockMediaBrowserServiceCompat.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/LocalMockMediaBrowserServiceCompat.java @@ -15,8 +15,5 @@ */ package androidx.media3.session; -import androidx.media3.common.util.UnstableApi; - /** {@link MockMediaBrowserServiceCompat} running on a local process. */ -@UnstableApi public class LocalMockMediaBrowserServiceCompat extends MockMediaBrowserServiceCompat {} diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/LocalMockMediaSessionService.java b/libraries/test_session_current/src/main/java/androidx/media3/session/LocalMockMediaSessionService.java index 8ac7c5d920..781167c4e8 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/LocalMockMediaSessionService.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/LocalMockMediaSessionService.java @@ -15,8 +15,5 @@ */ package androidx.media3.session; -import androidx.media3.common.util.UnstableApi; - /** {@link MockMediaSessionService} running on a local process. */ -@UnstableApi public class LocalMockMediaSessionService extends MockMediaSessionService {} diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/MediaBrowserCompatProviderService.java b/libraries/test_session_current/src/main/java/androidx/media3/session/MediaBrowserCompatProviderService.java index 0fce9ae28f..d1b6121d62 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/MediaBrowserCompatProviderService.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/MediaBrowserCompatProviderService.java @@ -32,7 +32,6 @@ import android.support.v4.media.MediaBrowserCompat.ItemCallback; import android.support.v4.media.MediaBrowserCompat.SearchCallback; import android.support.v4.media.MediaBrowserCompat.SubscriptionCallback; import androidx.media3.common.util.Log; -import androidx.media3.common.util.UnstableApi; import androidx.media3.test.session.common.IRemoteMediaBrowserCompat; import androidx.media3.test.session.common.TestHandler; import java.util.HashMap; @@ -44,7 +43,6 @@ import java.util.concurrent.Executor; * A Service that creates {@link MediaBrowserCompat} and calls its methods according to the service * app's requests. */ -@UnstableApi public class MediaBrowserCompatProviderService extends Service { private static final String TAG = "MBCompatProviderService"; diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/MediaControllerCompatProviderService.java b/libraries/test_session_current/src/main/java/androidx/media3/session/MediaControllerCompatProviderService.java index 366aa99629..cee8339186 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/MediaControllerCompatProviderService.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/MediaControllerCompatProviderService.java @@ -34,7 +34,6 @@ import android.support.v4.media.session.MediaControllerCompat; import android.support.v4.media.session.MediaSessionCompat; import android.support.v4.media.session.PlaybackStateCompat; import androidx.media3.common.util.Log; -import androidx.media3.common.util.UnstableApi; import androidx.media3.test.session.common.IRemoteMediaControllerCompat; import androidx.media3.test.session.common.TestHandler; import java.util.HashMap; @@ -46,7 +45,6 @@ import java.util.concurrent.Executor; * A Service that creates {@link MediaControllerCompat} and calls its methods according to the * service app's requests. */ -@UnstableApi public class MediaControllerCompatProviderService extends Service { private static final String TAG = "MCCProviderService"; diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/MediaControllerProviderService.java b/libraries/test_session_current/src/main/java/androidx/media3/session/MediaControllerProviderService.java index dffcada3d3..31f1c8be13 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/MediaControllerProviderService.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/MediaControllerProviderService.java @@ -33,7 +33,6 @@ import androidx.media3.common.Rating; import androidx.media3.common.TrackSelectionParameters; import androidx.media3.common.util.BundleableUtil; import androidx.media3.common.util.Log; -import androidx.media3.common.util.UnstableApi; import androidx.media3.test.session.common.IRemoteMediaController; import androidx.media3.test.session.common.TestHandler; import androidx.media3.test.session.common.TestUtils; @@ -53,7 +52,6 @@ import java.util.concurrent.TimeoutException; * A Service that creates {@link MediaController} and calls its methods according to the service * app's requests. */ -@UnstableApi public class MediaControllerProviderService extends Service { private static final String TAG = "MCProviderService"; diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/MediaSessionCompatProviderService.java b/libraries/test_session_current/src/main/java/androidx/media3/session/MediaSessionCompatProviderService.java index 91346dffa6..aa4072ad5b 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/MediaSessionCompatProviderService.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/MediaSessionCompatProviderService.java @@ -34,7 +34,6 @@ import android.support.v4.media.session.PlaybackStateCompat; import androidx.annotation.Nullable; import androidx.media.VolumeProviderCompat; import androidx.media3.common.util.Log; -import androidx.media3.common.util.UnstableApi; import androidx.media3.test.session.common.IRemoteMediaSessionCompat; import androidx.media3.test.session.common.TestHandler; import java.util.HashMap; @@ -46,7 +45,6 @@ import java.util.concurrent.Executor; * A Service that creates {@link MediaSessionCompat} and calls its methods according to the client * app's requests. */ -@UnstableApi public class MediaSessionCompatProviderService extends Service { public static final String METHOD_ON_PREPARE_FROM_MEDIA_ID = "onPrepareFromMediaId"; diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/MediaSessionProviderService.java b/libraries/test_session_current/src/main/java/androidx/media3/session/MediaSessionProviderService.java index d48253eed7..053405b83f 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/MediaSessionProviderService.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/MediaSessionProviderService.java @@ -88,7 +88,6 @@ import androidx.media3.common.Tracks; import androidx.media3.common.VideoSize; import androidx.media3.common.text.CueGroup; import androidx.media3.common.util.Log; -import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.Util; import androidx.media3.session.MediaSession.ControllerInfo; import androidx.media3.test.session.common.IRemoteMediaSession; @@ -107,7 +106,6 @@ import java.util.concurrent.Callable; * A Service that creates {@link MediaSession} and calls its methods according to the client app's * requests. */ -@UnstableApi public class MediaSessionProviderService extends Service { private static final String TAG = "MSProviderService"; diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/MediaTestUtils.java b/libraries/test_session_current/src/main/java/androidx/media3/session/MediaTestUtils.java index bd82b76e2a..990637680f 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/MediaTestUtils.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/MediaTestUtils.java @@ -35,7 +35,6 @@ import androidx.media3.common.MediaItem; import androidx.media3.common.MediaMetadata; import androidx.media3.common.Timeline; import androidx.media3.common.util.Log; -import androidx.media3.common.util.UnstableApi; import androidx.media3.session.MediaLibraryService.LibraryParams; import androidx.media3.session.MediaSession.ControllerInfo; import androidx.media3.test.session.common.TestUtils; @@ -45,7 +44,6 @@ import java.util.ArrayList; import java.util.List; /** Utilities for tests. */ -@UnstableApi public final class MediaTestUtils { private static final String TAG = "MediaTestUtils"; diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/MockMediaBrowserServiceCompat.java b/libraries/test_session_current/src/main/java/androidx/media3/session/MockMediaBrowserServiceCompat.java index 19bce9153d..2df04106fe 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/MockMediaBrowserServiceCompat.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/MockMediaBrowserServiceCompat.java @@ -40,7 +40,6 @@ import android.support.v4.media.session.MediaSessionCompat.Callback; import androidx.annotation.GuardedBy; import androidx.annotation.Nullable; import androidx.media.MediaBrowserServiceCompat; -import androidx.media3.common.util.UnstableApi; import androidx.media3.test.session.common.IRemoteMediaBrowserServiceCompat; import androidx.media3.test.session.common.MediaBrowserServiceCompatConstants; import com.google.common.collect.ImmutableList; @@ -49,7 +48,6 @@ import java.util.Collections; import java.util.List; /** Mock implementation of the media browser service. */ -@UnstableApi public class MockMediaBrowserServiceCompat extends MediaBrowserServiceCompat { /** diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/MockMediaLibraryService.java b/libraries/test_session_current/src/main/java/androidx/media3/session/MockMediaLibraryService.java index f5a2da634e..cc0b452106 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/MockMediaLibraryService.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/MockMediaLibraryService.java @@ -66,7 +66,6 @@ import androidx.annotation.Nullable; import androidx.media3.common.MediaItem; import androidx.media3.common.MediaMetadata; import androidx.media3.common.util.Log; -import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.Util; import androidx.media3.session.MediaSession.ControllerInfo; import androidx.media3.test.session.common.CommonConstants; @@ -81,7 +80,6 @@ import java.util.List; import java.util.concurrent.Executors; /** A mock MediaLibraryService */ -@UnstableApi public class MockMediaLibraryService extends MediaLibraryService { /** ID of the session that this service will create. */ public static final String ID = "TestLibrary"; diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/MockMediaSessionService.java b/libraries/test_session_current/src/main/java/androidx/media3/session/MockMediaSessionService.java index d3bc2aec82..57e0bc6f65 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/MockMediaSessionService.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/MockMediaSessionService.java @@ -23,14 +23,12 @@ import android.os.IBinder; import android.text.TextUtils; import androidx.annotation.Nullable; import androidx.media3.common.util.ConditionVariable; -import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.Util; import androidx.media3.session.MediaSession.ControllerInfo; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; /** A mock MediaSessionService */ -@UnstableApi public class MockMediaSessionService extends MediaSessionService { /** ID of the session that this service will create. */ public static final String ID = "TestSession"; diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/MockPlayer.java b/libraries/test_session_current/src/main/java/androidx/media3/session/MockPlayer.java index 4d33c9efe3..ee7cf1450f 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/MockPlayer.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/MockPlayer.java @@ -42,7 +42,6 @@ import androidx.media3.common.VideoSize; import androidx.media3.common.text.CueGroup; import androidx.media3.common.util.ConditionVariable; import androidx.media3.common.util.Size; -import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.Util; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -56,7 +55,6 @@ import java.util.List; import java.util.concurrent.TimeoutException; /** A mock implementation of {@link Player} for testing. */ -@UnstableApi public class MockPlayer implements Player { /** Player methods. */ diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/MultiplePeriodsPerWindowTimeline.java b/libraries/test_session_current/src/main/java/androidx/media3/session/MultiplePeriodsPerWindowTimeline.java index 7040aee42d..b9cd828bc2 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/MultiplePeriodsPerWindowTimeline.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/MultiplePeriodsPerWindowTimeline.java @@ -19,12 +19,10 @@ import static androidx.media3.common.util.Assertions.checkArgument; import androidx.media3.common.C; import androidx.media3.common.MediaItem; -import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.Util; import java.util.List; /** A {@link PlaylistTimeline} implementation that allows setting multiple periods per window. */ -@UnstableApi public class MultiplePeriodsPerWindowTimeline extends PlaylistTimeline { private final int[] periodSizesPerWindow; diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/PlaylistTimeline.java b/libraries/test_session_current/src/main/java/androidx/media3/session/PlaylistTimeline.java index 1ca4a5fc40..c78d6cc46a 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/PlaylistTimeline.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/PlaylistTimeline.java @@ -21,14 +21,12 @@ import androidx.media3.common.C; import androidx.media3.common.MediaItem; import androidx.media3.common.Player; import androidx.media3.common.Timeline; -import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.Util; import com.google.common.collect.ImmutableList; import java.util.Arrays; import java.util.List; /** A {@link Timeline} implementation for testing session/controller(s). */ -@UnstableApi public class PlaylistTimeline extends Timeline { private static final long DEFAULT_DURATION_MS = 100; diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaBrowser.java b/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaBrowser.java index 2024c90a6a..ec1e277737 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaBrowser.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaBrowser.java @@ -20,7 +20,6 @@ import android.os.Bundle; import android.os.RemoteException; import androidx.annotation.Nullable; import androidx.media3.common.MediaItem; -import androidx.media3.common.util.UnstableApi; import androidx.media3.session.MediaLibraryService.LibraryParams; import com.google.common.collect.ImmutableList; @@ -28,7 +27,6 @@ import com.google.common.collect.ImmutableList; * Represents remote {@link MediaBrowser} the client app's MediaControllerService. Users can run * {@link MediaBrowser} methods remotely with this object. */ -@UnstableApi public class RemoteMediaBrowser extends RemoteMediaController { /** diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaBrowserCompat.java b/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaBrowserCompat.java index d309a967fb..8ea0eb4cdf 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaBrowserCompat.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaBrowserCompat.java @@ -30,7 +30,6 @@ import android.os.IBinder; import android.os.RemoteException; import android.support.v4.media.MediaBrowserCompat; import androidx.media3.common.util.Log; -import androidx.media3.common.util.UnstableApi; import androidx.media3.test.session.common.IRemoteMediaBrowserCompat; import java.util.UUID; import java.util.concurrent.CountDownLatch; @@ -39,7 +38,6 @@ import java.util.concurrent.CountDownLatch; * Represents remote {@link MediaBrowserCompat} the client app's MediaBrowserCompatProviderService. * Users can run {@link MediaBrowserCompat} methods remotely with this object. */ -@UnstableApi public class RemoteMediaBrowserCompat { private static final String TAG = "RMediaBrowserCompat"; diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaBrowserServiceCompat.java b/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaBrowserServiceCompat.java index 6250db07a3..b60dcdf553 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaBrowserServiceCompat.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaBrowserServiceCompat.java @@ -25,13 +25,11 @@ import android.content.Intent; import android.content.ServiceConnection; import android.os.IBinder; import android.os.RemoteException; -import androidx.media3.common.util.UnstableApi; import androidx.media3.test.session.common.IRemoteMediaBrowserServiceCompat; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicReference; /** A client to control service app's MockMediaBrowserServiceCompat remotely. */ -@UnstableApi public class RemoteMediaBrowserServiceCompat { private final Context context; diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaController.java b/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaController.java index bf354f1f8d..0d8c990016 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaController.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaController.java @@ -37,7 +37,6 @@ import androidx.media3.common.Rating; import androidx.media3.common.TrackSelectionParameters; import androidx.media3.common.util.BundleableUtil; import androidx.media3.common.util.Log; -import androidx.media3.common.util.UnstableApi; import androidx.media3.test.session.common.IRemoteMediaController; import androidx.media3.test.session.common.TestUtils; import java.util.List; @@ -48,7 +47,6 @@ import java.util.concurrent.CountDownLatch; * Represents remote {@link MediaController} the client app's MediaControllerProviderService. Users * can run {@link MediaController} methods remotely with this object. */ -@UnstableApi public class RemoteMediaController { static final String TAG = "RemoteMediaController"; diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaControllerCompat.java b/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaControllerCompat.java index 9d496bf30e..e44a35dd49 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaControllerCompat.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaControllerCompat.java @@ -38,7 +38,6 @@ import android.support.v4.media.session.MediaControllerCompat; import android.support.v4.media.session.MediaSessionCompat; import android.support.v4.media.session.PlaybackStateCompat; import androidx.media3.common.util.Log; -import androidx.media3.common.util.UnstableApi; import androidx.media3.test.session.common.IRemoteMediaControllerCompat; import java.util.UUID; import java.util.concurrent.CountDownLatch; @@ -49,7 +48,6 @@ import java.util.concurrent.CountDownLatch; * *

Users can run {@link MediaControllerCompat} methods remotely with this object. */ -@UnstableApi public class RemoteMediaControllerCompat { static final String TAG = "RMediaControllerCompat"; diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaSession.java b/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaSession.java index ca2840480d..68937d0dd2 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaSession.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaSession.java @@ -81,7 +81,6 @@ import androidx.media3.common.Tracks; import androidx.media3.common.VideoSize; import androidx.media3.common.text.CueGroup; import androidx.media3.common.util.Log; -import androidx.media3.common.util.UnstableApi; import androidx.media3.test.session.common.IRemoteMediaSession; import androidx.media3.test.session.common.TestUtils; import com.google.errorprone.annotations.CanIgnoreReturnValue; @@ -93,7 +92,6 @@ import java.util.concurrent.CountDownLatch; * Represents remote {@link MediaSession} in the service app's MediaSessionProviderService. Users * can run {@link MediaSession} methods remotely with this object. */ -@UnstableApi public class RemoteMediaSession { private static final String TAG = "RemoteMediaSession"; diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaSessionCompat.java b/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaSessionCompat.java index 887d939728..870fd32b0c 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaSessionCompat.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaSessionCompat.java @@ -40,7 +40,6 @@ import android.support.v4.media.session.MediaSessionCompat.QueueItem; import android.support.v4.media.session.PlaybackStateCompat; import androidx.annotation.Nullable; import androidx.media3.common.util.Log; -import androidx.media3.common.util.UnstableApi; import androidx.media3.test.session.common.IRemoteMediaSessionCompat; import java.util.ArrayList; import java.util.List; @@ -51,7 +50,6 @@ import java.util.concurrent.CountDownLatch; * MediaSessionCompatProviderService. Users can run {@link MediaSessionCompat} methods remotely with * this object. */ -@UnstableApi public class RemoteMediaSessionCompat { private static final String TAG = "RMediaSessionCompat"; diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/TestMediaBrowserListener.java b/libraries/test_session_current/src/main/java/androidx/media3/session/TestMediaBrowserListener.java index 7b76cb7366..96d53ac5c0 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/TestMediaBrowserListener.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/TestMediaBrowserListener.java @@ -18,12 +18,10 @@ package androidx.media3.session; import android.os.Bundle; import androidx.annotation.GuardedBy; import androidx.annotation.Nullable; -import androidx.media3.common.util.UnstableApi; import com.google.common.util.concurrent.ListenableFuture; import java.util.List; /** A proxy class for {@link MediaBrowser.Listener}. */ -@UnstableApi public final class TestMediaBrowserListener implements MediaBrowser.Listener { private final MediaController.Listener delegate; diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/TestServiceRegistry.java b/libraries/test_session_current/src/main/java/androidx/media3/session/TestServiceRegistry.java index 438bd68721..1d1d0620c0 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/TestServiceRegistry.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/TestServiceRegistry.java @@ -19,7 +19,6 @@ import static com.google.common.truth.Truth.assertWithMessage; import androidx.annotation.GuardedBy; import androidx.annotation.Nullable; -import androidx.media3.common.util.UnstableApi; import androidx.media3.session.MediaLibraryService.MediaLibrarySession; import androidx.media3.session.MediaSession.ControllerInfo; import java.util.List; @@ -30,7 +29,6 @@ import java.util.List; * *

It only support only one service at a time. */ -@UnstableApi public class TestServiceRegistry { @GuardedBy("TestServiceRegistry.class")