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

Commit 910a160e authored by Cole Faust's avatar Cole Faust Committed by Automerger Merge Worker
Browse files

Merge "Fix array-related errorprone warnings" am: 1cea8235 am: 09a04d22 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2202672



Change-Id: I4deb33b0e2760461a59a96999735ea29a1cf0683
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 07adc995 09a04d22

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

+3 −3
Original line number Diff line number Diff line
@@ -67,9 +67,9 @@ public class IsimUiccRecords extends IccRecords implements IsimRecords { 
        return "IsimUiccRecords: " + super.toString()

                + (DUMP_RECORDS ? (" mIsimImpi=" + mIsimImpi

                + " mIsimDomain=" + mIsimDomain

                + " mIsimImpu=" + mIsimImpu

                + " mIsimImpu=" + Arrays.toString(mIsimImpu)

                + " mIsimIst=" + mIsimIst

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

                + " mIsimPcscf=" + Arrays.toString(mIsimPcscf)) : "");

    }



    public IsimUiccRecords(UiccCardApplication app, Context c, CommandsInterface ci) {
@@ -437,7 +437,7 @@ public class IsimUiccRecords extends IccRecords implements IsimRecords { 
            pw.println(" mIsimDomain=" + mIsimDomain);

            pw.println(" mIsimImpu[]=" + Arrays.toString(mIsimImpu));

            pw.println(" mIsimIst" + mIsimIst);

            pw.println(" mIsimPcscf" + mIsimPcscf);

            pw.println(" mIsimPcscf" + Arrays.toString(mIsimPcscf));

        }

        pw.flush();

    }

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

+8 −8
Original line number Diff line number Diff line
@@ -102,12 +102,12 @@ public class SIMRecords extends IccRecords { 
                + " mVmConfig" + mVmConfig

                + " callForwardingEnabled=" + mCallForwardingStatus

                + " spnState=" + mSpnState

                + " mCphsInfo=" + mCphsInfo

                + " mCphsInfo=" + IccUtils.bytesToHexString(mCphsInfo)

                + " mCspPlmnEnabled=" + mCspPlmnEnabled

                + " efMWIS=" + mEfMWIS

                + " efCPHS_MWI=" + mEfCPHS_MWI

                + " mEfCff=" + mEfCff

                + " mEfCfis=" + mEfCfis

                + " efMWIS=" + IccUtils.bytesToHexString(mEfMWIS)

                + " efCPHS_MWI=" + IccUtils.bytesToHexString(mEfCPHS_MWI)

                + " mEfCff=" + IccUtils.bytesToHexString(mEfCff)

                + " mEfCfis=" + IccUtils.bytesToHexString(mEfCfis)

                + " getOperatorNumeric=" + getOperatorNumeric();

    }
@@ -1970,7 +1970,7 @@ public class SIMRecords extends IccRecords { 
            // Byte 5 and 6 are for lacTacEnd.

            // Byte 7 is for PNN Record Identifier.

            if (data.length != 8) {

                loge("Invalid length for OPL record " + data);

                loge("Invalid length for OPL record " + IccUtils.bytesToHexString(data));

                continue;

            }
@@ -2118,14 +2118,14 @@ public class SIMRecords extends IccRecords { 
        pw.println(" mVmConfig=" + mVmConfig);

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

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

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

        pw.println(" mCphsInfo=" + IccUtils.bytesToHexString(mCphsInfo));

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

        pw.println(" mEfMWIS[]=" + Arrays.toString(mEfMWIS));

        pw.println(" mEfCPHS_MWI[]=" + Arrays.toString(mEfCPHS_MWI));

        pw.println(" mEfCff[]=" + Arrays.toString(mEfCff));

        pw.println(" mEfCfis[]=" + Arrays.toString(mEfCfis));

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

        pw.println(" mSpdi[]=" + mSpdi);

        pw.println(" mSpdi[]=" + Arrays.toString(mSpdi));

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

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

        if (mCarrierTestOverride.isInTestMode()) {