Merge "new telephony annotation class" (2ffd1626) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.os.Handler;
		import android.os.Message;
		import android.os.Registrant;
		import android.os.RegistrantList;
		import android.telephony.Annotation.RadioPowerState;
		import android.telephony.TelephonyManager;

		/**
		@@ -160,7 +161,7 @@ public abstract class BaseCommands implements CommandsInterface {
		//***** CommandsInterface implementation

		@Override
		public @TelephonyManager.RadioPowerState int getRadioState() {
		public @RadioPowerState int getRadioState() {
		return mState;
		}

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

+6 −5

Original line number	Diff line number	Diff line
		@@ -25,10 +25,12 @@ import android.os.Bundle;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.os.telephony.TelephonyRegistryManager;
		import android.telephony.Annotation.DataFailureCause;
		import android.telephony.Annotation.RadioPowerState;
		import android.telephony.Annotation.SrvccState;
		import android.telephony.CallQuality;
		import android.telephony.CellInfo;
		import android.telephony.CellLocation;
		import android.telephony.DataFailCause;
		import android.telephony.PhoneCapability;
		import android.telephony.PhysicalChannelConfig;
		import android.telephony.PreciseCallState;
		@@ -236,13 +238,13 @@ public class DefaultPhoneNotifier implements PhoneNotifier {
		}

		public void notifyPreciseDataConnectionFailed(Phone sender, String apnType,
		String apn, @DataFailCause.FailCause int failCause) {
		String apn, @DataFailureCause int failCause) {
		mTelephonyRegistryMgr.notifyPreciseDataConnectionFailed(sender.getSubId(),
		sender.getPhoneId(), apnType, apn, failCause);
		}

		@Override
		public void notifySrvccStateChanged(Phone sender, @TelephonyManager.SrvccState int state) {
		public void notifySrvccStateChanged(Phone sender, @SrvccState int state) {
		mTelephonyRegistryMgr.notifySrvccStateChanged(sender.getSubId(), state);
		}

		@@ -276,8 +278,7 @@ public class DefaultPhoneNotifier implements PhoneNotifier {
		}

		@Override
		public void notifyRadioPowerStateChanged(Phone sender,
		@TelephonyManager.RadioPowerState int state) {
		public void notifyRadioPowerStateChanged(Phone sender, @RadioPowerState int state) {
		mTelephonyRegistryMgr.notifyRadioPowerStateChanged(sender.getSubId(), sender.getPhoneId(),
		state);
		}

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -42,12 +42,13 @@ import android.os.WorkSource;
		import android.preference.PreferenceManager;
		import android.telecom.VideoProfile;
		import android.telephony.AccessNetworkConstants;
		import android.telephony.Annotation.ApnType;
		import android.telephony.Annotation.DataFailureCause;
		import android.telephony.CarrierConfigManager;
		import android.telephony.CarrierRestrictionRules;
		import android.telephony.CellInfo;
		import android.telephony.CellLocation;
		import android.telephony.ClientRequestStats;
		import android.telephony.DataFailCause;
		import android.telephony.ImsiEncryptionInfo;
		import android.telephony.PhoneStateListener;
		import android.telephony.PhysicalChannelConfig;
		@@ -58,7 +59,6 @@ import android.telephony.SignalStrength;
		import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;
		import android.telephony.data.ApnSetting;
		import android.telephony.data.ApnSetting.ApnType;
		import android.telephony.emergency.EmergencyNumber;
		import android.telephony.ims.RegistrationManager;
		import android.telephony.ims.stub.ImsRegistrationImplBase;
		@@ -3299,7 +3299,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		}

		public void notifyPreciseDataConnectionFailed(String apnType, String apn,
		@DataFailCause.FailCause int failCause) {
		@DataFailureCause int failCause) {
		mNotifier.notifyPreciseDataConnectionFailed(this, apnType, apn, failCause);
		}

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

+6 −5

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

		import android.annotation.UnsupportedAppUsage;
		import android.telephony.Annotation.DataFailureCause;
		import android.telephony.Annotation.RadioPowerState;
		import android.telephony.Annotation.SrvccState;
		import android.telephony.CallQuality;
		import android.telephony.CellInfo;
		import android.telephony.CellLocation;
		import android.telephony.DataFailCause;
		import android.telephony.PhoneCapability;
		import android.telephony.PhysicalChannelConfig;
		import android.telephony.TelephonyManager;
		import android.telephony.emergency.EmergencyNumber;
		import android.telephony.ims.ImsReasonInfo;

		@@ -69,10 +70,10 @@ public interface PhoneNotifier {
		void notifyImsDisconnectCause(Phone sender, ImsReasonInfo imsReasonInfo);

		public void notifyPreciseDataConnectionFailed(Phone sender, String apnType, String apn,
		@DataFailCause.FailCause int failCause);
		@DataFailureCause int failCause);

		/** send a notification that the SRVCC state has changed.*/
		void notifySrvccStateChanged(Phone sender, @TelephonyManager.SrvccState int state);
		void notifySrvccStateChanged(Phone sender, @SrvccState int state);

		public void notifyVoiceActivationStateChanged(Phone sender, int activationState);

		@@ -84,7 +85,7 @@ public interface PhoneNotifier {

		public void notifyPhoneCapabilityChanged(PhoneCapability capability);

		void notifyRadioPowerStateChanged(Phone sender, @TelephonyManager.RadioPowerState int state);
		void notifyRadioPowerStateChanged(Phone sender, @RadioPowerState int state);

		/** Notify of change to EmergencyNumberList. */
		void notifyEmergencyNumberList(Phone sender);

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -2641,7 +2641,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
		/**
		* convert RAF from {@link android.hardware.radio.V1_0.RadioAccessFamily} to
		* {@link TelephonyManager.NetworkTypeBitMask}, the bitmask represented by
		* {@link TelephonyManager.NetworkType}.
		* {@link android.telephony.Annotation.NetworkType}.
		*
		* @param raf {@link android.hardware.radio.V1_0.RadioAccessFamily}
		* @return {@link TelephonyManager.NetworkTypeBitMask}