From 8681109d1f5b9bd3b70a86ca43efa8feb5e84747 Mon Sep 17 00:00:00 2001 From: bachinger Date: Thu, 17 Oct 2024 03:41:13 -0700 Subject: [PATCH] Use SessionError error codes to make lint happy #cherrypick PiperOrigin-RevId: 686849343 --- .../androidx/media3/session/MediaSessionProviderService.java | 4 ++-- .../java/androidx/media3/session/MockMediaLibraryService.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 03c0e6e898..2f94eb394b 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 @@ -278,12 +278,12 @@ public class MediaSessionProviderService extends Service { SessionCommand customCommand, Bundle args) { SessionResult sessionResult = - new SessionResult(SessionResult.RESULT_ERROR_NOT_SUPPORTED); + new SessionResult(SessionError.ERROR_NOT_SUPPORTED); if (customCommand.equals(playlistAddButton.sessionCommand) || customCommand.equals(radioButton.sessionCommand)) { Bundle extras = new Bundle(); String receivedMediaId = args.getString(MediaConstants.EXTRA_KEY_MEDIA_ID); - @SessionResult.Code int resultCode = SessionResult.RESULT_ERROR_BAD_VALUE; + @SessionResult.Code int resultCode = SessionError.ERROR_BAD_VALUE; if (receivedMediaId != null) { extras.putString(MediaConstants.EXTRA_KEY_MEDIA_ID, receivedMediaId); resultCode = SessionResult.RESULT_SUCCESS; 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 9db26df33a..7849b95784 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 @@ -412,7 +412,7 @@ public class MockMediaLibraryService extends MediaLibraryService { getPaginatedResult(GET_CHILDREN_RESULT, page, pageSize), params)) : Futures.immediateFuture( LibraryResult.ofError( - LibraryResult.RESULT_ERROR_SESSION_AUTHENTICATION_EXPIRED, + SessionError.ERROR_SESSION_AUTHENTICATION_EXPIRED, new LibraryParams.Builder().build())); } else if (Objects.equals(parentId, PARENT_ID_AUTH_EXPIRED_ERROR) || Objects.equals(parentId, PARENT_ID_AUTH_EXPIRED_ERROR_DEPRECATED)