Merge "telephony annotation part 2" (3fc4039c) · Commits · e / os / android_frameworks_opt_telephony

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

+6 −5

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.net.Uri;
		import android.os.Bundle;
		import android.os.SystemClock;
		import android.telecom.ConferenceParticipant;
		import android.telephony.Annotation.RilRadioTechnology;
		import android.telephony.DisconnectCause;
		import android.telephony.Rlog;
		import android.telephony.ServiceState;
		@@ -94,7 +95,7 @@ public abstract class Connection {
		public interface Listener {
		public void onVideoStateChanged(int videoState);
		public void onConnectionCapabilitiesChanged(int capability);
		public void onCallRadioTechChanged(@ServiceState.RilRadioTechnology int vrat);
		public void onCallRadioTechChanged(@RilRadioTechnology int vrat);
		public void onVideoProviderChanged(
		android.telecom.Connection.VideoProvider videoProvider);
		public void onAudioQualityChanged(int audioQuality);
		@@ -125,7 +126,7 @@ public abstract class Connection {
		@Override
		public void onConnectionCapabilitiesChanged(int capability) {}
		@Override
		public void onCallRadioTechChanged(@ServiceState.RilRadioTechnology int vrat) {}
		public void onCallRadioTechChanged(@RilRadioTechnology int vrat) {}
		@Override
		public void onVideoProviderChanged(
		android.telecom.Connection.VideoProvider videoProvider) {}
		@@ -227,7 +228,7 @@ public abstract class Connection {
		*
		* This is used to propagate the call radio technology to upper layer.
		*/
		private @ServiceState.RilRadioTechnology int mCallRadioTech =
		private @RilRadioTechnology int mCallRadioTech =
		ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN;
		private boolean mAudioModeIsVoip;
		private int mAudioQuality;
		@@ -902,7 +903,7 @@ public abstract class Connection {
		* @return the RIL Voice Radio Technology used for current connection,
		* see {@code RIL_RADIO_TECHNOLOGY_*} in {@link android.telephony.ServiceState}.
		*/
		public @ServiceState.RilRadioTechnology int getCallRadioTech() {
		public @RilRadioTechnology int getCallRadioTech() {
		return mCallRadioTech;
		}

		@@ -980,7 +981,7 @@ public abstract class Connection {
		* @param vrat the RIL voice radio technology for current connection,
		* see {@code RIL_RADIO_TECHNOLOGY_*} in {@link android.telephony.ServiceState}.
		*/
		public void setCallRadioTech(@ServiceState.RilRadioTechnology int vrat) {
		public void setCallRadioTech(@RilRadioTechnology int vrat) {
		if (mCallRadioTech == vrat) {
		return;
		}

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import android.os.Registrant;
		import android.os.RegistrantList;
		import android.os.SystemProperties;
		import android.telecom.TelecomManager;
		import android.telephony.Annotation.RilRadioTechnology;
		import android.telephony.CarrierConfigManager;
		import android.telephony.CellLocation;
		import android.telephony.DisconnectCause;
		@@ -1654,7 +1655,7 @@ public class GsmCdmaCallTracker extends CallTracker {
		* @param vrat the RIL voice radio technology for CS calls,
		* see {@code RIL_RADIO_TECHNOLOGY_*} in {@link android.telephony.ServiceState}.
		*/
		public void dispatchCsCallRadioTech(@ServiceState.RilRadioTechnology int vrat) {
		public void dispatchCsCallRadioTech(@RilRadioTechnology int vrat) {
		if (mConnections == null) {
		log("dispatchCsCallRadioTech: mConnections is null");
		return;

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@ import android.provider.Telephony;
		import android.telecom.TelecomManager;
		import android.telecom.VideoProfile;
		import android.telephony.AccessNetworkConstants;
		import android.telephony.Annotation.RilRadioTechnology;
		import android.telephony.CarrierConfigManager;
		import android.telephony.CellLocation;
		import android.telephony.ImsiEncryptionInfo;
		@@ -3809,7 +3810,7 @@ public class GsmCdmaPhone extends Phone {
		* @return the RIL voice radio technology used for CS calls,
		* see {@code RIL_RADIO_TECHNOLOGY_*} in {@link android.telephony.ServiceState}.
		*/
		public @ServiceState.RilRadioTechnology int getCsCallRadioTech() {
		public @RilRadioTechnology int getCsCallRadioTech() {
		int calcVrat = ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN;
		if (mSST != null) {
		calcVrat = getCsCallRadioTech(mSST.mSS.getVoiceRegState(),
		@@ -3838,7 +3839,7 @@ public class GsmCdmaPhone extends Phone {
		* @return the RIL voice radio technology used for CS calls,
		* see {@code RIL_RADIO_TECHNOLOGY_*} in {@link android.telephony.ServiceState}.
		*/
		private @ServiceState.RilRadioTechnology int getCsCallRadioTech(int vrs, int vrat) {
		private @RilRadioTechnology int getCsCallRadioTech(int vrs, int vrat) {
		logd("getCsCallRadioTech, current vrs=" + vrs + ", vrat=" + vrat);
		int calcVrat = vrat;
		if (vrs != ServiceState.STATE_IN_SERVICE

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ import android.provider.Settings;
		import android.telephony.AccessNetworkConstants;
		import android.telephony.AccessNetworkConstants.AccessNetworkType;
		import android.telephony.AccessNetworkConstants.TransportType;
		import android.telephony.Annotation.RilRadioTechnology;
		import android.telephony.CarrierConfigManager;
		import android.telephony.CellIdentity;
		import android.telephony.CellIdentityCdma;
		@@ -70,7 +71,6 @@ import android.telephony.NetworkRegistrationInfo;
		import android.telephony.PhysicalChannelConfig;
		import android.telephony.Rlog;
		import android.telephony.ServiceState;
		import android.telephony.ServiceState.RilRadioTechnology;
		import android.telephony.SignalStrength;
		import android.telephony.SubscriptionInfo;
		import android.telephony.SubscriptionManager;

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -73,6 +73,7 @@ import android.telephony.AccessNetworkConstants.TransportType;
		import android.telephony.Annotation.DataFailureCause;
		import android.telephony.Annotation.ApnType;
		import android.telephony.Annotation.NetworkType;
		import android.telephony.Annotation.RilRadioTechnology;
		import android.telephony.CarrierConfigManager;
		import android.telephony.CellLocation;
		import android.telephony.DataFailCause;
		@@ -80,7 +81,6 @@ import android.telephony.NetworkRegistrationInfo;
		import android.telephony.PcoData;
		import android.telephony.Rlog;
		import android.telephony.ServiceState;
		import android.telephony.ServiceState.RilRadioTechnology;
		import android.telephony.SubscriptionManager;
		import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
		import android.telephony.TelephonyManager;