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

Commit 5de75c7d authored by Cole Faust's avatar Cole Faust Committed by Gerrit Code Review
Browse files

Merge "Fix array-related errorprone warnings"

parents d592e5e1 dd583fc1

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

+3 −3
Original line number Diff line number Diff line
@@ -625,9 +625,9 @@ public class IccSmsInterfaceManager { 
        }



        if (Rlog.isLoggable("SMS", Log.VERBOSE)) {

            log("pdu: " + pdu +

                "\n format=" + format +

                "\n receivedIntent=" + receivedIntent);

            log("pdu: " + IccUtils.bytesToHexString(pdu)

                    + "\n format=" + format

                    + "\n receivedIntent=" + receivedIntent);

        }

        mDispatchersController.injectSmsPdu(pdu, format, false /* isOverIms */,

                result -> {

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

+3 −4
Original line number Diff line number Diff line
@@ -5333,8 +5333,7 @@ public class ServiceStateTracker extends Handler { 
        pw.println(" mNewSS=" + mNewSS);

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

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

        pw.println(" mPollingContext=" + mPollingContext + " - " +

                (mPollingContext != null ? mPollingContext[0] : ""));

        pw.println(" mPollingContext=" + Arrays.toString(mPollingContext));

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

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

        pw.println(" mPendingRadioPowerOffAfterDataOff=" + mPendingRadioPowerOffAfterDataOff);
@@ -5373,8 +5372,8 @@ public class ServiceStateTracker extends Handler { 
        pw.println(" mDefaultRoamingIndicator=" + mDefaultRoamingIndicator);

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

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

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

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

        pw.println(" mHomeSystemId=" + Arrays.toString(mHomeSystemId));

        pw.println(" mHomeNetworkId=" + Arrays.toString(mHomeNetworkId));

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

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

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

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

+2 −3
Original line number Diff line number Diff line
@@ -616,7 +616,6 @@ public class SubscriptionController extends ISub.Stub { 
                    + " publicCardId:" + publicCardId

                    + " isOpportunistic:" + isOpportunistic + " groupUUID:" + groupUUID

                    + " profileClass:" + profileClass + " subscriptionType: " + subType

                    + " carrierConfigAccessRules:" + carrierConfigAccessRules

                    + " areUiccApplicationsEnabled: " + areUiccApplicationsEnabled

                    + " usageSetting: " + usageSetting);

        }
@@ -2661,7 +2660,7 @@ public class SubscriptionController extends ISub.Stub { 
            for (int i = 0; i < subIds.size(); i++) {

                subIdArr[i] = subIds.get(i);

            }

            if (VDBG) logd("[getSubId]- subIdArr=" + subIdArr);

            if (VDBG) logd("[getSubId]- subIdArr=" + Arrays.toString(subIdArr));

            return subIdArr;

        } else {

            if (DBG) logd("[getSubId]- numSubIds == 0, return null slotIndex=" + slotIndex);
@@ -3642,7 +3641,7 @@ public class SubscriptionController extends ISub.Stub { 
    @Override

    public ParcelUuid createSubscriptionGroup(int[] subIdList, String callingPackage) {

        if (subIdList == null || subIdList.length == 0) {

            throw new IllegalArgumentException("Invalid subIdList " + subIdList);

            throw new IllegalArgumentException("Invalid subIdList " + Arrays.toString(subIdList));

        }



        // Makes sure calling package matches caller UID.

src/java/com/android/internal/telephony/gsm/SuppServiceNotification.java

+3 −1
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.internal.telephony.gsm; 


import android.telephony.PhoneNumberUtils;



import java.util.Arrays;



/**

 * Represents a Supplementary Service Notification received from the network.

 *
@@ -200,7 +202,7 @@ public class SuppServiceNotification { 
            + (notificationType == 0 ? " originated " : " terminated ")

            + " code: " + code

            + " index: " + index

            + " history: " + history

            + " history: " + Arrays.toString(history)

            + " \""

            + PhoneNumberUtils.stringFromStringAndTOA(number, type) + "\" ";

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -81,8 +81,8 @@ public class RuimRecords extends IccRecords { 
                + " mMyMobileNumber=" + "xxxx"

                + " mMin2Min1=" + mMin2Min1

                + " mPrlVersion=" + mPrlVersion

                + " mEFpl=" + mEFpl

                + " mEFli=" + mEFli

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

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

                + " mCsimSpnDisplayCondition=" + mCsimSpnDisplayCondition

                + " mMdn=" + mMdn

                + " mMin=" + mMin