Make MediaSessionToken an inner class of MediaSession.
Also add some missing AIDLs to the framework makefile to ensure
they are included in the SDK.
Change-Id: If85a3091c7591e0b3bbe6cc4bb74aba2284b4f42
diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java
index fe68a86..5738a05 100644
--- a/services/core/java/com/android/server/media/MediaSessionService.java
+++ b/services/core/java/com/android/server/media/MediaSessionService.java
@@ -34,10 +34,9 @@
import android.media.session.ISession;
import android.media.session.ISessionCallback;
import android.media.session.ISessionManager;
-import android.media.session.MediaSessionToken;
+import android.media.session.MediaSession;
import android.media.session.RouteInfo;
import android.media.session.RouteOptions;
-import android.media.session.MediaSession;
import android.os.Binder;
import android.os.Bundle;
import android.os.Handler;
@@ -511,9 +510,9 @@
if (size > 0) {
persistMediaButtonReceiverLocked(records.get(0));
}
- ArrayList<MediaSessionToken> tokens = new ArrayList<MediaSessionToken>();
+ ArrayList<MediaSession.Token> tokens = new ArrayList<MediaSession.Token>();
for (int i = 0; i < size; i++) {
- tokens.add(new MediaSessionToken(records.get(i).getControllerBinder()));
+ tokens.add(new MediaSession.Token(records.get(i).getControllerBinder()));
}
pushRemoteVolumeUpdateLocked(userId);
for (int i = mSessionsListeners.size() - 1; i >= 0; i--) {