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

Commit 9ea044cf authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9133013 from 1288b573 to tm-qpr2-release 

Change-Id: I10921b5cd5a42d32782f4594eeef45f5bd9d13b0
parents ff73fcc7 1288b573

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

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

            android.hardware.radio.data.SetupDataCallResult[] dcList) {

        mRil.processIndication(RIL.DATA_SERVICE, indicationType);

        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);

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

        mRil.mDataCallListChangedRegistrants.notifyRegistrants(

        mRil.mDataCallListChangedRegistrants.notifyRegistrants(

                new AsyncResult(null, response, null));

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

            android.hardware.radio.data.KeepaliveStatus halStatus) {

        mRil.processIndication(RIL.DATA_SERVICE, indicationType);

        mRil.processIndication(RIL.DATA_SERVICE, indicationType);





        if (RIL.RILJ_LOGD) {

        if (mRil.isLogOrTrace()) {

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

            mRil.unsljLogRet(

                    + " code=" +  halStatus.code);

                    RIL_UNSOL_KEEPALIVE_STATUS,

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

        }

        }





        KeepaliveStatus ks = new KeepaliveStatus(

        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);

        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));

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

    }

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

        mRil.processIndication(RIL.DATA_SERVICE, indicationType);

        DataProfile response = RILUtils.convertToDataProfile(dpi);

        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));

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

    }

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

    public void slicingConfigChanged(int indicationType,

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

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

        mRil.processIndication(RIL.DATA_SERVICE, indicationType);

        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);

        NetworkSlicingConfig ret = RILUtils.convertHalSlicingConfig(slicingConfig);

        mRil.mSlicingConfigChangedRegistrants.notifyRegistrants(

        mRil.mSlicingConfigChangedRegistrants.notifyRegistrants(

                new AsyncResult(null, ret, null));

                new AsyncResult(null, ret, null));

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

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

            android.hardware.radio.messaging.CdmaSmsMessage msg) {

        mRil.processIndication(RIL.MESSAGING_SERVICE, indicationType);

        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));

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

        if (mRil.mCdmaSmsRegistrant != null) {

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

    public void cdmaRuimSmsStorageFull(int indicationType) {

        mRil.processIndication(RIL.MESSAGING_SERVICE, 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) {

        if (mRil.mIccSmsFullRegistrant != null) {

            mRil.mIccSmsFullRegistrant.notifyRegistrant();

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

    public void newBroadcastSms(int indicationType, byte[] data) {

        mRil.processIndication(RIL.MESSAGING_SERVICE, indicationType);

        mRil.processIndication(RIL.MESSAGING_SERVICE, indicationType);





        if (RIL.RILJ_LOGD) {

        if (mRil.isLogOrTrace()) {

            mRil.unsljLogvRet(RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS,

            mRil.unsljLogvRet(

                    IccUtils.bytesToHexString(data));

                    RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS, IccUtils.bytesToHexString(data));

        }

        }





        if (mRil.mGsmBroadcastSmsRegistrant != null) {

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

     */

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

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

        mRil.processIndication(RIL.MESSAGING_SERVICE, indicationType);

        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);

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

        if (mRil.mGsmSmsRegistrant != null) {

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

    public void newSmsOnSim(int indicationType, int recordNumber) {

        mRil.processIndication(RIL.MESSAGING_SERVICE, indicationType);

        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) {

        if (mRil.mSmsOnSimRegistrant != null) {

            mRil.mSmsOnSimRegistrant.notifyRegistrant(new AsyncResult(null, recordNumber, 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) {

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

        mRil.processIndication(RIL.MESSAGING_SERVICE, indicationType);

        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) {

        if (mRil.mSmsStatusRegistrant != null) {

            mRil.mSmsStatusRegistrant.notifyRegistrant(new AsyncResult(null, pdu, null));

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

    public void simSmsStorageFull(int indicationType) {

        mRil.processIndication(RIL.MESSAGING_SERVICE, 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) {

        if (mRil.mIccSmsFullRegistrant != null) {

            mRil.mIccSmsFullRegistrant.notifyRegistrant();

            mRil.mIccSmsFullRegistrant.notifyRegistrant();

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

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




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

        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(

        mRil.mHardwareConfigChangeRegistrants.notifyRegistrants(

                new AsyncResult(null, response, null));

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

    public void modemReset(int indicationType, String reason) {

        mRil.processIndication(RIL.MODEM_SERVICE, indicationType);

        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.writeMetricsModemRestartEvent(reason);

        mRil.mModemResetRegistrants.notifyRegistrants(new AsyncResult(null, reason, null));

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




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

        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(

        mRil.mPhoneRadioCapabilityChangedRegistrants.notifyRegistrants(

                new AsyncResult(null, response, null));

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

        mRil.processIndication(RIL.MODEM_SERVICE, indicationType);





        int state = RILUtils.convertHalRadioState(radioState);

        int state = RILUtils.convertHalRadioState(radioState);

        if (RIL.RILJ_LOGD) {

        if (mRil.isLogOrTrace()) {

            mRil.unsljLogMore(RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED, "radioStateChanged: "

            mRil.unsljLogMore(

                    + state);

                    RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED, "radioStateChanged: " + state);

        }

        }





        mRil.setRadioState(state, false /* forceNotifyRegistrants */);

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

    public void rilConnected(int indicationType) {

        mRil.processIndication(RIL.MODEM_SERVICE, 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

        // Initial conditions

        mRil.setRadioPower(false, null);

        mRil.setRadioPower(false, null);

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

+17 −6
Original line number Original line Diff line number Diff line
@@ -303,7 +303,7 @@ public class MultiSimSettingController extends Handler { 
            case EVENT_USER_DATA_ENABLED: {

            case EVENT_USER_DATA_ENABLED: {

                int subId = msg.arg1;

                int subId = msg.arg1;

                boolean enable = msg.arg2 != 0;

                boolean enable = msg.arg2 != 0;

                onUserDataEnabled(subId, enable);

                onUserDataEnabled(subId, enable, true);

                break;

                break;

            }

            }

            case EVENT_ROAMING_DATA_ENABLED: {

            case EVENT_ROAMING_DATA_ENABLED: {
@@ -352,14 +352,15 @@ public class MultiSimSettingController extends Handler { 
     * If user is enabling a non-default non-opportunistic subscription, make it default

     * If user is enabling a non-default non-opportunistic subscription, make it default

     * data subscription.

     * data subscription.

     */

     */

    protected void onUserDataEnabled(int subId, boolean enable) {

    private void onUserDataEnabled(int subId, boolean enable, boolean setDefaultData) {

        if (DBG) log("onUserDataEnabled");

        if (DBG) log("[onUserDataEnabled] subId=" + subId + " enable=" + enable +

        " setDefaultData=" + setDefaultData);

        // Make sure MOBILE_DATA of subscriptions in same group are synced.

        // Make sure MOBILE_DATA of subscriptions in same group are synced.

        setUserDataEnabledForGroup(subId, enable);

        setUserDataEnabledForGroup(subId, enable);





        // If user is enabling a non-default non-opportunistic subscription, make it default.

        // If user is enabling a non-default non-opportunistic subscription, make it default.

        if (mSubController.getDefaultDataSubId() != subId && !mSubController.isOpportunistic(subId)

        if (mSubController.getDefaultDataSubId() != subId && !mSubController.isOpportunistic(subId)

                && enable && mSubController.isActiveSubId(subId)) {

                && enable && mSubController.isActiveSubId(subId) && setDefaultData) {

             android.provider.Settings.Global.putInt(mContext.getContentResolver(),

             android.provider.Settings.Global.putInt(mContext.getContentResolver(),

                 SETTING_USER_PREF_DATA_SUB, subId);

                 SETTING_USER_PREF_DATA_SUB, subId);

            mSubController.setDefaultDataSubId(subId);

            mSubController.setDefaultDataSubId(subId);
@@ -546,13 +547,23 @@ public class MultiSimSettingController extends Handler { 
        try {

        try {

            enable = GlobalSettingsHelper.getBoolean(

            enable = GlobalSettingsHelper.getBoolean(

                    mContext, Settings.Global.MOBILE_DATA, refSubId);

                    mContext, Settings.Global.MOBILE_DATA, refSubId);

            onUserDataEnabled(refSubId, enable);

        } catch (SettingNotFoundException exception) {

        } catch (SettingNotFoundException exception) {

            //pass invalid refSubId to fetch the single-sim setting

            //pass invalid refSubId to fetch the single-sim setting

            enable = GlobalSettingsHelper.getBoolean(

            enable = GlobalSettingsHelper.getBoolean(

                    mContext, Settings.Global.MOBILE_DATA, INVALID_SUBSCRIPTION_ID, enable);

                    mContext, Settings.Global.MOBILE_DATA, INVALID_SUBSCRIPTION_ID, enable);

            onUserDataEnabled(refSubId, enable);

        }

        }

        boolean setDefaultData = true;

        List<SubscriptionInfo> activeSubList = mSubController.getActiveSubscriptionInfoList(

                mContext.getOpPackageName(), mContext.getAttributionTag());

        for (SubscriptionInfo activeInfo : activeSubList) {

            if (!(groupUuid.equals(activeInfo.getGroupUuid()))) {

                // Do not set refSubId as defaultDataSubId if there are other active

                // subscriptions which does not belong to this groupUuid

                setDefaultData = false;

                break;

            }

        }

        onUserDataEnabled(refSubId, enable, setDefaultData);





        enable = false;

        enable = false;

        try {

        try {

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

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




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

        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));

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

    }

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

            android.hardware.radio.network.CellInfo[] records) {

        mRil.processIndication(RIL.NETWORK_SERVICE, indicationType);

        mRil.processIndication(RIL.NETWORK_SERVICE, indicationType);

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

        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));

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

    }

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




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

        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) {

        if (mRil.mLceInfoRegistrants != null) {

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

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

            mRil.riljLoge("Invalid PhysicalChannelConfig " + iae);

            return;

            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(

        mRil.mPhysicalChannelConfigurationRegistrants.notifyRegistrants(

                new AsyncResult(null, response, null));

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




        SignalStrength ss = mRil.fixupSignalStrength10(ssInitial);

        SignalStrength ss = mRil.fixupSignalStrength10(ssInitial);

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

        // 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) {

        if (mRil.mSignalStrengthRegistrant != null) {

            mRil.mSignalStrengthRegistrant.notifyRegistrant(new AsyncResult(null, ss, null));

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

    public void imsNetworkStateChanged(int indicationType) {

        mRil.processIndication(RIL.NETWORK_SERVICE, 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();

        mRil.mImsNetworkStateChangedRegistrants.notifyRegistrants();

    }

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




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

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

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

        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));

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

    }

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

    public void networkStateChanged(int indicationType) {

        mRil.processIndication(RIL.NETWORK_SERVICE, 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();

        mRil.mNetworkStateRegistrants.notifyRegistrants();

    }

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

        @ElapsedRealtimeLong long receivedTimeMs, long ageMs) {

        mRil.processIndication(RIL.NETWORK_SERVICE, indicationType);

        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.

        // 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.

        // 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);

        boolean ignoreNitz = TelephonyProperties.ignore_nitz().orElse(false);





        if (ignoreNitz) {

        if (ignoreNitz) {

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

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

        } else {

        } else {

            if (mRil.mNITZTimeRegistrant != null) {

            if (mRil.mNITZTimeRegistrant != null) {

                mRil.mNITZTimeRegistrant.notifyRegistrant(new AsyncResult(null, result, 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) {

    public void restrictedStateChanged(int indicationType, int state) {

        mRil.processIndication(RIL.NETWORK_SERVICE, indicationType);

        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) {

        if (mRil.mRestrictedStateRegistrant != null) {

            mRil.mRestrictedStateRegistrant.notifyRegistrant(new AsyncResult(null, state, null));

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

        notification.type = suppSvcNotification.type;

        notification.number = suppSvcNotification.number;

        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) {

        if (mRil.mSsnRegistrant != null) {

            mRil.mSsnRegistrant.notifyRegistrant(new AsyncResult(null, notification, null));

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




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

        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(

        mRil.mVoiceRadioTechChangedRegistrants.notifyRegistrants(

                new AsyncResult(null, response, null));

                new AsyncResult(null, response, null));