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

Commit e50f9466 authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Change signalStrength to int. 

Broadcast signal strength is calculated differently than unicast
so the SignalStrength class used for unicast doesn't make sense.
Also added a -1 constant for unavailable which is mainly used
when the service is delivered via unicast.

Also rename signalStrengthUpdated to broadcastSignalStrengthUpdated.

Test: builds
Change-Id: Ia2680370d4cb8cd838341f58b41d02cdc78d4fc1
parent 4a411f7d

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

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



import android.net.Uri;

import android.telephony.SignalStrength;

import android.telephony.mbms.StreamingService;



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

    void streamStateChanged(in StreamingService service, int state);

    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 Diff line number Diff line
@@ -19,7 +19,6 @@ package android.telephony.mbms; 
import android.net.Uri;

import android.os.Parcel;

import android.os.Parcelable;

import android.telephony.SignalStrength;



/**

 * @hide

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

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



import android.net.Uri;

import android.telephony.SignalStrength;



/**

 * 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 {



    /**

     * 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) {

        // 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,

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

     * stronger or weaker than the traditional UNICAST signal

     * strength.

     *

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

     * 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.

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

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

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

     */

    public void signalStrengthUpdated(SignalStrength signalStrength) {

    public void broadcastSignalStrengthUpdated(int signalStrength) {

        // default implementation empty

    }

}

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

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

import android.telephony.mbms.StreamingService;

import android.telephony.mbms.StreamingServiceInfo;

import android.telephony.SignalStrength;



/**

 * The interface the opaque MbmsStreamingService will satisfy.