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

Commit 8718e42d authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by android-build-merger
Browse files

Merge "Connect IRadioConfig 1.1 HAL interfaces with RadioConfig.java" am: 5c196847 

am: 112d88e5

Change-Id: I4830219aefbf7e2fc0d2e1573e7d60479af0dfab
parents d0436c71 112d88e5

telephony/java/android/telephony/ModemInfo.java

+5 −0
Original line number Diff line number Diff line
@@ -32,6 +32,11 @@ public class ModemInfo implements Parcelable { 
    public final boolean isVoiceSupported;

    public final boolean isDataSupported;



    // TODO b/121394331: Clean up this class after V1_1.PhoneCapability cleanup.

    public ModemInfo(int modemId) {

        this(modemId, 0, true, true);

    }



    public ModemInfo(int modemId, int rat, boolean isVoiceSupported, boolean isDataSupported) {

        this.modemId = modemId;

        this.rat = rat;

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

+1 −0
Original line number Diff line number Diff line
@@ -422,6 +422,7 @@ public interface RILConstants { 
    int RIL_REQUEST_SET_LINK_CAPACITY_REPORTING_CRITERIA = 203;

    int RIL_REQUEST_SET_PREFERRED_DATA_MODEM = 204;

    int RIL_REQUEST_EMERGENCY_DIAL = 205;

    int RIL_REQUEST_GET_PHONE_CAPABILITY = 206;



    /* Responses begin */

    int RIL_RESPONSE_ACKNOWLEDGEMENT = 800;