From 3a2e0d37177034b3012204ac16cf7b3d4e3436b9 Mon Sep 17 00:00:00 2001 From: Googler Date: Mon, 5 Sep 2022 12:19:14 +0000 Subject: [PATCH] Fix 4 ErrorProneStyle findings: * Non-standard parameter comment; prefer `/* paramName= */ arg` (see http://go/bugpattern/ParameterComment) (2 times) * This catch block catches an exception and re-throws another, but swallows the caught exception rather than setting it as a cause. This can make debugging harder. (see http://go/bugpattern/UnusedException) * This comment contains Javadoc or HTML tags, but isn't started with a double asterisk (/**); is it meant to be Javadoc? (see http://go/bugpattern/AlmostJavadoc) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This CL looks good? Just LGTM and Approve it! This CL doesn’t look good? This is what you can do: * Revert this CL, by replying "REVERT: " * File a bug under go/error-prone-bug for category ErrorProneStyle if there's an issue with the CL content. * File a bug under go/rosie-bug if there's an issue with how the CL was managed. * Revert this CL and not get a CL that cleans up these paths in the future by replying "BLOCKLIST: ". This is not reversible! We recommend to opt out the respective paths in your CL Robot configuration instead: go/clrobot-opt-out. This CL was generated by CL Robot - a tool that cleans up code findings (go/clrobot). The affected code paths have been enabled for CL Robot in //depot/google3/java/com/google/android/libraries/media/METADATA which is reachable following include_presubmits from //depot/google3/third_party/java_src/android_libs/media/METADATA. Anything wrong with the signup? File a bug at go/clrobot-bug. #codehealth Tested: Local presubmit tests passed. PiperOrigin-RevId: 472255768 --- .../java/androidx/media3/session/MediaControllerImplBase.java | 2 +- .../main/java/androidx/media3/session/MediaControllerStub.java | 2 +- .../src/main/java/androidx/media3/session/MediaUtils.java | 2 +- .../src/main/java/androidx/media3/session/SessionToken.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplBase.java b/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplBase.java index 1484843bc0..194d8f1fbc 100644 --- a/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplBase.java +++ b/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplBase.java @@ -1261,7 +1261,7 @@ import org.checkerframework.checker.nullness.qual.NonNull; /* ignored */ PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST, /* positionDiscontinuity= */ currentItemRemoved, DISCONTINUITY_REASON_REMOVE, - /* mediaItemTransition*/ playerInfo.sessionPositionInfo.positionInfo.mediaItemIndex + /* mediaItemTransition= */ playerInfo.sessionPositionInfo.positionInfo.mediaItemIndex >= fromIndex && playerInfo.sessionPositionInfo.positionInfo.mediaItemIndex < clippedToIndex, MEDIA_ITEM_TRANSITION_REASON_PLAYLIST_CHANGED); diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaControllerStub.java b/libraries/session/src/main/java/androidx/media3/session/MediaControllerStub.java index f4edcc8ec4..ad76da2e6e 100644 --- a/libraries/session/src/main/java/androidx/media3/session/MediaControllerStub.java +++ b/libraries/session/src/main/java/androidx/media3/session/MediaControllerStub.java @@ -183,7 +183,7 @@ import org.checkerframework.checker.nullness.qual.NonNull; controller -> controller.onPlayerInfoChanged( playerInfo, - /* timelineChangedReason */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE, + /* timelineChangedReason= */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE, isTimelineExcluded)); } diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaUtils.java b/libraries/session/src/main/java/androidx/media3/session/MediaUtils.java index d85bc1194b..644e625554 100644 --- a/libraries/session/src/main/java/androidx/media3/session/MediaUtils.java +++ b/libraries/session/src/main/java/androidx/media3/session/MediaUtils.java @@ -320,7 +320,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType; return result; } - /* Converts a {@link MediaItem} to a {@link MediaDescriptionCompat}. */ + /** Converts a {@link MediaItem} to a {@link MediaDescriptionCompat}. */ public static MediaDescriptionCompat convertToMediaDescriptionCompat(MediaItem item) { MediaDescriptionCompat.Builder builder = new MediaDescriptionCompat.Builder() diff --git a/libraries/session/src/main/java/androidx/media3/session/SessionToken.java b/libraries/session/src/main/java/androidx/media3/session/SessionToken.java index ff8167ce1e..e3a087f776 100644 --- a/libraries/session/src/main/java/androidx/media3/session/SessionToken.java +++ b/libraries/session/src/main/java/androidx/media3/session/SessionToken.java @@ -399,7 +399,7 @@ public final class SessionToken implements Bundleable { try { return manager.getApplicationInfo(packageName, 0).uid; } catch (PackageManager.NameNotFoundException e) { - throw new IllegalArgumentException("Cannot find package " + packageName); + throw new IllegalArgumentException("Cannot find package " + packageName, e); } }