1
0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2025-12-04 07:28:05 +00:00

Merge pull request #11261 from Stypox/fix-media-session-ui-npe

Fix crash in MediaSessionPlayerUi while destroying player
This commit is contained in:
Stypox
2024-07-11 23:17:43 +02:00
committed by GitHub

View File

@@ -38,7 +38,9 @@ public class MediaSessionPlayerUi extends PlayerUi
implements SharedPreferences.OnSharedPreferenceChangeListener {
private static final String TAG = "MediaSessUi";
@Nullable
private MediaSessionCompat mediaSession;
@Nullable
private MediaSessionConnector sessionConnector;
private final String ignoreHardwareMediaButtonsKey;
@@ -198,6 +200,11 @@ public class MediaSessionPlayerUi extends PlayerUi
return;
}
if (sessionConnector == null) {
// sessionConnector will be null after destroyPlayer is called
return;
}
// only use the fourth and fifth actions (the settings page also shows only the last 2 on
// Android 13+)
final List<NotificationActionData> newNotificationActions = IntStream.of(3, 4)