From 4a411f7d6733c162faf8558670b25740f8573d67 Mon Sep 17 00:00:00 2001
From: Robert Greenwalt <rgreenwalt@google.com>
Date: Fri, 12 May 2017 15:04:04 -0700
Subject: [PATCH] Remove switchStreams API.

After discussion about how best this could fit in the API we
discovered many disagreements that we couldn't resolve in the
time available.  Pulling the feature from the API until we
can resolve issues.

Test: builds
Change-Id: I6d36a1dea8ce9816fad497b992a347188d3ac88e
---
 .../java/android/telephony/mbms/StreamingService.java | 11 -----------
 .../telephony/mbms/vendor/IMbmsStreamingService.aidl  |  2 --
 .../mbms/vendor/MbmsStreamingServiceBase.java         |  5 -----
 3 files changed, 18 deletions(-)

diff --git a/telephony/java/android/telephony/mbms/StreamingService.java b/telephony/java/android/telephony/mbms/StreamingService.java
index 8cc604356badb..11fe37272d423 100644
--- a/telephony/java/android/telephony/mbms/StreamingService.java
+++ b/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() {
     }
 
diff --git a/telephony/java/android/telephony/mbms/vendor/IMbmsStreamingService.aidl b/telephony/java/android/telephony/mbms/vendor/IMbmsStreamingService.aidl
index fed0a403bc69e..097f3d15a1e4b 100755
--- a/telephony/java/android/telephony/mbms/vendor/IMbmsStreamingService.aidl
+++ b/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);
diff --git a/telephony/java/android/telephony/mbms/vendor/MbmsStreamingServiceBase.java b/telephony/java/android/telephony/mbms/vendor/MbmsStreamingServiceBase.java
index e23d12b21ace3..467035254696b 100644
--- a/telephony/java/android/telephony/mbms/vendor/MbmsStreamingServiceBase.java
+++ b/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;