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

Commit 6509576d authored by Jack Yu's avatar Jack Yu
Browse files

Renamed voiceNetworkStateChanged and dataNetworkStateChanged 

The misleading voiceNetworkStateChanged should be renamed
to networkStateChanged to reflect either voice or data
network changes will trigger this indication.
And dataNetworkStateChanged should be renamed to
dataCallListChanged as well.

Test: telephony sanity test
Merged-In: I5839efc3bdaf137310238790221c8ba93794bde3
Change-Id: I5839efc3bdaf137310238790221c8ba93794bde3
parent b86e4558

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

+13 −16
Original line number Diff line number Diff line
@@ -18,16 +18,13 @@ 
package com.android.internal.telephony;



import android.content.Context;

import android.os.AsyncResult;

import android.os.Handler;

import android.os.Message;

import android.os.RegistrantList;

import android.os.Registrant;

import android.os.Handler;

import android.os.AsyncResult;

import android.telephony.RadioAccessFamily;

import android.os.RegistrantList;

import android.telephony.TelephonyManager;



import com.android.internal.telephony.RadioCapability;



/**

 * {@hide}

 */
@@ -43,8 +40,8 @@ public abstract class BaseCommands implements CommandsInterface { 
    protected RegistrantList mOffOrNotAvailRegistrants = new RegistrantList();

    protected RegistrantList mNotAvailRegistrants = new RegistrantList();

    protected RegistrantList mCallStateRegistrants = new RegistrantList();

    protected RegistrantList mVoiceNetworkStateRegistrants = new RegistrantList();

    protected RegistrantList mDataNetworkStateRegistrants = new RegistrantList();

    protected RegistrantList mNetworkStateRegistrants = new RegistrantList();

    protected RegistrantList mDataCallListChangedRegistrants = new RegistrantList();

    protected RegistrantList mVoiceRadioTechChangedRegistrants = new RegistrantList();

    protected RegistrantList mImsNetworkStateChangedRegistrants = new RegistrantList();

    protected RegistrantList mIccStatusChangedRegistrants = new RegistrantList();
@@ -237,27 +234,27 @@ public abstract class BaseCommands implements CommandsInterface { 
    }



    @Override

    public void registerForVoiceNetworkStateChanged(Handler h, int what, Object obj) {

    public void registerForNetworkStateChanged(Handler h, int what, Object obj) {

        Registrant r = new Registrant (h, what, obj);



        mVoiceNetworkStateRegistrants.add(r);

        mNetworkStateRegistrants.add(r);

    }



    @Override

    public void unregisterForVoiceNetworkStateChanged(Handler h) {

        mVoiceNetworkStateRegistrants.remove(h);

    public void unregisterForNetworkStateChanged(Handler h) {

        mNetworkStateRegistrants.remove(h);

    }



    @Override

    public void registerForDataNetworkStateChanged(Handler h, int what, Object obj) {

    public void registerForDataCallListChanged(Handler h, int what, Object obj) {

        Registrant r = new Registrant (h, what, obj);



        mDataNetworkStateRegistrants.add(r);

        mDataCallListChangedRegistrants.add(r);

    }



    @Override

    public void unregisterForDataNetworkStateChanged(Handler h) {

        mDataNetworkStateRegistrants.remove(h);

    public void unregisterForDataCallListChanged(Handler h) {

        mDataCallListChangedRegistrants.remove(h);

    }



    @Override

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

+12 −9
Original line number Diff line number Diff line
@@ -16,16 +16,15 @@ 


package com.android.internal.telephony;



import android.os.Handler;

import android.os.Message;

import android.service.carrier.CarrierIdentifier;



import com.android.internal.telephony.cdma.CdmaSmsBroadcastConfigInfo;

import com.android.internal.telephony.dataconnection.DataProfile;

import com.android.internal.telephony.gsm.SmsBroadcastConfigInfo;

import com.android.internal.telephony.RadioCapability;

import com.android.internal.telephony.uicc.IccCardStatus;



import android.os.Message;

import android.os.Handler;

import android.service.carrier.CarrierIdentifier;



import java.util.List;
@@ -190,10 +189,14 @@ public interface CommandsInterface { 


    void registerForCallStateChanged(Handler h, int what, Object obj);

    void unregisterForCallStateChanged(Handler h);

    void registerForVoiceNetworkStateChanged(Handler h, int what, Object obj);

    void unregisterForVoiceNetworkStateChanged(Handler h);

    void registerForDataNetworkStateChanged(Handler h, int what, Object obj);

    void unregisterForDataNetworkStateChanged(Handler h);

    /** Register for network state changed event */

    void registerForNetworkStateChanged(Handler h, int what, Object obj);

    /** Unregister from network state changed event */

    void unregisterForNetworkStateChanged(Handler h);

    /** Register for data call list changed event */

    void registerForDataCallListChanged(Handler h, int what, Object obj);

    /** Unregister from data call list changed event */

    void unregisterForDataCallListChanged(Handler h);



    /** InCall voice privacy notifications */

    void registerForInCallVoicePrivacyOn(Handler h, int what, Object obj);

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

+13 −12
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package com.android.internal.telephony;



import static com.android.internal.telephony.RILConstants.*;

import static com.android.internal.util.Preconditions.checkNotNull;



import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;
@@ -69,7 +72,6 @@ import android.util.SparseArray; 
import android.view.Display;



import com.android.internal.telephony.TelephonyProto.SmsSession;

import com.android.internal.telephony.TelephonyProto.TelephonySettings;

import com.android.internal.telephony.cdma.CdmaInformationRecords;

import com.android.internal.telephony.cdma.CdmaSmsBroadcastConfigInfo;

import com.android.internal.telephony.dataconnection.DataCallResponse;
@@ -78,8 +80,6 @@ import com.android.internal.telephony.dataconnection.DcFailCause; 
import com.android.internal.telephony.gsm.SmsBroadcastConfigInfo;

import com.android.internal.telephony.gsm.SuppServiceNotification;

import com.android.internal.telephony.metrics.TelephonyMetrics;

import com.android.internal.telephony.uicc.IccCardApplicationStatus;

import com.android.internal.telephony.uicc.IccCardStatus;

import com.android.internal.telephony.uicc.IccIoResult;

import com.android.internal.telephony.uicc.IccRefreshResponse;

import com.android.internal.telephony.uicc.IccUtils;
@@ -98,10 +98,6 @@ import java.util.concurrent.atomic.AtomicBoolean; 
import java.util.concurrent.atomic.AtomicInteger;

import java.util.concurrent.atomic.AtomicLong;



import static android.telephony.TelephonyManager.NETWORK_TYPE_UNKNOWN;

import static com.android.internal.telephony.RILConstants.*;

import static com.android.internal.util.Preconditions.checkNotNull;



/**

 * {@hide}

 */
@@ -4132,9 +4128,11 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
        switch(request) {

            case RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED: return "UNSOL_RESPONSE_RADIO_STATE_CHANGED";

            case RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED: return "UNSOL_RESPONSE_CALL_STATE_CHANGED";

            case RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED: return "UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED";

            case RIL_UNSOL_RESPONSE_NETWORK_STATE_CHANGED:

                return "UNSOL_RESPONSE_NETWORK_STATE_CHANGED";

            case RIL_UNSOL_RESPONSE_NEW_SMS: return "UNSOL_RESPONSE_NEW_SMS";

            case RIL_UNSOL_RESPONSE_NEW_SMS_STATUS_REPORT: return "UNSOL_RESPONSE_NEW_SMS_STATUS_REPORT";

            case RIL_UNSOL_RESPONSE_NEW_SMS_STATUS_REPORT:

                return "UNSOL_RESPONSE_NEW_SMS_STATUS_REPORT";

            case RIL_UNSOL_RESPONSE_NEW_SMS_ON_SIM: return "UNSOL_RESPONSE_NEW_SMS_ON_SIM";

            case RIL_UNSOL_ON_USSD: return "UNSOL_ON_USSD";

            case RIL_UNSOL_ON_USSD_REQUEST: return "UNSOL_ON_USSD_REQUEST";
@@ -4154,16 +4152,19 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
            case RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS: return "UNSOL_RESPONSE_NEW_BROADCAST_SMS";

            case RIL_UNSOL_CDMA_RUIM_SMS_STORAGE_FULL: return "UNSOL_CDMA_RUIM_SMS_STORAGE_FULL";

            case RIL_UNSOL_RESTRICTED_STATE_CHANGED: return "UNSOL_RESTRICTED_STATE_CHANGED";

            case RIL_UNSOL_ENTER_EMERGENCY_CALLBACK_MODE: return "UNSOL_ENTER_EMERGENCY_CALLBACK_MODE";

            case RIL_UNSOL_ENTER_EMERGENCY_CALLBACK_MODE:

                return "UNSOL_ENTER_EMERGENCY_CALLBACK_MODE";

            case RIL_UNSOL_CDMA_CALL_WAITING: return "UNSOL_CDMA_CALL_WAITING";

            case RIL_UNSOL_CDMA_OTA_PROVISION_STATUS: return "UNSOL_CDMA_OTA_PROVISION_STATUS";

            case RIL_UNSOL_CDMA_INFO_REC: return "UNSOL_CDMA_INFO_REC";

            case RIL_UNSOL_OEM_HOOK_RAW: return "UNSOL_OEM_HOOK_RAW";

            case RIL_UNSOL_RINGBACK_TONE: return "UNSOL_RINGBACK_TONE";

            case RIL_UNSOL_RESEND_INCALL_MUTE: return "UNSOL_RESEND_INCALL_MUTE";

            case RIL_UNSOL_CDMA_SUBSCRIPTION_SOURCE_CHANGED: return "CDMA_SUBSCRIPTION_SOURCE_CHANGED";

            case RIL_UNSOL_CDMA_SUBSCRIPTION_SOURCE_CHANGED:

                return "CDMA_SUBSCRIPTION_SOURCE_CHANGED";

            case RIL_UNSOl_CDMA_PRL_CHANGED: return "UNSOL_CDMA_PRL_CHANGED";

            case RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE: return "UNSOL_EXIT_EMERGENCY_CALLBACK_MODE";

            case RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE:

                return "UNSOL_EXIT_EMERGENCY_CALLBACK_MODE";

            case RIL_UNSOL_RIL_CONNECTED: return "UNSOL_RIL_CONNECTED";

            case RIL_UNSOL_VOICE_RADIO_TECH_CHANGED: return "UNSOL_VOICE_RADIO_TECH_CHANGED";

            case RIL_UNSOL_CELL_INFO_LIST: return "UNSOL_CELL_INFO_LIST";

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

+43 −38
Original line number Diff line number Diff line
@@ -16,39 +16,6 @@ 


package com.android.internal.telephony;



import android.hardware.radio.V1_0.CdmaCallWaiting;

import android.hardware.radio.V1_0.CdmaInformationRecord;

import android.hardware.radio.V1_0.CdmaLineControlInfoRecord;

import android.hardware.radio.V1_0.CdmaNumberInfoRecord;

import android.hardware.radio.V1_0.CdmaRedirectingNumberInfoRecord;

import android.hardware.radio.V1_0.CdmaSignalInfoRecord;

import android.hardware.radio.V1_0.CdmaSmsMessage;

import android.hardware.radio.V1_0.CdmaT53AudioControlInfoRecord;

import android.hardware.radio.V1_0.CfData;

import android.hardware.radio.V1_0.IRadioIndication;

import android.hardware.radio.V1_0.LceDataInfo;

import android.hardware.radio.V1_0.PcoDataInfo;

import android.hardware.radio.V1_0.SetupDataCallResult;

import android.hardware.radio.V1_0.SimRefreshResult;

import android.hardware.radio.V1_0.SsInfoData;

import android.hardware.radio.V1_0.StkCcUnsolSsResult;

import android.hardware.radio.V1_0.SuppSvcNotification;

import android.os.AsyncResult;

import android.os.SystemProperties;

import android.telephony.CellInfo;

import android.telephony.PcoData;

import android.telephony.SignalStrength;

import android.telephony.SmsMessage;



import com.android.internal.telephony.cdma.CdmaCallWaitingNotification;

import com.android.internal.telephony.cdma.CdmaInformationRecords;

import com.android.internal.telephony.dataconnection.DataCallResponse;

import com.android.internal.telephony.gsm.SsData;

import com.android.internal.telephony.gsm.SuppServiceNotification;

import com.android.internal.telephony.TelephonyProto.SmsSession;

import com.android.internal.telephony.uicc.IccRefreshResponse;

import com.android.internal.telephony.uicc.IccUtils;



import static com.android.internal.telephony.RILConstants.RIL_UNSOL_CALL_RING;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_CDMA_CALL_WAITING;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_CDMA_INFO_REC;
@@ -70,13 +37,13 @@ import static com.android.internal.telephony.RILConstants.RIL_UNSOL_RESEND_INCAL 
import static com.android.internal.telephony.RILConstants.RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_RESPONSE_CDMA_NEW_SMS;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_RESPONSE_NETWORK_STATE_CHANGED;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_RESPONSE_NEW_SMS;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_RESPONSE_NEW_SMS_ON_SIM;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_RESPONSE_NEW_SMS_STATUS_REPORT;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_RESPONSE_SIM_STATUS_CHANGED;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_RESTRICTED_STATE_CHANGED;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_RIL_CONNECTED;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_RINGBACK_TONE;
@@ -94,6 +61,39 @@ import static com.android.internal.telephony.RILConstants.RIL_UNSOL_UICC_SUBSCRI 
import static com.android.internal.telephony.RILConstants.RIL_UNSOL_VOICE_RADIO_TECH_CHANGED;

import static com.android.internal.telephony.RILConstants.RIL_UNSOl_CDMA_PRL_CHANGED;



import android.hardware.radio.V1_0.CdmaCallWaiting;

import android.hardware.radio.V1_0.CdmaInformationRecord;

import android.hardware.radio.V1_0.CdmaLineControlInfoRecord;

import android.hardware.radio.V1_0.CdmaNumberInfoRecord;

import android.hardware.radio.V1_0.CdmaRedirectingNumberInfoRecord;

import android.hardware.radio.V1_0.CdmaSignalInfoRecord;

import android.hardware.radio.V1_0.CdmaSmsMessage;

import android.hardware.radio.V1_0.CdmaT53AudioControlInfoRecord;

import android.hardware.radio.V1_0.CfData;

import android.hardware.radio.V1_0.IRadioIndication;

import android.hardware.radio.V1_0.LceDataInfo;

import android.hardware.radio.V1_0.PcoDataInfo;

import android.hardware.radio.V1_0.SetupDataCallResult;

import android.hardware.radio.V1_0.SimRefreshResult;

import android.hardware.radio.V1_0.SsInfoData;

import android.hardware.radio.V1_0.StkCcUnsolSsResult;

import android.hardware.radio.V1_0.SuppSvcNotification;

import android.os.AsyncResult;

import android.os.SystemProperties;

import android.telephony.CellInfo;

import android.telephony.PcoData;

import android.telephony.SignalStrength;

import android.telephony.SmsMessage;



import com.android.internal.telephony.TelephonyProto.SmsSession;

import com.android.internal.telephony.cdma.CdmaCallWaitingNotification;

import com.android.internal.telephony.cdma.CdmaInformationRecords;

import com.android.internal.telephony.dataconnection.DataCallResponse;

import com.android.internal.telephony.gsm.SsData;

import com.android.internal.telephony.gsm.SuppServiceNotification;

import com.android.internal.telephony.uicc.IccRefreshResponse;

import com.android.internal.telephony.uicc.IccUtils;



import java.util.ArrayList;



public class RadioIndication extends IRadioIndication.Stub {
@@ -128,12 +128,16 @@ public class RadioIndication extends IRadioIndication.Stub { 
        mRil.mCallStateRegistrants.notifyRegistrants();

    }



    public void voiceNetworkStateChanged(int indicationType) {

    /**

     * Indicates when either voice or data network state changed

     * @param indicationType RadioIndicationType

     */

    public void networkStateChanged(int indicationType) {

        mRil.processIndication(indicationType);



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

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



        mRil.mVoiceNetworkStateRegistrants.notifyRegistrants();

        mRil.mNetworkStateRegistrants.notifyRegistrants();

    }



    public void newSms(int indicationType, ArrayList<Byte> pdu) {
@@ -244,7 +248,8 @@ public class RadioIndication extends IRadioIndication.Stub { 
        ArrayList<DataCallResponse> response = RIL.convertHalDcList(dcList);

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



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

        mRil.mDataCallListChangedRegistrants.notifyRegistrants(

                new AsyncResult(null, response, null));

    }



    public void suppSvcNotify(int indicationType, SuppSvcNotification suppSvcNotification) {

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

+5 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public class RadioResponse extends IRadioResponse.Stub { 
    }



    /**

     * Acknowldege the receipt of radio request sent to the vendor. This must be sent only for

     * Acknowledge the receipt of radio request sent to the vendor. This must be sent only for

     * radio request which take long time to respond.

     * For more details, refer https://source.android.com/devices/tech/connect/ril.html

     *
@@ -441,6 +441,10 @@ public class RadioResponse extends IRadioResponse.Stub { 
                                           boolean var2,

                                           CarrierRestrictions var3) {}



    public void sendDeviceStateResponse(RadioResponseInfo responseInfo) {}



    public void setIndicationFilterResponse(RadioResponseInfo responseInfo) {}



    private void responseIccCardStatus(RadioResponseInfo responseInfo, CardStatus cardStatus) {

        RILRequest rr = mRil.processResponse(responseInfo);