Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f5b057d authored by RoboErik's avatar RoboErik
Browse files

Move Session apis to android.media.session 

This is to make it easier to distinguish the new apis from the old
ones.

Change-Id: Ic5eaf65e8bd054a844f87b9118c4bb18f30ac8a7
parent 50392322

Android.mk

+5 −5
Original line number Diff line number Diff line
@@ -261,23 +261,23 @@ LOCAL_SRC_FILES += \ 
	media/java/android/media/IAudioService.aidl \

	media/java/android/media/IAudioFocusDispatcher.aidl \

	media/java/android/media/IAudioRoutesObserver.aidl \

	media/java/android/media/IMediaController.aidl \

	media/java/android/media/IMediaControllerCallback.aidl \

	media/java/android/media/IMediaHTTPConnection.aidl \

	media/java/android/media/IMediaHTTPService.aidl \

	media/java/android/media/IMediaRouterClient.aidl \

	media/java/android/media/IMediaRouterService.aidl \

	media/java/android/media/IMediaScannerListener.aidl \

	media/java/android/media/IMediaScannerService.aidl \

	media/java/android/media/IMediaSession.aidl \

	media/java/android/media/IMediaSessionCallback.aidl \

	media/java/android/media/IMediaSessionManager.aidl \

	media/java/android/media/IRemoteControlClient.aidl \

	media/java/android/media/IRemoteControlDisplay.aidl \

	media/java/android/media/IRemoteDisplayCallback.aidl \

	media/java/android/media/IRemoteDisplayProvider.aidl \

	media/java/android/media/IRemoteVolumeObserver.aidl \

	media/java/android/media/IRingtonePlayer.aidl \

	media/java/android/media/session/IMediaController.aidl \

	media/java/android/media/session/IMediaControllerCallback.aidl \

	media/java/android/media/session/IMediaSession.aidl \

	media/java/android/media/session/IMediaSessionCallback.aidl \

	media/java/android/media/session/IMediaSessionManager.aidl \

	telephony/java/com/android/internal/telephony/IPhoneStateListener.aidl \

	telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl \

	telephony/java/com/android/internal/telephony/ITelephony.aidl \

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/effects/) 
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/framework-res_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/core/java/android/print/IPrintClient.*)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/services_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/media/java/android/media/IMedia*)

# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

api/current.txt

+48 −44
Original line number Diff line number Diff line
@@ -13180,23 +13180,6 @@ package android.media { 
    method public static final android.media.MediaCodecInfo getCodecInfoAt(int);

  }













  public final class MediaController {













    ctor public MediaController(android.media.MediaSessionToken);













    method public void addCallback(android.media.MediaController.Callback);













    method public void addCallback(android.media.MediaController.Callback, android.os.Handler);













    method public void removeCallback(android.media.MediaController.Callback);













    method public void sendCommand(java.lang.String, android.os.Bundle);













    method public void sendMediaButton(int);













  }

























  public static abstract class MediaController.Callback {













    ctor public MediaController.Callback();













    method public void onEvent(java.lang.String, android.os.Bundle);













    method public void onMetadataUpdate(android.os.Bundle);













    method public void onPlaybackStateChange(int);













    method public void onRouteChanged(android.os.Bundle);













  }



























  public final class MediaCrypto {















    ctor public MediaCrypto(java.util.UUID, byte[]) throws android.media.MediaCryptoException;















    method public static final boolean isCryptoSchemeSupported(java.util.UUID);










@@ -13763,33 +13746,6 @@ package android.media {













    method public abstract void onScanCompleted(java.lang.String, android.net.Uri);















  }



























  public final class MediaSession {













    method public void addCallback(android.media.MediaSession.Callback);













    method public void addCallback(android.media.MediaSession.Callback, android.os.Handler);













    method public android.media.MediaSessionToken getSessionToken();













    method public void release();













    method public void removeCallback(android.media.MediaSession.Callback);













    method public void setPlaybackState(int);













  }

























  public static abstract class MediaSession.Callback {













    ctor public MediaSession.Callback();













    method public void onCommand(java.lang.String, android.os.Bundle);













    method public void onMediaButton(android.content.Intent);













    method public void onRequestRouteChange(android.os.Bundle);













  }

























  public final class MediaSessionManager {













    method public android.media.MediaSession createSession(java.lang.String);













    method public java.util.List<android.media.MediaController> getActiveSessions();













  }

























  public class MediaSessionToken implements android.os.Parcelable {













    method public int describeContents();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator CREATOR;













  }



























  public class MediaSyncEvent {















    method public static android.media.MediaSyncEvent createEvent(int) throws java.lang.IllegalArgumentException;















    method public int getAudioSessionId();










@@ -14459,6 +14415,54 @@ package android.media.effect {



























}



























package android.media.session {

























  public final class MediaController {













    ctor public MediaController(android.media.session.MediaSessionToken);













    method public void addCallback(android.media.session.MediaController.Callback);













    method public void addCallback(android.media.session.MediaController.Callback, android.os.Handler);













    method public void removeCallback(android.media.session.MediaController.Callback);













    method public void sendCommand(java.lang.String, android.os.Bundle);













    method public void sendMediaButton(int);













  }

























  public static abstract class MediaController.Callback {













    ctor public MediaController.Callback();













    method public void onEvent(java.lang.String, android.os.Bundle);













    method public void onMetadataUpdate(android.os.Bundle);













    method public void onPlaybackStateChange(int);













    method public void onRouteChanged(android.os.Bundle);













  }

























  public final class MediaSession {













    method public void addCallback(android.media.session.MediaSession.Callback);













    method public void addCallback(android.media.session.MediaSession.Callback, android.os.Handler);













    method public android.media.session.MediaSessionToken getSessionToken();













    method public void release();













    method public void removeCallback(android.media.session.MediaSession.Callback);













    method public void setPlaybackState(int);













  }

























  public static abstract class MediaSession.Callback {













    ctor public MediaSession.Callback();













    method public void onCommand(java.lang.String, android.os.Bundle);













    method public void onMediaButton(android.content.Intent);













    method public void onRequestRouteChange(android.os.Bundle);













  }

























  public final class MediaSessionManager {













    method public android.media.session.MediaSession createSession(java.lang.String);













    method public java.util.List<android.media.session.MediaController> getActiveSessions();













  }

























  public class MediaSessionToken implements android.os.Parcelable {













    method public int describeContents();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator CREATOR;













  }

























}



























package android.mtp {





























  public final class MtpConstants {

























core/java/android/app/ContextImpl.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -63,7 +63,7 @@ import android.location.ILocationManager;













import android.location.LocationManager;















import android.media.AudioManager;















import android.media.MediaRouter;













import android.media.MediaSessionManager;













import android.media.session.MediaSessionManager;















import android.net.ConnectivityManager;















import android.net.IConnectivityManager;















import android.net.INetworkPolicyManager;

































core/java/android/content/Context.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -2352,10 +2352,10 @@ public abstract class Context {





























    /**















     * Use with {@link #getSystemService} to retrieve a













     * {@link android.media.MediaSessionManager} for managing media Sessions.













     * {@link android.media.session.MediaSessionManager} for managing media Sessions.















     *















     * @see #getSystemService













     * @see android.media.MediaSessionManager













     * @see android.media.session.MediaSessionManager















     */















    public static final String MEDIA_SESSION_SERVICE = "media_session";