diff --git a/Android.mk b/Android.mk index 57091cc307679..eb288a65ab0d4 100644 --- a/Android.mk +++ b/Android.mk @@ -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 \ diff --git a/CleanSpec.mk b/CleanSpec.mk index 1e49fcbb3ec7e..448b03dc273e2 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -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 # ************************************************ diff --git a/api/current.txt b/api/current.txt index c20fc198926e1..f1d37a4799c51 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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 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 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 { diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 873db8e6d60e6..ee73aba066895 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -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; diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index d05d1a1346235..81a886ab40ca2 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -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"; diff --git a/media/java/android/media/IMediaController.aidl b/media/java/android/media/session/IMediaController.aidl similarity index 92% rename from media/java/android/media/IMediaController.aidl rename to media/java/android/media/session/IMediaController.aidl index fc3525a792483..8ca0e4570d9fb 100644 --- a/media/java/android/media/IMediaController.aidl +++ b/media/java/android/media/session/IMediaController.aidl @@ -13,10 +13,10 @@ * limitations under the License. */ -package android.media; +package android.media.session; import android.content.Intent; -import android.media.IMediaControllerCallback; +import android.media.session.IMediaControllerCallback; import android.os.Bundle; import android.os.IBinder; import android.view.KeyEvent; diff --git a/media/java/android/media/IMediaControllerCallback.aidl b/media/java/android/media/session/IMediaControllerCallback.aidl similarity index 96% rename from media/java/android/media/IMediaControllerCallback.aidl rename to media/java/android/media/session/IMediaControllerCallback.aidl index b54d0cf49c44e..3aa0ee4f5347e 100644 --- a/media/java/android/media/IMediaControllerCallback.aidl +++ b/media/java/android/media/session/IMediaControllerCallback.aidl @@ -13,7 +13,7 @@ * limitations under the License. */ -package android.media; +package android.media.session; import android.os.Bundle; diff --git a/media/java/android/media/IMediaSession.aidl b/media/java/android/media/session/IMediaSession.aidl similarity index 92% rename from media/java/android/media/IMediaSession.aidl rename to media/java/android/media/session/IMediaSession.aidl index ed71d78bfa679..19f70923d8989 100644 --- a/media/java/android/media/IMediaSession.aidl +++ b/media/java/android/media/session/IMediaSession.aidl @@ -13,9 +13,9 @@ * limitations under the License. */ -package android.media; +package android.media.session; -import android.media.IMediaController; +import android.media.session.IMediaController; import android.os.Bundle; /** diff --git a/media/java/android/media/IMediaSessionCallback.aidl b/media/java/android/media/session/IMediaSessionCallback.aidl similarity index 96% rename from media/java/android/media/IMediaSessionCallback.aidl rename to media/java/android/media/session/IMediaSessionCallback.aidl index 3aaf925ff211c..eb5f222e0acf1 100644 --- a/media/java/android/media/IMediaSessionCallback.aidl +++ b/media/java/android/media/session/IMediaSessionCallback.aidl @@ -13,7 +13,7 @@ * limitations under the License. */ -package android.media; +package android.media.session; import android.content.Intent; import android.os.Bundle; diff --git a/media/java/android/media/IMediaSessionManager.aidl b/media/java/android/media/session/IMediaSessionManager.aidl similarity index 86% rename from media/java/android/media/IMediaSessionManager.aidl rename to media/java/android/media/session/IMediaSessionManager.aidl index 8bc0c3b83e30e..0b4328e76af87 100644 --- a/media/java/android/media/IMediaSessionManager.aidl +++ b/media/java/android/media/session/IMediaSessionManager.aidl @@ -13,10 +13,10 @@ * limitations under the License. */ -package android.media; +package android.media.session; -import android.media.IMediaSession; -import android.media.IMediaSessionCallback; +import android.media.session.IMediaSession; +import android.media.session.IMediaSessionCallback; import android.os.Bundle; /** diff --git a/media/java/android/media/MediaController.java b/media/java/android/media/session/MediaController.java similarity index 98% rename from media/java/android/media/MediaController.java rename to media/java/android/media/session/MediaController.java index 1e99942a1fb4b..09de859d66b13 100644 --- a/media/java/android/media/MediaController.java +++ b/media/java/android/media/session/MediaController.java @@ -14,9 +14,13 @@ * limitations under the License. */ -package android.media; +package android.media.session; import android.content.Intent; +import android.media.session.IMediaController; +import android.media.session.IMediaControllerCallback; +import android.media.MediaMetadataRetriever; +import android.media.RemoteControlClient; import android.os.Bundle; import android.os.Handler; import android.os.Looper; diff --git a/media/java/android/media/MediaSession.java b/media/java/android/media/session/MediaSession.java similarity index 97% rename from media/java/android/media/MediaSession.java rename to media/java/android/media/session/MediaSession.java index 5e5c9fa096cdc..1f1533bde107a 100644 --- a/media/java/android/media/MediaSession.java +++ b/media/java/android/media/session/MediaSession.java @@ -14,10 +14,13 @@ * limitations under the License. */ -package android.media; +package android.media.session; import android.content.Intent; -import android.media.IMediaSession; +import android.media.session.IMediaController; +import android.media.session.IMediaSession; +import android.media.session.IMediaSessionCallback; +import android.media.RemoteControlClient; import android.os.Bundle; import android.os.Handler; import android.os.Looper; diff --git a/media/java/android/media/MediaSessionManager.java b/media/java/android/media/session/MediaSessionManager.java similarity index 97% rename from media/java/android/media/MediaSessionManager.java rename to media/java/android/media/session/MediaSessionManager.java index 90f0071a05980..e3f2d9cc08de1 100644 --- a/media/java/android/media/MediaSessionManager.java +++ b/media/java/android/media/session/MediaSessionManager.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package android.media; +package android.media.session; import android.content.Context; +import android.media.session.IMediaSessionManager; import android.os.IBinder; import android.os.RemoteException; import android.os.ServiceManager; diff --git a/media/java/android/media/MediaSessionToken.aidl b/media/java/android/media/session/MediaSessionToken.aidl similarity index 95% rename from media/java/android/media/MediaSessionToken.aidl rename to media/java/android/media/session/MediaSessionToken.aidl index e2f1abce3732a..58126827fe5f0 100644 --- a/media/java/android/media/MediaSessionToken.aidl +++ b/media/java/android/media/session/MediaSessionToken.aidl @@ -13,6 +13,6 @@ ** limitations under the License. */ -package android.media; +package android.media.session; parcelable MediaSessionToken; diff --git a/media/java/android/media/MediaSessionToken.java b/media/java/android/media/session/MediaSessionToken.java similarity index 95% rename from media/java/android/media/MediaSessionToken.java rename to media/java/android/media/session/MediaSessionToken.java index 885fda358adc4..dbb49645a3de8 100644 --- a/media/java/android/media/MediaSessionToken.java +++ b/media/java/android/media/session/MediaSessionToken.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package android.media; +package android.media.session; +import android.media.session.IMediaController; import android.os.Parcel; import android.os.Parcelable; diff --git a/services/core/java/com/android/server/media/MediaSessionRecord.java b/services/core/java/com/android/server/media/MediaSessionRecord.java index 0d3fa84145ae0..89acec984f0cd 100644 --- a/services/core/java/com/android/server/media/MediaSessionRecord.java +++ b/services/core/java/com/android/server/media/MediaSessionRecord.java @@ -17,10 +17,10 @@ package com.android.server.media; import android.content.Intent; -import android.media.IMediaController; -import android.media.IMediaControllerCallback; -import android.media.IMediaSession; -import android.media.IMediaSessionCallback; +import android.media.session.IMediaController; +import android.media.session.IMediaControllerCallback; +import android.media.session.IMediaSession; +import android.media.session.IMediaSessionCallback; import android.media.RemoteControlClient; import android.os.Bundle; import android.os.IBinder; diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java index 9c96c35f006f9..a7ff92684f82c 100644 --- a/services/core/java/com/android/server/media/MediaSessionService.java +++ b/services/core/java/com/android/server/media/MediaSessionService.java @@ -17,9 +17,9 @@ package com.android.server.media; import android.content.Context; -import android.media.IMediaSession; -import android.media.IMediaSessionCallback; -import android.media.IMediaSessionManager; +import android.media.session.IMediaSession; +import android.media.session.IMediaSessionCallback; +import android.media.session.IMediaSessionManager; import android.os.Binder; import android.os.RemoteException; import android.text.TextUtils; diff --git a/tests/OneMedia/src/com/android/onemedia/IPlayerCallback.aidl b/tests/OneMedia/src/com/android/onemedia/IPlayerCallback.aidl index 9bc3baafc94fd..2b14384c6dc8f 100644 --- a/tests/OneMedia/src/com/android/onemedia/IPlayerCallback.aidl +++ b/tests/OneMedia/src/com/android/onemedia/IPlayerCallback.aidl @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + package com.android.onemedia; -import android.media.MediaSessionToken; +import android.media.session.MediaSessionToken; interface IPlayerCallback { void onSessionChanged(in MediaSessionToken session); diff --git a/tests/OneMedia/src/com/android/onemedia/IPlayerService.aidl b/tests/OneMedia/src/com/android/onemedia/IPlayerService.aidl index ab1d3fc2da9de..efdbe9ae8491c 100644 --- a/tests/OneMedia/src/com/android/onemedia/IPlayerService.aidl +++ b/tests/OneMedia/src/com/android/onemedia/IPlayerService.aidl @@ -12,17 +12,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + package com.android.onemedia; -import android.media.MediaSessionToken; +import android.media.session.MediaSessionToken; import android.os.Bundle; import com.android.onemedia.IPlayerCallback; import com.android.onemedia.playback.IRequestCallback; interface IPlayerService { - MediaSessionToken getSessionToken(); + MediaSessionToken getSessionToken(); void registerCallback(in IPlayerCallback cb); void unregisterCallback(in IPlayerCallback cb); void sendRequest(String action, in Bundle params, in IRequestCallback cb); diff --git a/tests/OneMedia/src/com/android/onemedia/PlayerController.java b/tests/OneMedia/src/com/android/onemedia/PlayerController.java index 4ccc846dd8714..3f15db5a010b8 100644 --- a/tests/OneMedia/src/com/android/onemedia/PlayerController.java +++ b/tests/OneMedia/src/com/android/onemedia/PlayerController.java @@ -1,8 +1,8 @@ package com.android.onemedia; -import android.media.MediaController; -import android.media.MediaSessionManager; +import android.media.session.MediaController; +import android.media.session.MediaSessionManager; import android.os.Handler; import android.os.IBinder; import android.os.RemoteException; diff --git a/tests/OneMedia/src/com/android/onemedia/PlayerService.java b/tests/OneMedia/src/com/android/onemedia/PlayerService.java index 0819077c8b348..0b2ba8f48bfa6 100644 --- a/tests/OneMedia/src/com/android/onemedia/PlayerService.java +++ b/tests/OneMedia/src/com/android/onemedia/PlayerService.java @@ -2,7 +2,7 @@ package com.android.onemedia; import android.app.Service; import android.content.Intent; -import android.media.MediaSessionToken; +import android.media.session.MediaSessionToken; import android.os.Bundle; import android.os.IBinder; import android.os.RemoteException; diff --git a/tests/OneMedia/src/com/android/onemedia/PlayerSession.java b/tests/OneMedia/src/com/android/onemedia/PlayerSession.java index 25a8f0d1aa471..e5fb0d03acd8c 100644 --- a/tests/OneMedia/src/com/android/onemedia/PlayerSession.java +++ b/tests/OneMedia/src/com/android/onemedia/PlayerSession.java @@ -2,9 +2,9 @@ package com.android.onemedia; import android.content.Context; import android.content.Intent; -import android.media.MediaSession; -import android.media.MediaSessionManager; -import android.media.MediaSessionToken; +import android.media.session.MediaSession; +import android.media.session.MediaSessionManager; +import android.media.session.MediaSessionToken; import android.os.Bundle; import android.util.Log; import android.view.KeyEvent;