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

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

Snap for 9470583 from 707acc55 to tm-qpr3-release 

Change-Id: If5a35bf3d6368e362ad1f6f3b729a0c0112604ae
parents ff73fcc7 707acc55

proto/src/persist_atoms.proto

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ message VoiceCallSession { 
    optional int32 rat_at_connected = 30;

    optional bool is_multiparty = 31;

    optional int32 call_duration = 32;

    optional int32 last_known_rat = 33;

    // Internal use only

    optional int64 setup_begin_millis = 10001;

}

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

+8 −2
Original line number Diff line number Diff line
@@ -4804,6 +4804,8 @@ public class GsmCdmaPhone extends Phone { 


        boolean mIsVonrEnabledByCarrier =

                config.getBoolean(CarrierConfigManager.KEY_VONR_ENABLED_BOOL);

        boolean mDefaultVonr =

                config.getBoolean(CarrierConfigManager.KEY_VONR_ON_BY_DEFAULT_BOOL);



        String result = SubscriptionController.getInstance().getSubscriptionProperty(

                getSubId(),
@@ -4817,11 +4819,15 @@ public class GsmCdmaPhone extends Phone { 
        logd("VoNR setting from telephony.db:"

                + setting

                + " ,vonr_enabled_bool:"

                + mIsVonrEnabledByCarrier);

                + mIsVonrEnabledByCarrier

                + " ,vonr_on_by_default_bool:"

                + mDefaultVonr);



        if (!mIsVonrEnabledByCarrier) {

            mCi.setVoNrEnabled(false, obtainMessage(EVENT_SET_VONR_ENABLED_DONE), null);

        } else if (setting == 1 || setting == -1) {

        } else if (setting == -1) {

            mCi.setVoNrEnabled(mDefaultVonr, obtainMessage(EVENT_SET_VONR_ENABLED_DONE), null);

        } else if (setting == 1) {

            mCi.setVoNrEnabled(true, obtainMessage(EVENT_SET_VONR_ENABLED_DONE), null);

        } else if (setting == 0) {

            mCi.setVoNrEnabled(false, obtainMessage(EVENT_SET_VONR_ENABLED_DONE), 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);