Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged" (e78ea424) · Commits · e / os / android_frameworks_opt_telephony

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

+13 −16

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

	import android.content.Context;		import android.content.Context;
			import android.os.AsyncResult;
			import android.os.Handler;
	import android.os.Message;		import android.os.Message;
	import android.os.RegistrantList;
	import android.os.Registrant;		import android.os.Registrant;
	import android.os.Handler;		import android.os.RegistrantList;
	import android.os.AsyncResult;
	import android.telephony.RadioAccessFamily;
	import android.telephony.TelephonyManager;		import android.telephony.TelephonyManager;

	import com.android.internal.telephony.RadioCapability;

	/**		/**
	* {@hide}		* {@hide}
	*/		*/
	@@ -43,8 +40,8 @@ public abstract class BaseCommands implements CommandsInterface {
	protected RegistrantList mOffOrNotAvailRegistrants = new RegistrantList();		protected RegistrantList mOffOrNotAvailRegistrants = new RegistrantList();
	protected RegistrantList mNotAvailRegistrants = new RegistrantList();		protected RegistrantList mNotAvailRegistrants = new RegistrantList();
	protected RegistrantList mCallStateRegistrants = new RegistrantList();		protected RegistrantList mCallStateRegistrants = new RegistrantList();
	protected RegistrantList mVoiceNetworkStateRegistrants = new RegistrantList();		protected RegistrantList mNetworkStateRegistrants = new RegistrantList();
	protected RegistrantList mDataNetworkStateRegistrants = new RegistrantList();		protected RegistrantList mDataCallListChangedRegistrants = new RegistrantList();
	protected RegistrantList mVoiceRadioTechChangedRegistrants = new RegistrantList();		protected RegistrantList mVoiceRadioTechChangedRegistrants = new RegistrantList();
	protected RegistrantList mImsNetworkStateChangedRegistrants = new RegistrantList();		protected RegistrantList mImsNetworkStateChangedRegistrants = new RegistrantList();
	protected RegistrantList mIccStatusChangedRegistrants = new RegistrantList();		protected RegistrantList mIccStatusChangedRegistrants = new RegistrantList();
	@@ -237,27 +234,27 @@ public abstract class BaseCommands implements CommandsInterface {
	}		}

	@Override		@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);		Registrant r = new Registrant (h, what, obj);

	mVoiceNetworkStateRegistrants.add(r);		mNetworkStateRegistrants.add(r);
	}		}

	@Override		@Override
	public void unregisterForVoiceNetworkStateChanged(Handler h) {		public void unregisterForNetworkStateChanged(Handler h) {
	mVoiceNetworkStateRegistrants.remove(h);		mNetworkStateRegistrants.remove(h);
	}		}

	@Override		@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);		Registrant r = new Registrant (h, what, obj);

	mDataNetworkStateRegistrants.add(r);		mDataCallListChangedRegistrants.add(r);
	}		}

	@Override		@Override
	public void unregisterForDataNetworkStateChanged(Handler h) {		public void unregisterForDataCallListChanged(Handler h) {
	mDataNetworkStateRegistrants.remove(h);		mDataCallListChangedRegistrants.remove(h);
	}		}

	@Override		@Override

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

+12 −9

Original line number	Original line	Diff line number	Diff line
	@@ -16,16 +16,15 @@

	package com.android.internal.telephony;		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.cdma.CdmaSmsBroadcastConfigInfo;
	import com.android.internal.telephony.dataconnection.DataProfile;		import com.android.internal.telephony.dataconnection.DataProfile;
	import com.android.internal.telephony.gsm.SmsBroadcastConfigInfo;		import com.android.internal.telephony.gsm.SmsBroadcastConfigInfo;
	import com.android.internal.telephony.RadioCapability;
	import com.android.internal.telephony.uicc.IccCardStatus;		import com.android.internal.telephony.uicc.IccCardStatus;

	import android.os.Message;
	import android.os.Handler;
	import android.service.carrier.CarrierIdentifier;

	import java.util.List;		import java.util.List;


	@@ -190,10 +189,14 @@ public interface CommandsInterface {

	void registerForCallStateChanged(Handler h, int what, Object obj);		void registerForCallStateChanged(Handler h, int what, Object obj);
	void unregisterForCallStateChanged(Handler h);		void unregisterForCallStateChanged(Handler h);
	void registerForVoiceNetworkStateChanged(Handler h, int what, Object obj);		/** Register for network state changed event */
	void unregisterForVoiceNetworkStateChanged(Handler h);		void registerForNetworkStateChanged(Handler h, int what, Object obj);
	void registerForDataNetworkStateChanged(Handler h, int what, Object obj);		/** Unregister from network state changed event */
	void unregisterForDataNetworkStateChanged(Handler h);		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 */		/** InCall voice privacy notifications */
	void registerForInCallVoicePrivacyOn(Handler h, int what, Object obj);		void registerForInCallVoicePrivacyOn(Handler h, int what, Object obj);

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

+13 −12

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

+43 −38

Original line number	Original line	Diff line number	Diff line
	@@ -16,39 +16,6 @@

	package com.android.internal.telephony;		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_CALL_RING;
	import static com.android.internal.telephony.RILConstants.RIL_UNSOL_CDMA_CALL_WAITING;		import static com.android.internal.telephony.RILConstants.RIL_UNSOL_CDMA_CALL_WAITING;
	import static com.android.internal.telephony.RILConstants.RIL_UNSOL_CDMA_INFO_REC;		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_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_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_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_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;
	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_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_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_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_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_RESTRICTED_STATE_CHANGED;
	import static com.android.internal.telephony.RILConstants.RIL_UNSOL_RIL_CONNECTED;		import static com.android.internal.telephony.RILConstants.RIL_UNSOL_RIL_CONNECTED;
	import static com.android.internal.telephony.RILConstants.RIL_UNSOL_RINGBACK_TONE;		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_VOICE_RADIO_TECH_CHANGED;
	import static com.android.internal.telephony.RILConstants.RIL_UNSOl_CDMA_PRL_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;		import java.util.ArrayList;

	public class RadioIndication extends IRadioIndication.Stub {		public class RadioIndication extends IRadioIndication.Stub {
	@@ -128,12 +128,16 @@ public class RadioIndication extends IRadioIndication.Stub {
	mRil.mCallStateRegistrants.notifyRegistrants();		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);		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) {		public void newSms(int indicationType, ArrayList<Byte> pdu) {
	@@ -244,7 +248,8 @@ public class RadioIndication extends IRadioIndication.Stub {
	ArrayList<DataCallResponse> response = RIL.convertHalDcList(dcList);		ArrayList<DataCallResponse> response = RIL.convertHalDcList(dcList);
	if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_DATA_CALL_LIST_CHANGED, response);		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) {		public void suppSvcNotify(int indicationType, SuppSvcNotification suppSvcNotification) {

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

+5 −1

Original line number	Original line	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.		* radio request which take long time to respond.
	* For more details, refer https://source.android.com/devices/tech/connect/ril.html		* 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,		boolean var2,
	CarrierRestrictions var3) {}		CarrierRestrictions var3) {}

			public void sendDeviceStateResponse(RadioResponseInfo responseInfo) {}

			public void setIndicationFilterResponse(RadioResponseInfo responseInfo) {}

	private void responseIccCardStatus(RadioResponseInfo responseInfo, CardStatus cardStatus) {		private void responseIccCardStatus(RadioResponseInfo responseInfo, CardStatus cardStatus) {
	RILRequest rr = mRil.processResponse(responseInfo);		RILRequest rr = mRil.processResponse(responseInfo);

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,9 @@

	package com.android.internal.telephony;		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.BroadcastReceiver;
	import android.content.Context;		import android.content.Context;
	import android.content.Intent;		import android.content.Intent;
	@@ -69,7 +72,6 @@ import android.util.SparseArray;
	import android.view.Display;		import android.view.Display;

	import com.android.internal.telephony.TelephonyProto.SmsSession;		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.CdmaInformationRecords;
	import com.android.internal.telephony.cdma.CdmaSmsBroadcastConfigInfo;		import com.android.internal.telephony.cdma.CdmaSmsBroadcastConfigInfo;
	import com.android.internal.telephony.dataconnection.DataCallResponse;		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.SmsBroadcastConfigInfo;
	import com.android.internal.telephony.gsm.SuppServiceNotification;		import com.android.internal.telephony.gsm.SuppServiceNotification;
	import com.android.internal.telephony.metrics.TelephonyMetrics;		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.IccIoResult;
	import com.android.internal.telephony.uicc.IccRefreshResponse;		import com.android.internal.telephony.uicc.IccRefreshResponse;
	import com.android.internal.telephony.uicc.IccUtils;		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.AtomicInteger;
	import java.util.concurrent.atomic.AtomicLong;		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}		* {@hide}
	*/		*/
	@@ -4132,9 +4128,11 @@ public final class RIL extends BaseCommands implements CommandsInterface {
	switch(request) {		switch(request) {