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

Commit 5a68da34 authored by Amit Mahajan's avatar Amit Mahajan Committed by Android (Google) Code Review
Browse files

Merge "Change to not log IMSI." into mnc-dev

parents 61952e69 a1421a82

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

+4 −3
Original line number Diff line number Diff line
@@ -1604,14 +1604,15 @@ public abstract class PhoneBase extends Handler implements Phone { 
        String subscriberId = sp.getString(VM_ID, null);

        String currentSubscriberId = getSubscriberId();



        Rlog.d(LOG_TAG, "Voicemail count retrieval for subscriberId = " + subscriberId +

                " current subscriberId = " + currentSubscriberId);



        if ((subscriberId != null) && (currentSubscriberId != null)

                && (currentSubscriberId.equals(subscriberId))) {

            // get voice mail count from preferences

            countVoiceMessages = sp.getInt(VM_COUNT, 0);

            Rlog.d(LOG_TAG, "Voice Mail Count from preference = " + countVoiceMessages);

        } else {

            Rlog.d(LOG_TAG, "Voicemail count retrieval returning 0 as count for matching " +

                    "subscriberId not found");



        }

        return countVoiceMessages;

    }

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

+3 −2
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import java.util.concurrent.atomic.AtomicBoolean; 
 */

public abstract class IccRecords extends Handler implements IccConstants {

    protected static final boolean DBG = true;

    protected static final boolean VDBG = false; // STOPSHIP if true



    // ***** Instance Variables

    protected AtomicBoolean mDestroyed = new AtomicBoolean(false);
@@ -129,7 +130,7 @@ public abstract class IccRecords extends Handler implements IccConstants { 
                + " newVoiceMailNum=" + mNewVoiceMailNum

                + " newVoiceMailTag=" + mNewVoiceMailTag

                + " isVoiceMailFixed=" + mIsVoiceMailFixed

                + " mImsi=" + mImsi

                + (VDBG ? (" mImsi=" + mImsi) : "")

                + " mncLength=" + mMncLength

                + " mailboxIndex=" + mMailboxIndex

                + " spn=" + mSpn;
@@ -719,7 +720,7 @@ public abstract class IccRecords extends Handler implements IccConstants { 
        pw.println(" mNewVoiceMailNum=" + mNewVoiceMailNum);

        pw.println(" mNewVoiceMailTag=" + mNewVoiceMailTag);

        pw.println(" mIsVoiceMailFixed=" + mIsVoiceMailFixed);

        pw.println(" mImsi=" + mImsi);

        if (VDBG) pw.println(" mImsi=" + mImsi);

        pw.println(" mMncLength=" + mMncLength);

        pw.println(" mMailboxIndex=" + mMailboxIndex);

        pw.println(" mSpn=" + mSpn);

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

+6 −5
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ public final class IsimUiccRecords extends IccRecords implements IsimRecords { 
    protected static final String LOG_TAG = "IsimUiccRecords";



    private static final boolean DBG = true;

    private static final boolean DUMP_RECORDS = true;   // Note: PII is logged when this is true

    private static final boolean DUMP_RECORDS = false;  // Note: PII is logged when this is true

                                                        // STOPSHIP if true

    public static final String INTENT_ISIM_REFRESH = "com.android.intent.isim_refresh";



    private static final int EVENT_APP_READY = 1;
@@ -69,11 +70,11 @@ public final class IsimUiccRecords extends IccRecords implements IsimRecords { 
    @Override

    public String toString() {

        return "IsimUiccRecords: " + super.toString()

                + " mIsimImpi=" + mIsimImpi

                + (DUMP_RECORDS ? (" mIsimImpi=" + mIsimImpi

                + " mIsimDomain=" + mIsimDomain

                + " mIsimImpu=" + mIsimImpu

                + " mIsimIst=" + mIsimIst

                + " mIsimPcscf=" + mIsimPcscf;

                + " mIsimPcscf=" + mIsimPcscf) : "");

    }



    public IsimUiccRecords(UiccCardApplication app, Context c, CommandsInterface ci) {

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

+1 −1
Original line number Diff line number Diff line
@@ -772,7 +772,7 @@ public final class RuimRecords extends IccRecords { 
            }



            if (!TextUtils.isEmpty(mImsi)) {

                log("onAllRecordsLoaded set mcc imsi=" + mImsi);

                log("onAllRecordsLoaded set mcc imsi=" + (VDBG ? ("=" + mImsi) : ""));

                mTelephonyManager.setSimCountryIsoForPhone(

                        mParentApp.getPhoneId(),

                        MccTable.countryCodeForMcc(

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

+1 −1
Original line number Diff line number Diff line
@@ -1464,7 +1464,7 @@ public class SIMRecords extends IccRecords { 
        }



        if (!TextUtils.isEmpty(mImsi)) {

            log("onAllRecordsLoaded set mcc imsi=" + mImsi);

            log("onAllRecordsLoaded set mcc imsi" + (VDBG ? ("=" + mImsi) : ""));

            mTelephonyManager.setSimCountryIsoForPhone(

                    mParentApp.getPhoneId(), MccTable.countryCodeForMcc(

                    Integer.parseInt(mImsi.substring(0,3))));