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

Commit 07f06022 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
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
parents aee0dd3a 688ae17c

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