Merge "Remove switchStreams API." am: f465d84ebe

am: 48941f5d90

Change-Id: I739d0f707c60167cf99e1ca5126621a899e607d7

telephony/java/android/telephony/mbms/StreamingService.java

@@ -69,17 +69,6 @@ public class StreamingService {
     public void stopStreaming() {
     }
 
-    /**
-     * Switch this stream to a different service.  Used for smooth transitions.
-     *
-     * This may throw a RemoteException.
-     *
-     * Asynchronous errors through the listener include any of the errors except
-     * <li>ERROR_MSDC_UNABLE_TO_INITIALIZE</li>
-     */
-    public void switchStream(StreamingServiceInfo streamingServiceInfo) {
-    }
-
     public void dispose() {
     }
 

telephony/java/android/telephony/mbms/vendor/IMbmsStreamingService.aidl

@@ -55,8 +55,6 @@ interface IMbmsStreamingService
 
     Uri getPlaybackUri(String appName, int subId, String serviceId);
 
-    void switchStreams(String appName, int subId, String oldServiceId, String newServiceId);
-
     int getState(String appName, int subId, String serviceId);
 
     void stopStreaming(String appName, int subId, String serviceId);

telephony/java/android/telephony/mbms/vendor/MbmsStreamingServiceBase.java

@@ -84,11 +84,6 @@ public class MbmsStreamingServiceBase extends IMbmsStreamingService.Stub {
         return null;
     }
 
-    @Override
-    public void switchStreams(String appName, int subId, String oldServiceId, String newServiceId)
-            throws RemoteException {
-    }
-
     @Override
     public int getState(String appName, int subId, String serviceId) throws RemoteException {
         return 0;