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

Commit d674288e authored by Simon MacMullen's avatar Simon MacMullen
Browse files

RIL instrumentation 

Add atrace invocations for each RPC and unsolicited message from the
CP, similar to how we already log.

Bug: 240667497
Test: Recorded a trace.

Change-Id: I552c16e99d72211c36a46e94926e5d67852bed01
(cherry picked from commit f8de86cf)
parent 4c5c285d

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

+10 −7
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ public class DataIndication extends IRadioDataIndication.Stub { 
            android.hardware.radio.data.SetupDataCallResult[] dcList) {

        mRil.processIndication(RIL.DATA_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_DATA_CALL_LIST_CHANGED, dcList);

        if (mRil.isLogOrTrace()) mRil.unsljLogRet(RIL_UNSOL_DATA_CALL_LIST_CHANGED, dcList);

        ArrayList<DataCallResponse> response = RILUtils.convertHalDataCallResultList(dcList);

        mRil.mDataCallListChangedRegistrants.notifyRegistrants(

                new AsyncResult(null, response, null));
@@ -70,9 +70,10 @@ public class DataIndication extends IRadioDataIndication.Stub { 
            android.hardware.radio.data.KeepaliveStatus halStatus) {

        mRil.processIndication(RIL.DATA_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) {

            mRil.unsljLogRet(RIL_UNSOL_KEEPALIVE_STATUS, "handle=" + halStatus.sessionHandle

                    + " code=" +  halStatus.code);

        if (mRil.isLogOrTrace()) {

            mRil.unsljLogRet(

                    RIL_UNSOL_KEEPALIVE_STATUS,

                    "handle=" + halStatus.sessionHandle + " code=" + halStatus.code);

        }



        KeepaliveStatus ks = new KeepaliveStatus(
@@ -90,7 +91,7 @@ public class DataIndication extends IRadioDataIndication.Stub { 


        PcoData response = new PcoData(pco.cid, pco.bearerProto, pco.pcoId, pco.contents);



        if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_PCO_DATA, response);

        if (mRil.isLogOrTrace()) mRil.unsljLogRet(RIL_UNSOL_PCO_DATA, response);



        mRil.mPcoDataRegistrants.notifyRegistrants(new AsyncResult(null, response, null));

    }
@@ -106,7 +107,7 @@ public class DataIndication extends IRadioDataIndication.Stub { 
        mRil.processIndication(RIL.DATA_SERVICE, indicationType);

        DataProfile response = RILUtils.convertToDataProfile(dpi);



        if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_UNTHROTTLE_APN, response);

        if (mRil.isLogOrTrace()) mRil.unsljLogRet(RIL_UNSOL_UNTHROTTLE_APN, response);



        mRil.mApnUnthrottledRegistrants.notifyRegistrants(new AsyncResult(null, response, null));

    }
@@ -120,7 +121,9 @@ public class DataIndication extends IRadioDataIndication.Stub { 
    public void slicingConfigChanged(int indicationType,

            android.hardware.radio.data.SlicingConfig slicingConfig) throws RemoteException {

        mRil.processIndication(RIL.DATA_SERVICE, indicationType);

        if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_SLICING_CONFIG_CHANGED, slicingConfig);

        if (mRil.isLogOrTrace()) {

            mRil.unsljLogRet(RIL_UNSOL_SLICING_CONFIG_CHANGED, slicingConfig);

        }

        NetworkSlicingConfig ret = RILUtils.convertHalSlicingConfig(slicingConfig);

        mRil.mSlicingConfigChangedRegistrants.notifyRegistrants(

                new AsyncResult(null, ret, null));

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

+9 −9
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ public class MessagingIndication extends IRadioMessagingIndication.Stub { 
            android.hardware.radio.messaging.CdmaSmsMessage msg) {

        mRil.processIndication(RIL.MESSAGING_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) mRil.unsljLog(RIL_UNSOL_RESPONSE_CDMA_NEW_SMS);

        if (mRil.isLogOrTrace()) mRil.unsljLog(RIL_UNSOL_RESPONSE_CDMA_NEW_SMS);



        SmsMessage sms = new SmsMessage(RILUtils.convertHalCdmaSmsMessage(msg));

        if (mRil.mCdmaSmsRegistrant != null) {
@@ -65,7 +65,7 @@ public class MessagingIndication extends IRadioMessagingIndication.Stub { 
    public void cdmaRuimSmsStorageFull(int indicationType) {

        mRil.processIndication(RIL.MESSAGING_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) mRil.unsljLog(RIL_UNSOL_CDMA_RUIM_SMS_STORAGE_FULL);

        if (mRil.isLogOrTrace()) mRil.unsljLog(RIL_UNSOL_CDMA_RUIM_SMS_STORAGE_FULL);



        if (mRil.mIccSmsFullRegistrant != null) {

            mRil.mIccSmsFullRegistrant.notifyRegistrant();
@@ -84,9 +84,9 @@ public class MessagingIndication extends IRadioMessagingIndication.Stub { 
    public void newBroadcastSms(int indicationType, byte[] data) {

        mRil.processIndication(RIL.MESSAGING_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) {

            mRil.unsljLogvRet(RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS,

                    IccUtils.bytesToHexString(data));

        if (mRil.isLogOrTrace()) {

            mRil.unsljLogvRet(

                    RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS, IccUtils.bytesToHexString(data));

        }



        if (mRil.mGsmBroadcastSmsRegistrant != null) {
@@ -102,7 +102,7 @@ public class MessagingIndication extends IRadioMessagingIndication.Stub { 
     */

    public void newSms(int indicationType, byte[] pdu) {

        mRil.processIndication(RIL.MESSAGING_SERVICE, indicationType);

        if (RIL.RILJ_LOGD) mRil.unsljLog(RIL_UNSOL_RESPONSE_NEW_SMS);

        if (mRil.isLogOrTrace()) mRil.unsljLog(RIL_UNSOL_RESPONSE_NEW_SMS);



        SmsMessageBase smsb = com.android.internal.telephony.gsm.SmsMessage.createFromPdu(pdu);

        if (mRil.mGsmSmsRegistrant != null) {
@@ -119,7 +119,7 @@ public class MessagingIndication extends IRadioMessagingIndication.Stub { 
    public void newSmsOnSim(int indicationType, int recordNumber) {

        mRil.processIndication(RIL.MESSAGING_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) mRil.unsljLog(RIL_UNSOL_RESPONSE_NEW_SMS_ON_SIM);

        if (mRil.isLogOrTrace()) mRil.unsljLog(RIL_UNSOL_RESPONSE_NEW_SMS_ON_SIM);



        if (mRil.mSmsOnSimRegistrant != null) {

            mRil.mSmsOnSimRegistrant.notifyRegistrant(new AsyncResult(null, recordNumber, null));
@@ -135,7 +135,7 @@ public class MessagingIndication extends IRadioMessagingIndication.Stub { 
    public void newSmsStatusReport(int indicationType, byte[] pdu) {

        mRil.processIndication(RIL.MESSAGING_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) mRil.unsljLog(RIL_UNSOL_RESPONSE_NEW_SMS_STATUS_REPORT);

        if (mRil.isLogOrTrace()) mRil.unsljLog(RIL_UNSOL_RESPONSE_NEW_SMS_STATUS_REPORT);



        if (mRil.mSmsStatusRegistrant != null) {

            mRil.mSmsStatusRegistrant.notifyRegistrant(new AsyncResult(null, pdu, null));
@@ -151,7 +151,7 @@ public class MessagingIndication extends IRadioMessagingIndication.Stub { 
    public void simSmsStorageFull(int indicationType) {

        mRil.processIndication(RIL.MESSAGING_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) mRil.unsljLog(RIL_UNSOL_SIM_SMS_STORAGE_FULL);

        if (mRil.isLogOrTrace()) mRil.unsljLog(RIL_UNSOL_SIM_SMS_STORAGE_FULL);



        if (mRil.mIccSmsFullRegistrant != null) {

            mRil.mIccSmsFullRegistrant.notifyRegistrant();

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

+7 −7
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ public class ModemIndication extends IRadioModemIndication.Stub { 


        ArrayList<HardwareConfig> response = RILUtils.convertHalHardwareConfigList(configs);



        if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_HARDWARE_CONFIG_CHANGED, response);

        if (mRil.isLogOrTrace()) mRil.unsljLogRet(RIL_UNSOL_HARDWARE_CONFIG_CHANGED, response);



        mRil.mHardwareConfigChangeRegistrants.notifyRegistrants(

                new AsyncResult(null, response, null));
@@ -64,7 +64,7 @@ public class ModemIndication extends IRadioModemIndication.Stub { 
    public void modemReset(int indicationType, String reason) {

        mRil.processIndication(RIL.MODEM_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_MODEM_RESTART, reason);

        if (mRil.isLogOrTrace()) mRil.unsljLogRet(RIL_UNSOL_MODEM_RESTART, reason);



        mRil.writeMetricsModemRestartEvent(reason);

        mRil.mModemResetRegistrants.notifyRegistrants(new AsyncResult(null, reason, null));
@@ -82,7 +82,7 @@ public class ModemIndication extends IRadioModemIndication.Stub { 


        RadioCapability response = RILUtils.convertHalRadioCapability(radioCapability, mRil);



        if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_RADIO_CAPABILITY, response);

        if (mRil.isLogOrTrace()) mRil.unsljLogRet(RIL_UNSOL_RADIO_CAPABILITY, response);



        mRil.mPhoneRadioCapabilityChangedRegistrants.notifyRegistrants(

                new AsyncResult(null, response, null));
@@ -97,9 +97,9 @@ public class ModemIndication extends IRadioModemIndication.Stub { 
        mRil.processIndication(RIL.MODEM_SERVICE, indicationType);



        int state = RILUtils.convertHalRadioState(radioState);

        if (RIL.RILJ_LOGD) {

            mRil.unsljLogMore(RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED, "radioStateChanged: "

                    + state);

        if (mRil.isLogOrTrace()) {

            mRil.unsljLogMore(

                    RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED, "radioStateChanged: " + state);

        }



        mRil.setRadioState(state, false /* forceNotifyRegistrants */);
@@ -112,7 +112,7 @@ public class ModemIndication extends IRadioModemIndication.Stub { 
    public void rilConnected(int indicationType) {

        mRil.processIndication(RIL.MODEM_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) mRil.unsljLog(RIL_UNSOL_RIL_CONNECTED);

        if (mRil.isLogOrTrace()) mRil.unsljLog(RIL_UNSOL_RIL_CONNECTED);



        // Initial conditions

        mRil.setRadioPower(false, null);

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

+17 −13
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 


        int[] response = new int[]{version};



        if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_CDMA_PRL_CHANGED, response);

        if (mRil.isLogOrTrace()) mRil.unsljLogRet(RIL_UNSOL_CDMA_PRL_CHANGED, response);



        mRil.mCdmaPrlChangedRegistrants.notifyRegistrants(new AsyncResult(null, response, null));

    }
@@ -111,7 +111,7 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 
            android.hardware.radio.network.CellInfo[] records) {

        mRil.processIndication(RIL.NETWORK_SERVICE, indicationType);

        ArrayList<CellInfo> response = RILUtils.convertHalCellInfoList(records);

        if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_CELL_INFO_LIST, response);

        if (mRil.isLogOrTrace()) mRil.unsljLogRet(RIL_UNSOL_CELL_INFO_LIST, response);

        mRil.mRilCellInfoListRegistrants.notifyRegistrants(new AsyncResult(null, response, null));

    }
@@ -126,7 +126,7 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 


        List<LinkCapacityEstimate> response = RILUtils.convertHalLceData(lce);



        if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_LCEDATA_RECV, response);

        if (mRil.isLogOrTrace()) mRil.unsljLogRet(RIL_UNSOL_LCEDATA_RECV, response);



        if (mRil.mLceInfoRegistrants != null) {

            mRil.mLceInfoRegistrants.notifyRegistrants(new AsyncResult(null, response, null));
@@ -178,7 +178,7 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 
            mRil.riljLoge("Invalid PhysicalChannelConfig " + iae);

            return;

        }

        if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_PHYSICAL_CHANNEL_CONFIG, response);

        if (mRil.isLogOrTrace()) mRil.unsljLogRet(RIL_UNSOL_PHYSICAL_CHANNEL_CONFIG, response);



        mRil.mPhysicalChannelConfigurationRegistrants.notifyRegistrants(

                new AsyncResult(null, response, null));
@@ -197,7 +197,7 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 


        SignalStrength ss = mRil.fixupSignalStrength10(ssInitial);

        // Note this is set to "verbose" because it happens frequently

        if (RIL.RILJ_LOGV) mRil.unsljLogvRet(RIL_UNSOL_SIGNAL_STRENGTH, ss);

        if (mRil.isLogvOrTrace()) mRil.unsljLogvRet(RIL_UNSOL_SIGNAL_STRENGTH, ss);



        if (mRil.mSignalStrengthRegistrant != null) {

            mRil.mSignalStrengthRegistrant.notifyRegistrant(new AsyncResult(null, ss, null));
@@ -211,7 +211,7 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 
    public void imsNetworkStateChanged(int indicationType) {

        mRil.processIndication(RIL.NETWORK_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) mRil.unsljLog(RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED);

        if (mRil.isLogOrTrace()) mRil.unsljLog(RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED);



        mRil.mImsNetworkStateChangedRegistrants.notifyRegistrants();

    }
@@ -227,7 +227,7 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 


        ArrayList<CellInfo> cellInfos = RILUtils.convertHalCellInfoList(result.networkInfos);

        NetworkScanResult nsr = new NetworkScanResult(result.status, result.error, cellInfos);

        if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_NETWORK_SCAN_RESULT, nsr);

        if (mRil.isLogOrTrace()) mRil.unsljLogRet(RIL_UNSOL_NETWORK_SCAN_RESULT, nsr);

        mRil.mRilNetworkScanResultRegistrants.notifyRegistrants(new AsyncResult(null, nsr, null));

    }
@@ -238,7 +238,7 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 
    public void networkStateChanged(int indicationType) {

        mRil.processIndication(RIL.NETWORK_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) mRil.unsljLog(RIL_UNSOL_RESPONSE_NETWORK_STATE_CHANGED);

        if (mRil.isLogOrTrace()) mRil.unsljLog(RIL_UNSOL_RESPONSE_NETWORK_STATE_CHANGED);



        mRil.mNetworkStateRegistrants.notifyRegistrants();

    }
@@ -258,7 +258,7 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 
        @ElapsedRealtimeLong long receivedTimeMs, long ageMs) {

        mRil.processIndication(RIL.NETWORK_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_NITZ_TIME_RECEIVED, nitzTime);

        if (mRil.isLogOrTrace()) mRil.unsljLogRet(RIL_UNSOL_NITZ_TIME_RECEIVED, nitzTime);



        // Ignore the NITZ if receivedTimeMs or ageMs is not a valid time.

        // e.g. receivedTimeMs is non-positive, ageMs is negative or greater than receivedTimeMs.
@@ -280,7 +280,7 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 
        boolean ignoreNitz = TelephonyProperties.ignore_nitz().orElse(false);



        if (ignoreNitz) {

            if (RIL.RILJ_LOGD) mRil.riljLog("ignoring UNSOL_NITZ_TIME_RECEIVED");

            if (mRil.isLogOrTrace()) mRil.riljLog("ignoring UNSOL_NITZ_TIME_RECEIVED");

        } else {

            if (mRil.mNITZTimeRegistrant != null) {

                mRil.mNITZTimeRegistrant.notifyRegistrant(new AsyncResult(null, result, null));
@@ -330,7 +330,7 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 
    public void restrictedStateChanged(int indicationType, int state) {

        mRil.processIndication(RIL.NETWORK_SERVICE, indicationType);



        if (RIL.RILJ_LOGD) mRil.unsljLogvRet(RIL_UNSOL_RESTRICTED_STATE_CHANGED, state);

        if (mRil.isLogOrTrace()) mRil.unsljLogvRet(RIL_UNSOL_RESTRICTED_STATE_CHANGED, state);



        if (mRil.mRestrictedStateRegistrant != null) {

            mRil.mRestrictedStateRegistrant.notifyRegistrant(new AsyncResult(null, state, null));
@@ -353,7 +353,9 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 
        notification.type = suppSvcNotification.type;

        notification.number = suppSvcNotification.number;



        if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_SUPP_SVC_NOTIFICATION, notification);

        if (mRil.isLogOrTrace()) {

            mRil.unsljLogRet(RIL_UNSOL_SUPP_SVC_NOTIFICATION, notification);

        }



        if (mRil.mSsnRegistrant != null) {

            mRil.mSsnRegistrant.notifyRegistrant(new AsyncResult(null, notification, null));
@@ -370,7 +372,9 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 


        int[] response = new int[] {rat};



        if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_VOICE_RADIO_TECH_CHANGED, response);

        if (mRil.isLogOrTrace()) {

            mRil.unsljLogRet(RIL_UNSOL_VOICE_RADIO_TECH_CHANGED, response);

        }



        mRil.mVoiceRadioTechChangedRegistrants.notifyRegistrants(

                new AsyncResult(null, response, null));

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

+39 −13
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.os.RemoteException; 
import android.os.ServiceManager;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.Trace;

import android.os.WorkSource;

import android.provider.Settings;

import android.sysprop.TelephonyProperties;
@@ -1162,6 +1163,8 @@ public class RIL extends BaseCommands implements CommandsInterface { 


    private void addRequest(RILRequest rr) {

        acquireWakeLock(rr, FOR_WAKELOCK);

        Trace.asyncTraceForTrackBegin(

                Trace.TRACE_TAG_NETWORK, "RIL", RILUtils.requestToString(rr.mRequest), rr.mSerial);

        synchronized (mRequestList) {

            rr.mStartTimeMs = SystemClock.elapsedRealtime();

            mRequestList.append(rr.mSerial, rr);
@@ -5186,6 +5189,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                    + " ,error: " + error);

            return null;

        }

        Trace.asyncTraceForTrackEnd(Trace.TRACE_TAG_NETWORK, "RIL", "" /* unused */, rr.mSerial);



        // Time logging for RIL command and storing it in TelephonyHistogram.

        addToRilHistogram(rr);
@@ -5732,43 +5736,43 @@ public class RIL extends BaseCommands implements CommandsInterface { 
        int response = RIL_UNSOL_CDMA_INFO_REC;

        if (infoRec.record instanceof CdmaInformationRecords.CdmaDisplayInfoRec) {

            if (mDisplayInfoRegistrants != null) {

                if (RILJ_LOGD) unsljLogRet(response, infoRec.record);

                if (isLogOrTrace()) unsljLogRet(response, infoRec.record);

                mDisplayInfoRegistrants.notifyRegistrants(

                        new AsyncResult(null, infoRec.record, null));

            }

        } else if (infoRec.record instanceof CdmaInformationRecords.CdmaSignalInfoRec) {

            if (mSignalInfoRegistrants != null) {

                if (RILJ_LOGD) unsljLogRet(response, infoRec.record);

                if (isLogOrTrace()) unsljLogRet(response, infoRec.record);

                mSignalInfoRegistrants.notifyRegistrants(

                        new AsyncResult(null, infoRec.record, null));

            }

        } else if (infoRec.record instanceof CdmaInformationRecords.CdmaNumberInfoRec) {

            if (mNumberInfoRegistrants != null) {

                if (RILJ_LOGD) unsljLogRet(response, infoRec.record);

                if (isLogOrTrace()) unsljLogRet(response, infoRec.record);

                mNumberInfoRegistrants.notifyRegistrants(

                        new AsyncResult(null, infoRec.record, null));

            }

        } else if (infoRec.record instanceof CdmaInformationRecords.CdmaRedirectingNumberInfoRec) {

            if (mRedirNumInfoRegistrants != null) {

                if (RILJ_LOGD) unsljLogRet(response, infoRec.record);

                if (isLogOrTrace()) unsljLogRet(response, infoRec.record);

                mRedirNumInfoRegistrants.notifyRegistrants(

                        new AsyncResult(null, infoRec.record, null));

            }

        } else if (infoRec.record instanceof CdmaInformationRecords.CdmaLineControlInfoRec) {

            if (mLineControlInfoRegistrants != null) {

                if (RILJ_LOGD) unsljLogRet(response, infoRec.record);

                if (isLogOrTrace()) unsljLogRet(response, infoRec.record);

                mLineControlInfoRegistrants.notifyRegistrants(

                        new AsyncResult(null, infoRec.record, null));

            }

        } else if (infoRec.record instanceof CdmaInformationRecords.CdmaT53ClirInfoRec) {

            if (mT53ClirInfoRegistrants != null) {

                if (RILJ_LOGD) unsljLogRet(response, infoRec.record);

                if (isLogOrTrace()) unsljLogRet(response, infoRec.record);

                mT53ClirInfoRegistrants.notifyRegistrants(

                        new AsyncResult(null, infoRec.record, null));

            }

        } else if (infoRec.record instanceof CdmaInformationRecords.CdmaT53AudioControlInfoRec) {

            if (mT53AudCntrlInfoRegistrants != null) {

                if (RILJ_LOGD) {

                if (isLogOrTrace()) {

                    unsljLogRet(response, infoRec.record);

                }

                mT53AudCntrlInfoRegistrants.notifyRegistrants(
@@ -5790,26 +5794,48 @@ public class RIL extends BaseCommands implements CommandsInterface { 
        Rlog.v(RILJ_LOG_TAG, msg + (" [PHONE" + mPhoneId + "]"));

    }



    boolean isLogOrTrace() {

        return RIL.RILJ_LOGD || Trace.isTagEnabled(Trace.TRACE_TAG_NETWORK);

    }



    boolean isLogvOrTrace() {

        return RIL.RILJ_LOGV || Trace.isTagEnabled(Trace.TRACE_TAG_NETWORK);

    }



    @UnsupportedAppUsage

    void unsljLog(int response) {

        riljLog("[UNSL]< " + RILUtils.responseToString(response));

        String logStr = RILUtils.responseToString(response);

        if (RIL.RILJ_LOGD) {

            riljLog("[UNSL]< " + logStr);

        }

        Trace.instantForTrack(Trace.TRACE_TAG_NETWORK, "RIL", logStr);

    }



    @UnsupportedAppUsage

    void unsljLogMore(int response, String more) {

        riljLog("[UNSL]< " + RILUtils.responseToString(response) + " " + more);

        String logStr = RILUtils.responseToString(response) + " " + more;

        if (RIL.RILJ_LOGD) {

            riljLog("[UNSL]< " + logStr);

        }

        Trace.instantForTrack(Trace.TRACE_TAG_NETWORK, "RIL", logStr);

    }



    @UnsupportedAppUsage

    void unsljLogRet(int response, Object ret) {

        riljLog("[UNSL]< " + RILUtils.responseToString(response) + " "

                + retToString(response, ret));

        String logStr = RILUtils.responseToString(response) + " " + retToString(response, ret);

        if (RIL.RILJ_LOGD) {

            riljLog("[UNSL]< " + logStr);

        }

        Trace.instantForTrack(Trace.TRACE_TAG_NETWORK, "RIL", logStr);

    }



    @UnsupportedAppUsage

    void unsljLogvRet(int response, Object ret) {

        riljLogv("[UNSL]< " + RILUtils.responseToString(response) + " "

                + retToString(response, ret));

        String logStr = RILUtils.responseToString(response) + " " + retToString(response, ret);

        if (RIL.RILJ_LOGV) {

            riljLogv("[UNSL]< " + logStr);

        }

        Trace.instantForTrack(Trace.TRACE_TAG_NETWORK, "RIL", logStr);

    }



    @Override