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

Commit 5c6a8e32 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge changes I3c19e008,I2c7c6013,I5cfd37d9 into lmp-dev 

* changes:
  Update media session test application for new media router.
  Initial draft of new MediaRouter APIs.
  Delete first draft of media routing APIs.
parents 88b93b79 ff0215dd

Android.mk

+7 −3
Original line number Diff line number Diff line
@@ -320,9 +320,12 @@ LOCAL_SRC_FILES += \ 
	media/java/android/media/IRemoteVolumeObserver.aidl \

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

	media/java/android/media/IVolumeController.aidl \

	media/java/android/media/routeprovider/IRouteConnection.aidl \

	media/java/android/media/routeprovider/IRouteProvider.aidl \

	media/java/android/media/routeprovider/IRouteProviderCallback.aidl \

	media/java/android/media/routing/IMediaRouteService.aidl \

	media/java/android/media/routing/IMediaRouteClientCallback.aidl \

	media/java/android/media/routing/IMediaRouter.aidl \

	media/java/android/media/routing/IMediaRouterDelegate.aidl \

	media/java/android/media/routing/IMediaRouterRoutingCallback.aidl \

	media/java/android/media/routing/IMediaRouterStateCallback.aidl \

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

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

	media/java/android/media/session/ISessionControllerCallback.aidl \
@@ -527,6 +530,7 @@ aidl_files := \ 
	frameworks/base/location/java/com/android/internal/location/ProviderRequest.aidl \

	frameworks/base/media/java/android/media/MediaMetadata.aidl \

	frameworks/base/media/java/android/media/Rating.aidl \

	frameworks/base/media/java/android/media/routing/MediaRouteSelector.aidl \

	frameworks/base/media/java/android/media/session/MediaSession.aidl \

	frameworks/base/media/java/android/media/session/PlaybackState.aidl \

	frameworks/base/telephony/java/android/telephony/ServiceState.aidl \

api/current.txt

+242 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ package android { 
    field public static final java.lang.String BIND_DEVICE_ADMIN = "android.permission.BIND_DEVICE_ADMIN";

    field public static final java.lang.String BIND_DREAM_SERVICE = "android.permission.BIND_DREAM_SERVICE";

    field public static final java.lang.String BIND_INPUT_METHOD = "android.permission.BIND_INPUT_METHOD";

    field public static final java.lang.String BIND_MEDIA_ROUTE_SERVICE = "android.permission.BIND_MEDIA_ROUTE_SERVICE";

    field public static final java.lang.String BIND_NFC_SERVICE = "android.permission.BIND_NFC_SERVICE";

    field public static final java.lang.String BIND_NOTIFICATION_LISTENER_SERVICE = "android.permission.BIND_NOTIFICATION_LISTENER_SERVICE";

    field public static final java.lang.String BIND_PRINT_SERVICE = "android.permission.BIND_PRINT_SERVICE";
@@ -15871,12 +15872,249 @@ package android.media.effect { 














}



























package android.media.routing {

























  public final class MediaRouteSelector implements android.os.Parcelable {













    method public boolean containsProtocol(java.lang.Class<?>);













    method public boolean containsProtocol(java.lang.String);













    method public int describeContents();













    method public android.os.Bundle getExtras();













    method public int getOptionalFeatures();













    method public java.util.List<java.lang.String> getOptionalProtocols();













    method public int getRequiredFeatures();













    method public java.util.List<java.lang.String> getRequiredProtocols();













    method public java.lang.String getServicePackageName();













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













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













  }

























  public static final class MediaRouteSelector.Builder {













    ctor public MediaRouteSelector.Builder();













    method public android.media.routing.MediaRouteSelector.Builder addOptionalProtocol(java.lang.Class<?>);













    method public android.media.routing.MediaRouteSelector.Builder addOptionalProtocol(java.lang.String);













    method public android.media.routing.MediaRouteSelector.Builder addRequiredProtocol(java.lang.Class<?>);













    method public android.media.routing.MediaRouteSelector.Builder addRequiredProtocol(java.lang.String);













    method public android.media.routing.MediaRouteSelector build();













    method public android.media.routing.MediaRouteSelector.Builder setExtras(android.os.Bundle);













    method public android.media.routing.MediaRouteSelector.Builder setOptionalFeatures(int);













    method public android.media.routing.MediaRouteSelector.Builder setRequiredFeatures(int);













    method public android.media.routing.MediaRouteSelector.Builder setServicePackageName(java.lang.String);













  }

























  public abstract class MediaRouteService extends android.app.Service {













    ctor public MediaRouteService();













    method public android.media.routing.MediaRouter.ServiceMetadata getServiceMetadata();













    method public android.os.IBinder onBind(android.content.Intent);













    method public abstract android.media.routing.MediaRouteService.ClientSession onCreateClientSession(android.media.routing.MediaRouteService.ClientInfo);













    field public static final java.lang.String SERVICE_INTERFACE = "android.media.routing.MediaRouteService";













  }

























  public static final class MediaRouteService.ClientInfo {













    method public java.lang.String getPackageName();













    method public int getUid();













  }

























  public static abstract class MediaRouteService.ClientSession {













    ctor public MediaRouteService.ClientSession();













    method public abstract boolean onConnect(android.media.routing.MediaRouter.ConnectionRequest, android.media.routing.MediaRouteService.ConnectionCallback);













    method public abstract void onDisconnect();













    method public void onPauseStream();













    method public void onRelease();













    method public void onResumeStream();













    method public abstract boolean onStartDiscovery(android.media.routing.MediaRouter.DiscoveryRequest, android.media.routing.MediaRouteService.DiscoveryCallback);













    method public abstract void onStopDiscovery();













  }

























  public final class MediaRouteService.ConnectionCallback {













    method public void onConnected(android.media.routing.MediaRouter.ConnectionInfo);













    method public void onConnectionFailed(int, java.lang.CharSequence, android.os.Bundle);













    method public void onDisconnected();













  }

























  public final class MediaRouteService.DiscoveryCallback {













    method public void onDestinationFound(android.media.routing.MediaRouter.DestinationInfo, java.util.List<android.media.routing.MediaRouter.RouteInfo>);













    method public void onDestinationLost(android.media.routing.MediaRouter.DestinationInfo);













    method public void onDiscoveryFailed(int, java.lang.CharSequence, android.os.Bundle);













  }

























  public final class MediaRouter {













    ctor public MediaRouter(android.content.Context);













    method public void addSelector(android.media.routing.MediaRouteSelector);













    method public void clearSelectors();













    method public android.media.routing.MediaRouter.Delegate createDelegate();













    method public android.media.routing.MediaRouter.ConnectionInfo getConnection();













    method public int getConnectionState();













    method public java.util.List<android.media.routing.MediaRouter.DestinationInfo> getDiscoveredDestinations();













    method public java.util.List<android.media.routing.MediaRouter.RouteInfo> getDiscoveredRoutes(android.media.routing.MediaRouter.DestinationInfo);













    method public int getDiscoveryState();













    method public android.media.AudioAttributes getPreferredAudioAttributes();













    method public android.view.Display getPreferredPresentationDisplay();













    method public android.media.VolumeProvider getPreferredVolumeProvider();













    method public android.media.routing.MediaRouter.DestinationInfo getSelectedDestination();













    method public android.media.routing.MediaRouter.RouteInfo getSelectedRoute();













    method public java.util.List<android.media.routing.MediaRouteSelector> getSelectors();













    method public boolean isReleased();













    method public void pauseStream();













    method public void release();













    method public void removeSelector(android.media.routing.MediaRouteSelector);













    method public void resumeStream();













    method public void setRoutingCallback(android.media.routing.MediaRouter.RoutingCallback, android.os.Handler);













    field public static final int CONNECTION_ERROR_ABORTED = 1; // 0x1













    field public static final int CONNECTION_ERROR_BARGED = 7; // 0x7













    field public static final int CONNECTION_ERROR_BROKEN = 6; // 0x6













    field public static final int CONNECTION_ERROR_BUSY = 4; // 0x4













    field public static final int CONNECTION_ERROR_TIMEOUT = 5; // 0x5













    field public static final int CONNECTION_ERROR_UNAUTHORIZED = 2; // 0x2













    field public static final int CONNECTION_ERROR_UNKNOWN = 0; // 0x0













    field public static final int CONNECTION_ERROR_UNREACHABLE = 3; // 0x3













    field public static final int CONNECTION_FLAG_BARGE = 1; // 0x1













    field public static final int CONNECTION_STATE_CONNECTED = 2; // 0x2













    field public static final int CONNECTION_STATE_CONNECTING = 1; // 0x1













    field public static final int CONNECTION_STATE_DISCONNECTED = 0; // 0x0













    field public static final int DISCONNECTION_REASON_APPLICATION_REQUEST = 0; // 0x0













    field public static final int DISCONNECTION_REASON_ERROR = 2; // 0x2













    field public static final int DISCONNECTION_REASON_USER_REQUEST = 1; // 0x1













    field public static final int DISCOVERY_ERROR_ABORTED = 1; // 0x1













    field public static final int DISCOVERY_ERROR_NO_CONNECTIVITY = 2; // 0x2













    field public static final int DISCOVERY_ERROR_UNKNOWN = 0; // 0x0













    field public static final int DISCOVERY_FLAG_BACKGROUND = 1; // 0x1













    field public static final int DISCOVERY_STATE_STARTED = 1; // 0x1













    field public static final int DISCOVERY_STATE_STOPPED = 0; // 0x0













    field public static final int ROUTE_FEATURE_LIVE_AUDIO = 1; // 0x1













    field public static final int ROUTE_FEATURE_LIVE_VIDEO = 2; // 0x2













  }

























  public static final class MediaRouter.ConnectionInfo {













    method public android.media.AudioAttributes getAudioAttributes();













    method public android.os.Bundle getExtras();













    method public int getFeatures();













    method public android.view.Display getPresentationDisplay();













    method public android.os.IBinder getProtocolBinder(java.lang.String);













    method public android.os.IBinder getProtocolBinder(int);













    method public T getProtocolObject(java.lang.Class<T>);













    method public java.util.List<java.lang.String> getProtocols();













    method public android.media.routing.MediaRouter.RouteInfo getRoute();













    method public android.media.VolumeProvider getVolumeProvider();













  }

























  public static final class MediaRouter.ConnectionInfo.Builder {













    ctor public MediaRouter.ConnectionInfo.Builder(android.media.routing.MediaRouter.RouteInfo);













    method public android.media.routing.MediaRouter.ConnectionInfo build();













    method public android.media.routing.MediaRouter.ConnectionInfo.Builder setAudioAttributes(android.media.AudioAttributes);













    method public android.media.routing.MediaRouter.ConnectionInfo.Builder setExtras(android.os.Bundle);













    method public android.media.routing.MediaRouter.ConnectionInfo.Builder setPresentationDisplay(android.view.Display);













    method public android.media.routing.MediaRouter.ConnectionInfo.Builder setProtocolBinder(java.lang.String, android.os.IBinder);













    method public android.media.routing.MediaRouter.ConnectionInfo.Builder setProtocolStub(java.lang.Class<?>, android.os.IInterface);













    method public android.media.routing.MediaRouter.ConnectionInfo.Builder setVolumeProvider(android.media.VolumeProvider);













  }

























  public static final class MediaRouter.ConnectionRequest {













    method public android.os.Bundle getExtras();













    method public int getFlags();













    method public android.media.routing.MediaRouter.RouteInfo getRoute();













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













    method public void setFlags(int);













    method public void setRoute(android.media.routing.MediaRouter.RouteInfo);













  }

























  public static final class MediaRouter.Delegate {













    ctor public MediaRouter.Delegate();













    method public void addStateCallback(android.media.routing.MediaRouter.StateCallback, android.os.Handler);













    method public void connect(android.media.routing.MediaRouter.DestinationInfo, int);













    method public void disconnect(int);













    method public int getConnectionState();













    method public java.util.List<android.media.routing.MediaRouter.DestinationInfo> getDiscoveredDestinations();













    method public int getDiscoveryState();













    method public android.media.routing.MediaRouter.DestinationInfo getSelectedDestination();













    method public boolean isReleased();













    method public void removeStateCallback(android.media.routing.MediaRouter.StateCallback);













    method public void startDiscovery(int);













    method public void stopDiscovery();













  }

























  public static final class MediaRouter.DestinationInfo {













    method public java.lang.CharSequence getDescription();













    method public android.os.Bundle getExtras();













    method public int getIconResourceId();













    method public java.lang.String getId();













    method public java.lang.CharSequence getName();













    method public android.media.routing.MediaRouter.ServiceMetadata getServiceMetadata();













    method public android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager);













  }

























  public static final class MediaRouter.DestinationInfo.Builder {













    ctor public MediaRouter.DestinationInfo.Builder(java.lang.String, android.media.routing.MediaRouter.ServiceMetadata, java.lang.CharSequence);













    method public android.media.routing.MediaRouter.DestinationInfo build();













    method public android.media.routing.MediaRouter.DestinationInfo.Builder setDescription(java.lang.CharSequence);













    method public android.media.routing.MediaRouter.DestinationInfo.Builder setExtras(android.os.Bundle);













    method public android.media.routing.MediaRouter.DestinationInfo.Builder setIconResourceId(int);













  }

























  public static final class MediaRouter.DiscoveryRequest {













    method public int getFlags();













    method public java.util.List<android.media.routing.MediaRouteSelector> getSelectors();













    method public void setFlags(int);













    method public void setSelectors(java.util.List<android.media.routing.MediaRouteSelector>);













  }

























  public static final class MediaRouter.RouteInfo {













    method public android.media.routing.MediaRouter.DestinationInfo getDestination();













    method public android.os.Bundle getExtras();













    method public int getFeatures();













    method public java.lang.String getId();













    method public java.util.List<java.lang.String> getProtocols();













    method public android.media.routing.MediaRouteSelector getSelector();













  }

























  public static final class MediaRouter.RouteInfo.Builder {













    ctor public MediaRouter.RouteInfo.Builder(java.lang.String, android.media.routing.MediaRouter.DestinationInfo, android.media.routing.MediaRouteSelector);













    method public android.media.routing.MediaRouter.RouteInfo.Builder addProtocol(java.lang.Class<T>);













    method public android.media.routing.MediaRouter.RouteInfo.Builder addProtocol(java.lang.String);













    method public android.media.routing.MediaRouter.RouteInfo build();













    method public android.media.routing.MediaRouter.RouteInfo.Builder setExtras(android.os.Bundle);













    method public android.media.routing.MediaRouter.RouteInfo.Builder setFeatures(int);













  }

























  public static abstract class MediaRouter.RoutingCallback extends android.media.routing.MediaRouter.StateCallback {













    ctor public MediaRouter.RoutingCallback();













    method public boolean onPrepareConnectionRequest(android.media.routing.MediaRouter.ConnectionRequest, android.media.routing.MediaRouter.DestinationInfo, java.util.List<android.media.routing.MediaRouter.RouteInfo>);













    method public boolean onPrepareDiscoveryRequest(android.media.routing.MediaRouter.DiscoveryRequest, java.util.List<android.media.routing.MediaRouteSelector>);













  }

























  public static final class MediaRouter.ServiceMetadata {













    method public android.content.ComponentName getComponentName();













    method public android.graphics.drawable.Drawable getIcon(android.content.pm.PackageManager);













    method public java.lang.CharSequence getLabel(android.content.pm.PackageManager);













    method public java.lang.String getPackageName();













    method public android.content.pm.ServiceInfo getService();













  }

























  public static abstract class MediaRouter.StateCallback {













    ctor public MediaRouter.StateCallback();













    method public void onConnected();













    method public void onConnecting();













    method public void onConnectionFailed(int, java.lang.CharSequence, android.os.Bundle);













    method public void onConnectionStateChanged(int);













    method public void onDestinationFound(android.media.routing.MediaRouter.DestinationInfo);













    method public void onDestinationLost(android.media.routing.MediaRouter.DestinationInfo);













    method public void onDisconnected();













    method public void onDiscoveryFailed(int, java.lang.CharSequence, android.os.Bundle);













    method public void onDiscoveryStarted();













    method public void onDiscoveryStateChanged(int);













    method public void onDiscoveryStopped();













    method public void onReleased();













    method public void onSelectedDestinationChanged(android.media.routing.MediaRouter.DestinationInfo);













  }

























}



























package android.media.session {





























  public final class MediaController {















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















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















    method public void adjustVolumeBy(int, int);













    method public android.media.routing.MediaRouter.Delegate createMediaRouterDelegate();















    method public boolean dispatchMediaButtonEvent(android.view.KeyEvent);















    method public static android.media.session.MediaController fromToken(android.media.session.MediaSession.Token);















    method public android.media.MediaMetadata getMetadata();










@@ -15931,6 +16169,7 @@ package android.media.session {













    method public void setActive(boolean);















    method public void setFlags(int);















    method public void setLaunchPendingIntent(android.app.PendingIntent);













    method public void setMediaRouter(android.media.routing.MediaRouter);















    method public void setMetadata(android.media.MediaMetadata);















    method public void setPlaybackState(android.media.session.PlaybackState);















    method public void setPlaybackToLocal(int);










@@ -16005,6 +16244,7 @@ package android.media.session {













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















    field public static final long PLAYBACK_POSITION_UNKNOWN = -1L; // 0xffffffffffffffffL















    field public static final int STATE_BUFFERING = 6; // 0x6













    field public static final int STATE_CONNECTING = 8; // 0x8















    field public static final int STATE_ERROR = 7; // 0x7















    field public static final int STATE_FAST_FORWARDING = 4; // 0x4















    field public static final int STATE_NONE = 0; // 0x0










@@ -16268,8 +16508,8 @@ package android.media.tv {













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















    method public void onError(java.lang.String, int);















    method public void onTrackInfoChanged(java.lang.String, java.util.List<android.media.tv.TvTrackInfo>);













    method public void onVideoSizeChanged(java.lang.String, int, int);















    method public void onVideoAvailable(java.lang.String);













    method public void onVideoSizeChanged(java.lang.String, int, int);















    method public void onVideoUnavailable(java.lang.String, int);















  }
























@@ -24659,6 +24899,7 @@ package android.provider {













    field public static final java.lang.String ACTION_APPLICATION_SETTINGS = "android.settings.APPLICATION_SETTINGS";















    field public static final java.lang.String ACTION_BLUETOOTH_SETTINGS = "android.settings.BLUETOOTH_SETTINGS";















    field public static final java.lang.String ACTION_CAPTIONING_SETTINGS = "android.settings.CAPTIONING_SETTINGS";













    field public static final java.lang.String ACTION_CAST_SETTINGS = "android.settings.CAST_SETTINGS";















    field public static final java.lang.String ACTION_DATA_ROAMING_SETTINGS = "android.settings.DATA_ROAMING_SETTINGS";















    field public static final java.lang.String ACTION_DATE_SETTINGS = "android.settings.DATE_SETTINGS";















    field public static final java.lang.String ACTION_DEVICE_INFO_SETTINGS = "android.settings.DEVICE_INFO_SETTINGS";

























cmds/media/src/com/android/commands/media/Media.java



+0
−6




























Original line number
Diff line number
Diff line








@@ -25,7 +25,6 @@ import android.media.session.ISessionManager;













import android.media.session.MediaController;















import android.media.session.MediaSessionInfo;















import android.media.session.PlaybackState;













import android.media.session.RouteInfo;















import android.os.Bundle;















import android.os.HandlerThread;















import android.os.IBinder;










@@ -180,11 +179,6 @@ public class Media extends BaseCommand {













            System.out.println("onSessionEvent event=" + event + ", extras=" + extras);















        }





























        @Override













        public void onRouteChanged(RouteInfo route) {













            System.out.println("onRouteChanged " + route);













        }





























        @Override















        public void onPlaybackStateChanged(PlaybackState state) {















            System.out.println("onPlaybackStateChanged " + state);

































core/java/android/provider/Settings.java



+15
−0




























Original line number
Diff line number
Diff line








@@ -265,6 +265,21 @@ public final class Settings {













    public static final String ACTION_WIFI_DISPLAY_SETTINGS =















            "android.settings.WIFI_DISPLAY_SETTINGS";





























    /**













     * Activity Action: Show settings to allow configuration of













     * {@link android.media.routing.MediaRouteService media route providers}.













     * <p>













     * In some cases, a matching Activity may not exist, so ensure you













     * safeguard against this.













     * <p>













     * Input: Nothing.













     * <p>













     * Output: Nothing.













     */













    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)













    public static final String ACTION_CAST_SETTINGS =













            "android.settings.CAST_SETTINGS";





























    /**















     * Activity Action: Show settings to allow configuration of date and time.















     * <p>

































core/res/AndroidManifest.xml



+8
−1




























Original line number
Diff line number
Diff line








@@ -2149,7 +2149,7 @@













        android:description="@string/permdesc_bindTvInput"















        android:protectionLevel="signature|system" />





























    <!-- Must be required by a {@link android.media.routeprovider.RouteProviderService}













    <!-- Must be required by a {@link android.media.routing.MediaRouteService}















         to ensure that only the system can interact with it.















         @hide -->















    <permission android:name="android.permission.BIND_ROUTE_PROVIDER"










@@ -2720,6 +2720,13 @@













        android:description="@string/permdesc_bindConditionProviderService"















        android:protectionLevel="signature" />





























    <!-- Must be required by a {@link android.media.routing.MediaRouteService},













         to ensure that only the system can bind to it. -->













    <permission android:name="android.permission.BIND_MEDIA_ROUTE_SERVICE"













        android:label="@string/permlab_bindMediaRouteService"













        android:description="@string/permdesc_bindMediaRouteService"













        android:protectionLevel="signature" />





























    <!-- Must be required by an {@link android.service.dreams.DreamService},















         to ensure that only the system can bind to it. -->















    <permission android:name="android.permission.BIND_DREAM_SERVICE"