Skip to content

Remove @Nullable from MediaButtonReceiver.onReceive() #2926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kelmer44 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Remove @Nullable from MediaButtonReceiver.onReceive() #2926

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10fa755
Removes @Nullable from Intent parameter on MediaButtonReceiver.onRece…
kelmer44 Dec 3, 2025
83d2e1f
Added checkNotNull
kelmer44 Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions libraries/session/src/main/java/androidx/media3/session/MediaButtonReceiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ public class MediaButtonReceiver extends BroadcastReceiver {
* strongly recommended way to handle the intent is using the default implementation.
*/
@Override
public void onReceive(Context context, @Nullable Intent intent) {
public void onReceive(Context context, Intent intent) {
Copy link
Contributor

@marcbaechinger marcbaechinger Dec 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I can tell, if there is no @nullable or @NotNull annotation on Android framework code, then there is no nullability information available and we can't assume this is non-null.

Agreed the doc is clear about it and we can't do something sensible without an Intent. Mind adding checkNotNull(intent) when passing it further down. Sorry for being overly picky, I see we would have a NPE right after but I think I'd prefer this being consistently where we get the garbage input. Shouldn't hurt as we agree this doesn't happen.

Copy link
Author

@kelmer44 kelmer44 Dec 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

checkNotNull(intent);
handleIntentAndMaybeStartTheService(context, intent);
}

Expand All @@ -136,9 +137,8 @@ public void onReceive(Context context, @Nullable Intent intent) {
*/
@UnstableApi
protected final void handleIntentAndMaybeStartTheService(
Context context, @Nullable Intent intent) {
if (intent == null
|| !Objects.equals(intent.getAction(), Intent.ACTION_MEDIA_BUTTON)
Context context, Intent intent) {
if (!Objects.equals(intent.getAction(), Intent.ACTION_MEDIA_BUTTON)
|| !intent.hasExtra(Intent.EXTRA_KEY_EVENT)) {
Log.d(TAG, "Ignore unsupported intent: " + intent);
return;
Expand Down