From 10fa755dad7168ec3ea8a4069bd4ee8b853cbb4f Mon Sep 17 00:00:00 2001 From: gsanmartin Date: Wed, 3 Dec 2025 14:51:31 +0100 Subject: [PATCH 1/2] Removes @Nullable from Intent parameter on MediaButtonReceiver.onReceive() --- .../java/androidx/media3/session/MediaButtonReceiver.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaButtonReceiver.java b/libraries/session/src/main/java/androidx/media3/session/MediaButtonReceiver.java index ded7237c780..ec8f5a98b89 100644 --- a/libraries/session/src/main/java/androidx/media3/session/MediaButtonReceiver.java +++ b/libraries/session/src/main/java/androidx/media3/session/MediaButtonReceiver.java @@ -123,7 +123,7 @@ 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) { handleIntentAndMaybeStartTheService(context, intent); } @@ -136,9 +136,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; From 83d2e1f918a8d790b506619d80496e1d51abb02b Mon Sep 17 00:00:00 2001 From: gsanmartin Date: Wed, 3 Dec 2025 16:18:14 +0100 Subject: [PATCH 2/2] Added checkNotNull --- .../main/java/androidx/media3/session/MediaButtonReceiver.java | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaButtonReceiver.java b/libraries/session/src/main/java/androidx/media3/session/MediaButtonReceiver.java index ec8f5a98b89..136bdf13a19 100644 --- a/libraries/session/src/main/java/androidx/media3/session/MediaButtonReceiver.java +++ b/libraries/session/src/main/java/androidx/media3/session/MediaButtonReceiver.java @@ -124,6 +124,7 @@ public class MediaButtonReceiver extends BroadcastReceiver { */ @Override public void onReceive(Context context, Intent intent) { + checkNotNull(intent); handleIntentAndMaybeStartTheService(context, intent); }