summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/session/IActiveSessionsListener.aidl6
-rw-r--r--media/java/android/media/session/MediaController.java4
-rw-r--r--media/java/android/media/session/MediaSession.aidl (renamed from media/java/android/media/session/MediaSessionToken.aidl)2
-rw-r--r--media/java/android/media/session/MediaSession.java51
-rw-r--r--media/java/android/media/session/MediaSessionManager.java2
-rw-r--r--media/java/android/media/session/MediaSessionToken.java71
6 files changed, 55 insertions, 81 deletions
diff --git a/media/java/android/media/session/IActiveSessionsListener.aidl b/media/java/android/media/session/IActiveSessionsListener.aidl
index e5e24bc..4b9e4bd 100644
--- a/media/java/android/media/session/IActiveSessionsListener.aidl
+++ b/media/java/android/media/session/IActiveSessionsListener.aidl
@@ -15,12 +15,12 @@
package android.media.session;
-import android.media.session.MediaSessionToken;
+import android.media.session.MediaSession;
/**
* Listens for changes to the list of active sessions.
* @hide
*/
oneway interface IActiveSessionsListener {
- void onActiveSessionsChanged(in List<MediaSessionToken> sessions);
-} \ No newline at end of file
+ void onActiveSessionsChanged(in List<MediaSession.Token> sessions);
+}
diff --git a/media/java/android/media/session/MediaController.java b/media/java/android/media/session/MediaController.java
index 7653e5a..edb69bc 100644
--- a/media/java/android/media/session/MediaController.java
+++ b/media/java/android/media/session/MediaController.java
@@ -42,7 +42,7 @@ import java.util.ArrayList;
* <p>
* A MediaController can be created through {@link MediaSessionManager} if you
* hold the "android.permission.MEDIA_CONTENT_CONTROL" permission or directly if
- * you have a {@link MediaSessionToken} from the session owner.
+ * you have a {@link MediaSession.Token} from the session owner.
* <p>
* MediaController objects are thread-safe.
*/
@@ -86,7 +86,7 @@ public final class MediaController {
* @param token The session token to control.
* @return A controller for the session or null if inaccessible.
*/
- public static MediaController fromToken(@NonNull MediaSessionToken token) {
+ public static MediaController fromToken(@NonNull MediaSession.Token token) {
return fromBinder(token.getBinder());
}
diff --git a/media/java/android/media/session/MediaSessionToken.aidl b/media/java/android/media/session/MediaSession.aidl
index 5812682..4a7efc2 100644
--- a/media/java/android/media/session/MediaSessionToken.aidl
+++ b/media/java/android/media/session/MediaSession.aidl
@@ -15,4 +15,4 @@
package android.media.session;
-parcelable MediaSessionToken;
+parcelable MediaSession.Token;
diff --git a/media/java/android/media/session/MediaSession.java b/media/java/android/media/session/MediaSession.java
index 7637ec8..dbe13dd 100644
--- a/media/java/android/media/session/MediaSession.java
+++ b/media/java/android/media/session/MediaSession.java
@@ -32,6 +32,8 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
+import android.os.Parcel;
+import android.os.Parcelable;
import android.os.RemoteException;
import android.os.ResultReceiver;
import android.text.TextUtils;
@@ -136,7 +138,7 @@ public final class MediaSession {
private final Object mLock = new Object();
- private final MediaSessionToken mSessionToken;
+ private final MediaSession.Token mSessionToken;
private final ISession mBinder;
private final CallbackStub mCbStub;
@@ -165,7 +167,7 @@ public final class MediaSession {
} catch (RemoteException e) {
throw new RuntimeException("Dead object in MediaSessionController constructor: ", e);
}
- mSessionToken = new MediaSessionToken(controllerBinder);
+ mSessionToken = new Token(controllerBinder);
}
/**
@@ -370,7 +372,7 @@ public final class MediaSession {
* @return A token that can be used to create a MediaController for this
* session
*/
- public @NonNull MediaSessionToken getSessionToken() {
+ public @NonNull Token getSessionToken() {
return mSessionToken;
}
@@ -697,6 +699,49 @@ public final class MediaSession {
}
/**
+ * Represents an ongoing session. This may be passed to apps by the session
+ * owner to allow them to create a {@link MediaController} to communicate with
+ * the session.
+ */
+ public static final class Token implements Parcelable {
+ private ISessionController mBinder;
+
+ /**
+ * @hide
+ */
+ public Token(ISessionController binder) {
+ mBinder = binder;
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeStrongBinder(mBinder.asBinder());
+ }
+
+ ISessionController getBinder() {
+ return mBinder;
+ }
+
+ public static final Parcelable.Creator<Token> CREATOR
+ = new Parcelable.Creator<Token>() {
+ @Override
+ public Token createFromParcel(Parcel in) {
+ return new Token(ISessionController.Stub.asInterface(in.readStrongBinder()));
+ }
+
+ @Override
+ public Token[] newArray(int size) {
+ return new Token[size];
+ }
+ };
+ }
+
+ /**
* Receives generic commands or updates from controllers and the system.
* Callbacks may be registered using {@link #addCallback}.
*/
diff --git a/media/java/android/media/session/MediaSessionManager.java b/media/java/android/media/session/MediaSessionManager.java
index 9291bb0..c73a8d3 100644
--- a/media/java/android/media/session/MediaSessionManager.java
+++ b/media/java/android/media/session/MediaSessionManager.java
@@ -292,7 +292,7 @@ public final class MediaSessionManager {
private final IActiveSessionsListener.Stub mStub = new IActiveSessionsListener.Stub() {
@Override
- public void onActiveSessionsChanged(List<MediaSessionToken> tokens)
+ public void onActiveSessionsChanged(List<MediaSession.Token> tokens)
throws RemoteException {
ArrayList<MediaController> controllers = new ArrayList<MediaController>();
int size = tokens.size();
diff --git a/media/java/android/media/session/MediaSessionToken.java b/media/java/android/media/session/MediaSessionToken.java
deleted file mode 100644
index e599189..0000000
--- a/media/java/android/media/session/MediaSessionToken.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.media.session;
-
-import android.media.session.ISessionController;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-/**
- * Represents an ongoing session. This may be passed to apps by the session
- * owner to allow them to create a {@link MediaController} to communicate with
- * the session.
- */
-public final class MediaSessionToken implements Parcelable {
- private ISessionController mBinder;
-
- /**
- * @hide
- */
- public MediaSessionToken(ISessionController binder) {
- mBinder = binder;
- }
-
- private MediaSessionToken(Parcel in) {
- mBinder = ISessionController.Stub.asInterface(in.readStrongBinder());
- }
-
- /**
- * @hide
- */
- ISessionController getBinder() {
- return mBinder;
- }
-
- @Override
- public int describeContents() {
- return 0;
- }
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- dest.writeStrongBinder(mBinder.asBinder());
- }
-
- public static final Parcelable.Creator<MediaSessionToken> CREATOR
- = new Parcelable.Creator<MediaSessionToken>() {
- @Override
- public MediaSessionToken createFromParcel(Parcel in) {
- return new MediaSessionToken(in);
- }
-
- @Override
- public MediaSessionToken[] newArray(int size) {
- return new MediaSessionToken[size];
- }
- };
-}
generated by cgit v1.1 at 2025-08-04 19:21:34 +0000