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

Commit 5309535f authored by Nathan Harold's avatar Nathan Harold Committed by android-build-merger
Browse files

Merge commit 'd6a0c111' into stage-aosp-master am: 54faef7d am: cc2b4326 

am: 1b37ca55

Change-Id: I31dc099d5d4ba5b1d390bfda0d310b2bf6915cac
parents a03076df 1b37ca55

src/java/com/android/internal/telephony/uicc/IccConstants.java

+21 −21
Original line number Diff line number Diff line
@@ -30,21 +30,21 @@ public interface IccConstants { 
    static final int EF_EXT2 = 0x6F4B;

    static final int EF_EXT3 = 0x6F4C;

    static final int EF_EXT5 = 0x6F4E;

    static final int EF_EXT6 = 0x6fc8;   // Ext record for EF[MBDN]

    static final int EF_EXT6 = 0x6FC8;   // Ext record for EF[MBDN]

    static final int EF_MWIS = 0x6FCA;

    static final int EF_MBDN = 0x6fc7;

    static final int EF_PNN = 0x6fc5;

    static final int EF_OPL = 0x6fc6;

    static final int EF_MBDN = 0x6FC7;

    static final int EF_PNN = 0x6FC5;

    static final int EF_OPL = 0x6FC6;

    static final int EF_SPN = 0x6F46;

    static final int EF_SMS = 0x6F3C;

    static final int EF_ICCID = 0x2fe2;

    static final int EF_ICCID = 0x2FE2;

    static final int EF_AD = 0x6FAD;

    static final int EF_MBI = 0x6fc9;

    static final int EF_MSISDN = 0x6f40;

    static final int EF_SPDI = 0x6fcd;

    static final int EF_SST = 0x6f38;

    static final int EF_MBI = 0x6FC9;

    static final int EF_MSISDN = 0x6F40;

    static final int EF_SPDI = 0x6FCD;

    static final int EF_SST = 0x6F38;

    static final int EF_CFIS = 0x6FCB;

    static final int EF_IMG = 0x4f20;

    static final int EF_IMG = 0x4F20;



    // USIM SIM file ids from TS 131.102

    public static final int EF_PBR = 0x4F30;
@@ -54,13 +54,13 @@ public interface IccConstants { 
    static final int EF_MAILBOX_CPHS = 0x6F17;

    static final int EF_VOICE_MAIL_INDICATOR_CPHS = 0x6F11;

    static final int EF_CFF_CPHS = 0x6F13;

    static final int EF_SPN_CPHS = 0x6f14;

    static final int EF_SPN_SHORT_CPHS = 0x6f18;

    static final int EF_INFO_CPHS = 0x6f16;

    static final int EF_CSP_CPHS = 0x6f15;

    static final int EF_SPN_CPHS = 0x6F14;

    static final int EF_SPN_SHORT_CPHS = 0x6F18;

    static final int EF_INFO_CPHS = 0x6F16;

    static final int EF_CSP_CPHS = 0x6F15;



    // CDMA RUIM file ids from 3GPP2 C.S0023-0

    static final int EF_CST = 0x6f32;

    static final int EF_CST = 0x6F32;

    static final int EF_RUIM_SPN =0x6F41;



    // ETSI TS.102.221
@@ -75,12 +75,12 @@ public interface IccConstants { 
    static final int EF_CSIM_MIPUPP = 0x6F4D;



    //ISIM access

    static final int EF_IMPU = 0x6f04;

    static final int EF_IMPI = 0x6f02;

    static final int EF_DOMAIN = 0x6f03;

    static final int EF_IST = 0x6f07;

    static final int EF_PCSCF = 0x6f09;

    static final int EF_PSI = 0x6fe5;

    static final int EF_IMPU = 0x6F04;

    static final int EF_IMPI = 0x6F02;

    static final int EF_DOMAIN = 0x6F03;

    static final int EF_IST = 0x6F07;

    static final int EF_PCSCF = 0x6F09;

    static final int EF_PSI = 0x6FE5;



    // SMS record length from TS 51.011 10.5.3

    static public final int SMS_RECORD_LENGTH = 176;

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

+5 −27
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ public abstract class IccRecords extends Handler implements IccConstants { 
    public static final int SPN_RULE_SHOW_PLMN = 0x02;



    // ***** Event Constants

    protected static final int EVENT_SET_MSISDN_DONE = 30;

    public static final int EVENT_MWI = 0; // Message Waiting indication

    public static final int EVENT_CFI = 1; // Call Forwarding indication

    public static final int EVENT_SPN = 2; // Service Provider Name
@@ -328,34 +327,13 @@ public abstract class IccRecords extends Handler implements IccConstants { 
        return null;

    }



    /**

     * Set subscriber number to SIM record

     *

     * The subscriber number is stored in EF_MSISDN (TS 51.011)

     *

     * When the operation is complete, onComplete will be sent to its handler

     *

     * @param alphaTag alpha-tagging of the dailing nubmer (up to 10 characters)

     * @param number dailing nubmer (up to 20 digits)

     *        if the number starts with '+', then set to international TOA

     * @param onComplete

     *        onComplete.obj will be an AsyncResult

     *        ((AsyncResult)onComplete.obj).exception == null on success

     *        ((AsyncResult)onComplete.obj).exception != null on fail

     */

    public void setMsisdnNumber(String alphaTag, String number,

            Message onComplete) {



        mMsisdn = number;

        mMsisdnTag = alphaTag;



        if (DBG) log("Set MSISDN: " + mMsisdnTag +" " + mMsisdn);





        AdnRecord adn = new AdnRecord(mMsisdnTag, mMsisdn);



        new AdnRecordLoader(mFh).updateEF(adn, EF_MSISDN, EF_EXT1, 1, null,

                obtainMessage(EVENT_SET_MSISDN_DONE, onComplete));

        loge("setMsisdn() should not be invoked on base IccRecords");

        // synthesize a "File Not Found" exception and return it

        AsyncResult.forMessage(onComplete).exception =

            (new IccIoResult(0x6A, 0x82, (byte[]) null)).getException();

        onComplete.sendToTarget();

    }



    public String getMsisdnAlphaTag() {

src/java/com/android/internal/telephony/uicc/SIMFileHandler.java

+0 −2
Original line number Diff line number Diff line
@@ -56,8 +56,6 @@ public final class SIMFileHandler extends IccFileHandler implements IccConstants 
        case EF_CFIS:

        case EF_GID1:

        case EF_GID2:

            return MF_SIM + DF_GSM;



        case EF_MAILBOX_CPHS:

        case EF_VOICE_MAIL_INDICATOR_CPHS:

        case EF_CFF_CPHS:

src/java/com/android/internal/telephony/uicc/SIMRecords.java

+38 −32
Original line number Diff line number Diff line
@@ -20,15 +20,15 @@ import android.content.BroadcastReceiver; 
import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.res.Resources;

import android.os.AsyncResult;

import android.os.Message;

import android.telephony.CarrierConfigManager;

import android.telephony.PhoneNumberUtils;

import android.telephony.Rlog;

import android.telephony.SmsMessage;

import android.telephony.SubscriptionInfo;

import android.text.TextUtils;

import android.telephony.Rlog;

import android.content.res.Resources;



import com.android.internal.telephony.CommandsInterface;

import com.android.internal.telephony.MccTable;
@@ -137,36 +137,42 @@ public class SIMRecords extends IccRecords { 
    private static final int CFIS_ADN_EXTENSION_ID_OFFSET = 15;



    // ***** Event Constants

    private static final int EVENT_GET_IMSI_DONE = 3;

    private static final int EVENT_GET_ICCID_DONE = 4;

    private static final int EVENT_GET_MBI_DONE = 5;

    private static final int EVENT_GET_MBDN_DONE = 6;

    private static final int EVENT_GET_MWIS_DONE = 7;

    private static final int EVENT_GET_VOICE_MAIL_INDICATOR_CPHS_DONE = 8;

    protected static final int EVENT_GET_AD_DONE = 9; // Admin data on SIM

    protected static final int EVENT_GET_MSISDN_DONE = 10;

    private static final int EVENT_GET_CPHS_MAILBOX_DONE = 11;

    private static final int EVENT_GET_SPN_DONE = 12;

    private static final int EVENT_GET_SPDI_DONE = 13;

    private static final int EVENT_UPDATE_DONE = 14;

    private static final int EVENT_GET_PNN_DONE = 15;

    protected static final int EVENT_GET_SST_DONE = 17;

    private static final int EVENT_GET_ALL_SMS_DONE = 18;

    private static final int EVENT_MARK_SMS_READ_DONE = 19;

    private static final int EVENT_SET_MBDN_DONE = 20;

    private static final int EVENT_SMS_ON_SIM = 21;

    private static final int EVENT_GET_SMS_DONE = 22;

    private static final int EVENT_GET_CFF_DONE = 24;

    private static final int EVENT_SET_CPHS_MAILBOX_DONE = 25;

    private static final int EVENT_GET_INFO_CPHS_DONE = 26;

    // private static final int EVENT_SET_MSISDN_DONE = 30; Defined in IccRecords as 30

    private static final int EVENT_SIM_REFRESH = 31;

    private static final int EVENT_GET_CFIS_DONE = 32;

    private static final int EVENT_GET_CSP_CPHS_DONE = 33;

    private static final int EVENT_GET_GID1_DONE = 34;

    private static final int EVENT_APP_LOCKED = 35;

    private static final int EVENT_GET_GID2_DONE = 36;

    private static final int EVENT_CARRIER_CONFIG_CHANGED = 37;

    private static final int SIM_RECORD_EVENT_BASE = 0x00;

    private static final int EVENT_GET_IMSI_DONE = 3 + SIM_RECORD_EVENT_BASE;

    private static final int EVENT_GET_ICCID_DONE = 4 + SIM_RECORD_EVENT_BASE;

    private static final int EVENT_GET_MBI_DONE = 5 + SIM_RECORD_EVENT_BASE;

    private static final int EVENT_GET_MBDN_DONE = 6 + SIM_RECORD_EVENT_BASE;

    private static final int EVENT_GET_MWIS_DONE = 7 + SIM_RECORD_EVENT_BASE;

    private static final int EVENT_GET_VOICE_MAIL_INDICATOR_CPHS_DONE = 8 + SIM_RECORD_EVENT_BASE;

    private static final int EVENT_GET_AD_DONE = 9 + SIM_RECORD_EVENT_BASE; // Admin data on SIM

    private static final int EVENT_GET_MSISDN_DONE = 10 + SIM_RECORD_EVENT_BASE;

    private static final int EVENT_GET_CPHS_MAILBOX_DONE = 11 + SIM_RECORD_EVENT_BASE;

    private static final int EVENT_GET_SPN_DONE = 12 + SIM_RECORD_EVENT_BASE;

    private static final int EVENT_GET_SPDI_DONE = 13 + SIM_RECORD_EVENT_BASE;

    private static final int EVENT_UPDATE_DONE = 14 + SIM_RECORD_EVENT_BASE;

    private static final int EVENT_GET_PNN_DONE = 15 + SIM_RECORD_EVENT_BASE;

    private static final int EVENT_GET_SST_DONE = 17 + SIM_RECORD_EVENT_BASE;

    private static final int EVENT_GET_ALL_SMS_DONE = 18 + SIM_RECORD_EVENT_BASE;

    private static final int EVENT_MARK_SMS_READ_DONE = 19 + SIM_RECORD_EVENT_BASE;

    private static final int EVENT_SET_MBDN_DONE = 20 + SIM_RECORD_EVENT_BASE;

    private static final int EVENT_SMS_ON_SIM = 21 + SIM_RECORD_EVENT_BASE;

    private static final int EVENT_GET_SMS_DONE = 22 + SIM_RECORD_EVENT_BASE;

    private static final int EVENT_GET_CFF_DONE = 24 + SIM_RECORD_EVENT_BASE;

    private static final int EVENT_SET_CPHS_MAILBOX_DONE = 25 + SIM_RECORD_EVENT_BASE;

    private static final int EVENT_GET_INFO_CPHS_DONE = 26 + SIM_RECORD_EVENT_BASE;

    private static final int EVENT_SET_MSISDN_DONE = 30 + SIM_RECORD_EVENT_BASE;

    private static final int EVENT_GET_CFIS_DONE = 32 + SIM_RECORD_EVENT_BASE;

    private static final int EVENT_GET_CSP_CPHS_DONE = 33 + SIM_RECORD_EVENT_BASE;

    private static final int EVENT_GET_GID1_DONE = 34 + SIM_RECORD_EVENT_BASE;

    private static final int EVENT_GET_GID2_DONE = 36 + SIM_RECORD_EVENT_BASE;



    // TODO: Possibly move these to IccRecords.java

    private static final int SYSTEM_EVENT_BASE = 0x100;

    private static final int EVENT_CARRIER_CONFIG_CHANGED = 1 + SYSTEM_EVENT_BASE;

    private static final int EVENT_APP_LOCKED = 2 + SYSTEM_EVENT_BASE;

    private static final int EVENT_SIM_REFRESH = 3 + SYSTEM_EVENT_BASE;







    // Lookup table for carriers known to produce SIMs which incorrectly indicate MNC length.