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

Commit 3f06110d authored by Jake Hamby's avatar Jake Hamby Committed by Android (Google) Code Review
Browse files

Merge "Add support for SMS-PP data download to USIM."

parents cfb9df67 ac09d2af

telephony/java/com/android/internal/telephony/CommandsInterface.java

+2 −0
Original line number Diff line number Diff line
@@ -157,6 +157,8 @@ public interface CommandsInterface { 


    // GSM SMS fail cause for acknowledgeLastIncomingSMS. From TS 23.040, 9.2.3.22.

    static final int GSM_SMS_FAIL_CAUSE_MEMORY_CAPACITY_EXCEEDED    = 0xD3;

    static final int GSM_SMS_FAIL_CAUSE_USIM_APP_TOOLKIT_BUSY       = 0xD4;

    static final int GSM_SMS_FAIL_CAUSE_USIM_DATA_DOWNLOAD_ERROR    = 0xD5;

    static final int GSM_SMS_FAIL_CAUSE_UNSPECIFIED_ERROR           = 0xFF;



    // CDMA SMS fail cause for acknowledgeLastIncomingCdmaSms.  From TS N.S0005, 6.5.2.125.

telephony/java/com/android/internal/telephony/IccIoResult.java

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ package com.android.internal.telephony; 
 */

public class

IccIoResult {

    int sw1;

    int sw2;

    public int sw1;

    public int sw2;



    public byte[] payload;

telephony/java/com/android/internal/telephony/IccRecords.java

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.os.Message; 
import android.os.Registrant;

import android.os.RegistrantList;



import com.android.internal.telephony.gsm.UsimServiceTable;

import com.android.internal.telephony.ims.IsimRecords;



/**
@@ -362,4 +363,8 @@ public abstract class IccRecords extends Handler implements IccConstants { 
    public IsimRecords getIsimRecords() {

        return null;

    }



    public UsimServiceTable getUsimServiceTable() {

        return null;

    }

}

telephony/java/com/android/internal/telephony/Phone.java

+7 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.telephony.ServiceState; 
import android.telephony.SignalStrength;



import com.android.internal.telephony.DataConnection;

import com.android.internal.telephony.gsm.UsimServiceTable;

import com.android.internal.telephony.ims.IsimRecords;

import com.android.internal.telephony.test.SimulatedRadioControl;
@@ -1765,4 +1766,10 @@ public interface Phone { 
     *                      messages are waiting

     */

    void setVoiceMessageWaiting(int line, int countWaiting);



    /**

     * Gets the USIM service table from the UICC, if present and available.

     * @return an interface to the UsimServiceTable record, or null if not available

     */

    UsimServiceTable getUsimServiceTable();

}

telephony/java/com/android/internal/telephony/PhoneBase.java

+10 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import android.text.TextUtils; 
import android.util.Log;



import com.android.internal.R;

import com.android.internal.telephony.gsm.UsimServiceTable;

import com.android.internal.telephony.ims.IsimRecords;

import com.android.internal.telephony.test.SimulatedRadioControl;

import com.android.internal.telephony.gsm.SIMRecords;
@@ -1178,4 +1179,13 @@ public abstract class PhoneBase extends Handler implements Phone { 
    public void setVoiceMessageWaiting(int line, int countWaiting) {

        mIccRecords.setVoiceMessageWaiting(line, countWaiting);

    }



    /**

     * Gets the USIM service table from the UICC, if present and available.

     * @return an interface to the UsimServiceTable record, or null if not available

     */

    @Override

    public UsimServiceTable getUsimServiceTable() {

        return mIccRecords.getUsimServiceTable();

    }

}