Port functions from DefaultPhoneNotifier to frameworks/base am: 04b5725727 (4f3a1dba) · Commits · e / os / android_frameworks_opt_telephony

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

+6 −66

Original line number	Diff line number	Diff line
		@@ -29,6 +29,9 @@ import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;
		import android.telephony.PreciseCallState;

		import com.android.internal.telephony.PhoneConstantConversions;
		import com.android.internal.telephony.PhoneConstants;

		import java.util.List;

		/**
		@@ -57,7 +60,8 @@ public class DefaultPhoneNotifier implements PhoneNotifier {
		try {
		if (mRegistry != null) {
		mRegistry.notifyCallStateForPhoneId(phoneId, subId,
		convertCallState(sender.getState()), incomingNumber);
		PhoneConstantConversions.convertCallState(
		sender.getState()), incomingNumber);
		}
		} catch (RemoteException ex) {
		// system process is dead
		@@ -175,7 +179,7 @@ public class DefaultPhoneNotifier implements PhoneNotifier {
		try {
		if (mRegistry != null) {
		mRegistry.notifyDataConnectionForSubscriber(subId,
		convertDataState(state),
		PhoneConstantConversions.convertDataState(state),
		sender.isDataConnectivityPossible(apnType), reason,
		sender.getActiveApnHost(apnType),
		apnType,
		@@ -315,70 +319,6 @@ public class DefaultPhoneNotifier implements PhoneNotifier {
		}
		}

		/**
		* Convert the {@link PhoneConstants.State} enum into the TelephonyManager.CALL_STATE_*
		* constants for the public API.
		*/
		public static int convertCallState(PhoneConstants.State state) {
		switch (state) {
		case RINGING:
		return TelephonyManager.CALL_STATE_RINGING;
		case OFFHOOK:
		return TelephonyManager.CALL_STATE_OFFHOOK;
		default:
		return TelephonyManager.CALL_STATE_IDLE;
		}
		}

		/**
		* Convert the TelephonyManager.CALL_STATE_* constants into the
		* {@link PhoneConstants.State} enum for the public API.
		*/
		public static PhoneConstants.State convertCallState(int state) {
		switch (state) {
		case TelephonyManager.CALL_STATE_RINGING:
		return PhoneConstants.State.RINGING;
		case TelephonyManager.CALL_STATE_OFFHOOK:
		return PhoneConstants.State.OFFHOOK;
		default:
		return PhoneConstants.State.IDLE;
		}
		}

		/**
		* Convert the {@link PhoneConstants.DataState} enum into the TelephonyManager.DATA_* constants
		* for the public API.
		*/
		public static int convertDataState(PhoneConstants.DataState state) {
		switch (state) {
		case CONNECTING:
		return TelephonyManager.DATA_CONNECTING;
		case CONNECTED:
		return TelephonyManager.DATA_CONNECTED;
		case SUSPENDED:
		return TelephonyManager.DATA_SUSPENDED;
		default:
		return TelephonyManager.DATA_DISCONNECTED;
		}
		}

		/**
		* Convert the TelephonyManager.DATA_* constants into {@link PhoneConstants.DataState} enum
		* for the public API.
		*/
		public static PhoneConstants.DataState convertDataState(int state) {
		switch (state) {
		case TelephonyManager.DATA_CONNECTING:
		return PhoneConstants.DataState.CONNECTING;
		case TelephonyManager.DATA_CONNECTED:
		return PhoneConstants.DataState.CONNECTED;
		case TelephonyManager.DATA_SUSPENDED:
		return PhoneConstants.DataState.SUSPENDED;
		default:
		return PhoneConstants.DataState.DISCONNECTED;
		}
		}

		/**
		* Convert the {@link Phone.DataActivityState} enum into the TelephonyManager.DATA_* constants
		* for the public API.