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

Commit 92e5b09d authored by Eric Schwarzenbach's avatar Eric Schwarzenbach Committed by android-build-merger
Browse files

Merge "Add constants for reporting criteria" 

am: a36ada4b

Change-Id: Ib928d0de3e7e33a5efec3b5d5fe6e99f2782058d
parents 625aa8d3 a36ada4b

telephony/java/android/telephony/TelephonyManager.java

+15 −1
Original line number Diff line number Diff line
@@ -7730,11 +7730,25 @@ public class TelephonyManager { 
     */

    public static final int INDICATION_FILTER_DATA_CALL_DORMANCY_CHANGED    = 0x4;



    /**

     * The indication for link capacity estimate update.

     * @hide

     */

    public static final int INDICATION_FILTER_LINK_CAPACITY_ESTIMATE        = 0x8;



    /**

     * The indication for physical channel config update.

     * @hide

     */

    public static final int INDICATION_FILTER_PHYSICAL_CHANNEL_CONFIG       = 0x10;



    /** @hide */

    @IntDef(flag = true, prefix = { "INDICATION_FILTER_" }, value = {

            INDICATION_FILTER_SIGNAL_STRENGTH,

            INDICATION_FILTER_FULL_NETWORK_STATE,

            INDICATION_FILTER_DATA_CALL_DORMANCY_CHANGED

            INDICATION_FILTER_DATA_CALL_DORMANCY_CHANGED,

            INDICATION_FILTER_LINK_CAPACITY_ESTIMATE,

            INDICATION_FILTER_PHYSICAL_CHANNEL_CONFIG

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface IndicationFilters{}

telephony/java/com/android/internal/telephony/RILConstants.java

+2 −0
Original line number Diff line number Diff line
@@ -419,6 +419,8 @@ cat include/telephony/ril.h | \ 
    int RIL_REQUEST_SET_LOGICAL_TO_PHYSICAL_SLOT_MAPPING = 145;

    int RIL_REQUEST_START_KEEPALIVE = 146;

    int RIL_REQUEST_STOP_KEEPALIVE = 147;

    int RIL_REQUEST_SET_SIGNAL_STRENGTH_REPORTING_CRITERIA = 148;

    int RIL_REQUEST_SET_LINK_CAPACITY_REPORTING_CRITERIA = 149;



    int RIL_RESPONSE_ACKNOWLEDGEMENT = 800;