baalajimaestro/NewPipe
1
0
Fork 0
Code Issues Pull requests Projects Releases 7 Packages Wiki Activity

Rebase onto the latest dev, update appcompat dependencies to use androidx

Browse source
This commit is contained in:
k1rakishou 2019-11-08 20:47:42 +03:00
parent 52f82ed228
commit cf13f5ca56
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java
View file

@ -5,15 +5,16 @@ import android.content.Intent;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.media.MediaMetadata; import android.media.MediaMetadata;
import android.os.Build; import android.os.Build;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.RequiresApi;
import android.support.v4.app.NotificationCompat;
import android.support.v4.media.MediaMetadataCompat; import android.support.v4.media.MediaMetadataCompat;
import android.support.v4.media.session.MediaButtonReceiver;
import android.support.v4.media.session.MediaSessionCompat; import android.support.v4.media.session.MediaSessionCompat;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.support.v4.media.app.NotificationCompat.MediaStyle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.core.app.NotificationCompat;
import androidx.media.session.MediaButtonReceiver;
import androidx.media.app.NotificationCompat.MediaStyle;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector; import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector;
@ -25,8 +26,10 @@ import org.schabi.newpipe.player.mediasession.PlayQueuePlaybackController;
public class MediaSessionManager { public class MediaSessionManager {
private static final String TAG = "MediaSessionManager"; private static final String TAG = "MediaSessionManager";
@NonNull private final MediaSessionCompat mediaSession; @NonNull
@NonNull private final MediaSessionConnector sessionConnector; private final MediaSessionCompat mediaSession;
@NonNull
private final MediaSessionConnector sessionConnector;
public MediaSessionManager(@NonNull final Context context, public MediaSessionManager(@NonNull final Context context,
@NonNull final Player player, @NonNull final Player player,
@ -72,7 +75,7 @@ public class MediaSessionManager {
} }
/** /**
* Should be called on player destruction to prevent leakage. * Should be called on player destruction to prevent leakage.BitmapUtils
*/ */
public void dispose() { public void dispose() {
this.sessionConnector.setPlayer(null); this.sessionConnector.setPlayer(null);

3
app/src/main/java/org/schabi/newpipe/util/BitmapUtils.java
View file

@ -1,7 +1,8 @@
package org.schabi.newpipe.util; package org.schabi.newpipe.util;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
public class BitmapUtils { public class BitmapUtils {