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

Commit 74714d03 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Change signalStrength to int." am: 73818566 am: 762e0c11 am:... 

Merge "Merge "Change signalStrength to int." am: 73818566 am: 762e0c11 am: 7e80c3f0" into oc-dev-plus-aosp
parents 33c831a1 deeda1e3

telephony/java/android/telephony/mbms/IStreamingServiceCallback.aidl

+1 −2
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ 
package android.telephony.mbms;

package android.telephony.mbms;





import android.net.Uri;

import android.net.Uri;

import android.telephony.SignalStrength;

import android.telephony.mbms.StreamingService;

import android.telephony.mbms.StreamingService;





/**

/**
@@ -27,5 +26,5 @@ oneway interface IStreamingServiceCallback { 
    void error(int errorCode, String message);

    void error(int errorCode, String message);

    void streamStateChanged(in StreamingService service, int state);

    void streamStateChanged(in StreamingService service, int state);

    void uriUpdated(in Uri uri);

    void uriUpdated(in Uri uri);

    void signalStrengthUpdated(in SignalStrength signalStrength);

    void broadcastSignalStrengthUpdated(int signalStrength);

}
 
}

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ package android.telephony.mbms; 
import android.net.Uri;

import android.net.Uri;

import android.os.Parcel;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Parcelable;

import android.telephony.SignalStrength;





/**

/**

 * @hide

 * @hide

telephony/java/android/telephony/mbms/StreamingServiceCallback.java

+14 −9
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ 
package android.telephony.mbms;

package android.telephony.mbms;





import android.net.Uri;

import android.net.Uri;

import android.telephony.SignalStrength;





/**

/**

 * A Callback class for use when the applicaiton is actively streaming content.

 * A Callback class for use when the applicaiton is actively streaming content.
@@ -25,6 +24,15 @@ import android.telephony.SignalStrength; 
 */

 */

public class StreamingServiceCallback extends IStreamingServiceCallback.Stub {

public class StreamingServiceCallback extends IStreamingServiceCallback.Stub {





    /**

     * Indicates broadcast signal strength is not available for this service.

     *

     * This may be due to the service no longer being available due to geography

     * or timing (end of service) or because lack of demand has caused the service

     * to be delivered via unicast.

     */

    public static final int SIGNAL_STRENGTH_UNAVAILABLE = -1;







    public void error(int errorCode, String message) {

    public void error(int errorCode, String message) {

        // default implementation empty

        // default implementation empty
@@ -51,19 +59,16 @@ public class StreamingServiceCallback extends IStreamingServiceCallback.Stub { 
    }

    }





    /**

    /**

     * Signal Strength updated.

     * Broadcast Signal Strength updated.

     *

     *

     * This signal strength is the BROADCAST signal strength which,

     * This signal strength is the BROADCAST signal strength which,

     * depending on technology in play and it's deployment, may be

     * depending on technology in play and it's deployment, may be

     * stronger or weaker than the traditional UNICAST signal

     * stronger or weaker than the traditional UNICAST signal

     * strength.

     * strength.  It a simple int from 0-4 for valid levels or

     *

     * {@link #SIGNAL_STRENGTH_UNAVAILABLE} if broadcast is not available

     * A {@link android.telephony.SignalStrength#getLevel} result of 0 means

     * for this service due to timing, geography or popularity.

     * you don't have coverage for this stream, either due to geographic

     * restrictions, poor tower coverage or something (yards of concrete?)

     * interferring with the signal.

     */

     */

    public void signalStrengthUpdated(SignalStrength signalStrength) {

    public void broadcastSignalStrengthUpdated(int signalStrength) {

        // default implementation empty

        // default implementation empty

    }

    }

}
 
}

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ import android.telephony.mbms.IMbmsStreamingManagerCallback; 
import android.telephony.mbms.IStreamingServiceCallback;

import android.telephony.mbms.IStreamingServiceCallback;

import android.telephony.mbms.StreamingService;

import android.telephony.mbms.StreamingService;

import android.telephony.mbms.StreamingServiceInfo;

import android.telephony.mbms.StreamingServiceInfo;

import android.telephony.SignalStrength;





/**

/**

 * The interface the opaque MbmsStreamingService will satisfy.

 * The interface the opaque MbmsStreamingService will satisfy.