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

Commit 5557c28a authored by Cole Faust's avatar Cole Faust
Browse files

Fix array-related errorprone warnings 

The ArrayEquals, ArrayHashCode, ArrayToString, and
ArraysAsListPrimitiveArray errorprone findings were
demoted from errors to warnings. Fix existing
occurrences of them so they can be made errors again.

Bug: 242630963
Test: RUN_ERROR_PRONE=true m javac-check
Change-Id: I110410571e92b4ec41682e45692fe0751d685ac2
parent 76fd34ed

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

+2 −2
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 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=" + Arrays.toString(mIsimPcscf)

                + " mPsiSmsc=" + mPsiSmsc
@@ -494,7 +494,7 @@ public class IsimUiccRecords extends IccRecords implements IsimRecords { 
            pw.println(" mIsimImpi=" + mIsimImpi);

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

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

            pw.println(" mIsimPcscf" + mIsimPcscf);

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

            pw.println(" mPsismsc=" + mPsiSmsc);

            pw.println(" mSmss TPMR=" + getSmssTpmrValue());

        }

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

+8 −8
Original line number Diff line number Diff line
@@ -105,12 +105,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()

                + " mPsiSmsc=" + mPsiSmsc

                + " TPMR=" + getSmssTpmrValue();
@@ -2043,7 +2043,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;

            }
@@ -2196,14 +2196,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()) {