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

Move Session apis to android.media.session

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

Change-Id: Ic5eaf65e8bd054a844f87b9118c4bb18f30ac8a7
This commit is contained in:
RoboErik
2014-02-21 10:30:38 -08:00
parent 503923220c
commit 2f5b057da7
22 changed files with 99 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Android.mk
View File

@@ -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 \

1
CleanSpec.mk
View File

@@ -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
# ************************************************

92
api/current.txt
View File

@@ -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 {

2
core/java/android/app/ContextImpl.java
View File

@@ -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;

4
core/java/android/content/Context.java
View File

@@ -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";

4
media/java/android/media/IMediaController.aidl → media/java/android/media/session/IMediaController.aidl
View File

@@ -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;

2
media/java/android/media/IMediaControllerCallback.aidl → media/java/android/media/session/IMediaControllerCallback.aidl
View File

@@ -13,7 +13,7 @@
* limitations under the License.
*/
package android.media;
package android.media.session;
import android.os.Bundle;

4
media/java/android/media/IMediaSession.aidl → media/java/android/media/session/IMediaSession.aidl
View File

@@ -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;
/**

2
media/java/android/media/IMediaSessionCallback.aidl → media/java/android/media/session/IMediaSessionCallback.aidl
View File

@@ -13,7 +13,7 @@
* limitations under the License.
*/
package android.media;
package android.media.session;
import android.content.Intent;
import android.os.Bundle;

6
media/java/android/media/IMediaSessionManager.aidl → media/java/android/media/session/IMediaSessionManager.aidl
View File

@@ -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;
/**

6
media/java/android/media/MediaController.java → media/java/android/media/session/MediaController.java
View File

@@ -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;

7
media/java/android/media/MediaSession.java → media/java/android/media/session/MediaSession.java
View File

@@ -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;

3
media/java/android/media/MediaSessionManager.java → media/java/android/media/session/MediaSessionManager.java
View File

@@ -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;

2
media/java/android/media/MediaSessionToken.aidl → media/java/android/media/session/MediaSessionToken.aidl
View File

@@ -13,6 +13,6 @@
** limitations under the License.
*/
package android.media;
package android.media.session;
parcelable MediaSessionToken;

3
media/java/android/media/MediaSessionToken.java → media/java/android/media/session/MediaSessionToken.java
View File

@@ -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;

8
services/core/java/com/android/server/media/MediaSessionRecord.java
View File

@@ -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;

6
services/core/java/com/android/server/media/MediaSessionService.java
View File

@@ -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;

4
tests/OneMedia/src/com/android/onemedia/IPlayerCallback.aidl
View File

@@ -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);

6
tests/OneMedia/src/com/android/onemedia/IPlayerService.aidl
View File

@@ -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);

4
tests/OneMedia/src/com/android/onemedia/PlayerController.java
View File

@@ -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;

2
tests/OneMedia/src/com/android/onemedia/PlayerService.java
View File

@@ -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;

6
tests/OneMedia/src/com/android/onemedia/PlayerSession.java
View File

@@ -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;