Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Ensure that framework does not refer MediaSession2 related code"

Browse Source 
This reverts commit 14ca142e65.

Reason for revert: Now the circular dependency problem is resolved, the change is now obsolete.

Bug: 123495968
Change-Id: I5992f9dd205654ce70143773f9ab9bdcafee9ace
This commit is contained in:
Hyundo Moon
2019-01-31 02:39:24 +00:00
parent 76f9a93213
commit 9f914c9bb7
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -26006,7 +26006,6 @@ package android.media {
method @NonNull public abstract android.media.MediaSession2 onGetPrimarySession();
method @Nullable public abstract android.media.MediaSession2Service.MediaNotification onUpdateNotification(@NonNull android.media.MediaSession2);
method public final void removeSession(@NonNull android.media.MediaSession2);
field public static final String SERVICE_INTERFACE = "android.media.MediaSession2Service";
}
public static class MediaSession2Service.MediaNotification {

8
media/apex/java/android/media/MediaSession2Service.java
View File

@@ -16,6 +16,8 @@
package android.media;
import static android.media.Session2Token.SESSION_SERVICE_INTERFACE;
import android.annotation.CallSuper;
import android.annotation.NonNull;
import android.annotation.Nullable;
@@ -45,10 +47,6 @@ import java.util.Map;
* for consistent behavior across all devices.
*/
public abstract class MediaSession2Service extends Service {
/**
* The {@link Intent} that must be declared as handled by the service.
*/
public static final String SERVICE_INTERFACE = Session2Token.SESSION_SERVICE_INTERFACE;
private static final String TAG = "MediaSession2Service";
private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
@@ -100,7 +98,7 @@ public abstract class MediaSession2Service extends Service {
@Override
@Nullable
public IBinder onBind(@NonNull Intent intent) {
if (SERVICE_INTERFACE.equals(intent.getAction())) {
if (SESSION_SERVICE_INTERFACE.equals(intent.getAction())) {
synchronized (mLock) {
return mStub;
}