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

Commit 44d55c6b authored by Robert Greenwalt's avatar Robert Greenwalt Committed by android-build-merger
Browse files

Merge "Merge "Update startStreaming to return status code" am: 6476ceea am:... 

Merge "Merge "Update startStreaming to return status code" am: 6476ceea am: a89caceb am: 331058a8" into oc-dev-plus-aosp
am: 07f06022

Change-Id: Ibf7f4aed57b592373ff37f1b2b40f72f3cc25d90
parents be5808f9 07f06022

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

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ interface IMbmsStreamingService 
     * - Streaming status will be sent via the included listener, including an initial

     *   URL-change and State-change pair.

     */

    StreamingService startStreaming(String appName, int subId, String serviceId,

    int startStreaming(String appName, int subId, String serviceId,

            IStreamingServiceCallback listener);



    /**

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

+2 −2
Original line number Diff line number Diff line
@@ -43,9 +43,9 @@ public class MbmsStreamingServiceBase extends IMbmsStreamingService.Stub { 
    }



    @Override

    public StreamingService startStreaming(String appName, int subId,

    public int startStreaming(String appName, int subId,

            String serviceId, IStreamingServiceCallback listener) throws RemoteException {

        return null;

        return 0;

    }



    @Override