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

Merge "Rename MediaSession2/MediaController2 methods" into qt-dev

Browse Source
This commit is contained in:
Jin Seok Park
2019-04-19 03:16:11 +00:00
committed by Android (Google) Code Review
parent 733379cc3a 6371ac33dd
commit 1c41060583
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/current.txt
View File

@@ -24656,7 +24656,7 @@ package android.media {
public class MediaController2 implements java.lang.AutoCloseable { public class MediaController2 implements java.lang.AutoCloseable {
method public void cancelSessionCommand(@NonNull Object); method public void cancelSessionCommand(@NonNull Object);
method public void close(); method public void close();
method @Nullable public android.media.Session2Token getConnectedSessionToken(); method @Nullable public android.media.Session2Token getConnectedToken();
method public boolean isPlaybackActive(); method public boolean isPlaybackActive();
method @NonNull public Object sendSessionCommand(@NonNull android.media.Session2Command, @Nullable android.os.Bundle); method @NonNull public Object sendSessionCommand(@NonNull android.media.Session2Command, @Nullable android.os.Bundle);
} }
@@ -25821,8 +25821,8 @@ package android.media {
method public void cancelSessionCommand(@NonNull android.media.MediaSession2.ControllerInfo, @NonNull Object); method public void cancelSessionCommand(@NonNull android.media.MediaSession2.ControllerInfo, @NonNull Object);
method public void close(); method public void close();
method @NonNull public java.util.List<android.media.MediaSession2.ControllerInfo> getConnectedControllers(); method @NonNull public java.util.List<android.media.MediaSession2.ControllerInfo> getConnectedControllers();
method @NonNull public String getSessionId(); method @NonNull public String getId();
method @NonNull public android.media.Session2Token getSessionToken(); method @NonNull public android.media.Session2Token getToken();
method public boolean isPlaybackActive(); method public boolean isPlaybackActive();
method @NonNull public Object sendSessionCommand(@NonNull android.media.MediaSession2.ControllerInfo, @NonNull android.media.Session2Command, @Nullable android.os.Bundle); method @NonNull public Object sendSessionCommand(@NonNull android.media.MediaSession2.ControllerInfo, @NonNull android.media.Session2Command, @Nullable android.os.Bundle);
method public void setPlaybackActive(boolean); method public void setPlaybackActive(boolean);

2
media/apex/java/android/media/MediaController2.java
View File

@@ -175,7 +175,7 @@ public class MediaController2 implements AutoCloseable {
* @return Session2Token of the connected session, or {@code null} if not connected * @return Session2Token of the connected session, or {@code null} if not connected
*/ */
@Nullable @Nullable
public Session2Token getConnectedSessionToken() { public Session2Token getConnectedToken() {
synchronized (mLock) { synchronized (mLock) {
return mConnectedToken; return mConnectedToken;
} }

6
media/apex/java/android/media/MediaSession2.java
View File

@@ -153,7 +153,7 @@ public class MediaSession2 implements AutoCloseable {
* Returns the session ID * Returns the session ID
*/ */
@NonNull @NonNull
public String getSessionId() { public String getId() {
return mSessionId; return mSessionId;
} }
@@ -161,7 +161,7 @@ public class MediaSession2 implements AutoCloseable {
* Returns the {@link Session2Token} for creating {@link MediaController2}. * Returns the {@link Session2Token} for creating {@link MediaController2}.
*/ */
@NonNull @NonNull
public Session2Token getSessionToken() { public Session2Token getToken() {
return mSessionToken; return mSessionToken;
} }
@@ -553,7 +553,7 @@ public class MediaSession2 implements AutoCloseable {
try { try {
MediaSessionManager manager = (MediaSessionManager) mContext.getSystemService( MediaSessionManager manager = (MediaSessionManager) mContext.getSystemService(
Context.MEDIA_SESSION_SERVICE); Context.MEDIA_SESSION_SERVICE);
manager.notifySession2Created(session2.getSessionToken()); manager.notifySession2Created(session2.getToken());
} catch (Exception e) { } catch (Exception e) {
session2.close(); session2.close();
throw e; throw e;

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

@@ -195,15 +195,15 @@ public abstract class MediaSession2Service extends Service {
throw new IllegalArgumentException("session is already closed"); throw new IllegalArgumentException("session is already closed");
} }
synchronized (mLock) { synchronized (mLock) {
MediaSession2 previousSession = mSessions.get(session.getSessionId()); MediaSession2 previousSession = mSessions.get(session.getId());
if (previousSession != null) { if (previousSession != null) {
if (previousSession != session) { if (previousSession != session) {
Log.w(TAG, "Session ID should be unique, ID=" + session.getSessionId() Log.w(TAG, "Session ID should be unique, ID=" + session.getId()
+ ", previous=" + previousSession + ", session=" + session); + ", previous=" + previousSession + ", session=" + session);
} }
return; return;
} }
mSessions.put(session.getSessionId(), session); mSessions.put(session.getId(), session);
session.setForegroundServiceEventCallback(mForegroundServiceEventCallback); session.setForegroundServiceEventCallback(mForegroundServiceEventCallback);
} }
} }
@@ -220,11 +220,11 @@ public abstract class MediaSession2Service extends Service {
} }
MediaNotification notification; MediaNotification notification;
synchronized (mLock) { synchronized (mLock) {
if (mSessions.get(session.getSessionId()) != session) { if (mSessions.get(session.getId()) != session) {
// Session isn't added or removed already. // Session isn't added or removed already.
return; return;
} }
mSessions.remove(session.getSessionId()); mSessions.remove(session.getId());
notification = mNotifications.remove(session); notification = mNotifications.remove(session);
} }
session.setForegroundServiceEventCallback(null); session.setForegroundServiceEventCallback(null);