Smdk4210RIL: some cleanup (e0a8c35c) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/Smdk4210RIL.java

+31 −39

Original line number	Diff line number	Diff line
		@@ -151,9 +151,11 @@ public class Smdk4210RIL extends RIL implements CommandsInterface {

		protected HandlerThread mSmdk4210Thread;
		protected ConnectivityHandler mSmdk4210Handler;
		private AudioManager audioManager;

		public Smdk4210RIL(Context context, int networkMode, int cdmaSubscription) {
		super(context, networkMode, cdmaSubscription);
		audioManager = (AudioManager)mContext.getSystemService(Context.AUDIO_SERVICE);
		}

		@Override
		@@ -501,6 +503,8 @@ public class Smdk4210RIL extends RIL implements CommandsInterface {
		case RIL_UNSOL_AM: ret = responseVoid(p); break;
		case RIL_UNSOL_DUN_PIN_CONTROL_SIGNAL: ret = responseVoid(p); break;
		case RIL_UNSOL_DATA_SUSPEND_RESUME: ret = responseInts(p); break;
		case RIL_UNSOL_STK_CALL_CONTROL_RESULT: ret = responseVoid(p); break;
		case RIL_UNSOL_TWO_MIC_STATE: ret = responseInts(p); break;
		case RIL_UNSOL_WB_AMR_STATE: ret = responseInts(p); break;

		default:
		@@ -534,63 +538,52 @@ public class Smdk4210RIL extends RIL implements CommandsInterface {
		case RIL_UNSOL_AM:
		case RIL_UNSOL_DUN_PIN_CONTROL_SIGNAL:
		case RIL_UNSOL_DATA_SUSPEND_RESUME:
		if (RILJ_LOGD) unsljLogRet(response, ret);
		if (RILJ_LOGD) samsungUnsljLogRet(response, ret);
		break;
		case RIL_UNSOL_STK_CALL_CONTROL_RESULT:
		if (RILJ_LOGD) samsungUnsljLogRet(response, ret);
		break;
		case RIL_UNSOL_TWO_MIC_STATE:
		if (RILJ_LOGD) samsungUnsljLogRet(response, ret);
		break;
		case RIL_UNSOL_WB_AMR_STATE:
		unsljLogRet(response, ret);
		if (RILJ_LOGD) samsungUnsljLogRet(response, ret);
		setWbAmr(((int[])ret)[0]);
		break;
		}
		}

		static String
		responseToString(int request)
		samsungResponseToString(int request)
		{
		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_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_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";
		case RIL_UNSOL_NITZ_TIME_RECEIVED: return "UNSOL_NITZ_TIME_RECEIVED";
		case RIL_UNSOL_SIGNAL_STRENGTH: return "UNSOL_SIGNAL_STRENGTH";
		case RIL_UNSOL_DATA_CALL_LIST_CHANGED: return "UNSOL_DATA_CALL_LIST_CHANGED";
		case RIL_UNSOL_SUPP_SVC_NOTIFICATION: return "UNSOL_SUPP_SVC_NOTIFICATION";
		case RIL_UNSOL_STK_SESSION_END: return "UNSOL_STK_SESSION_END";
		case RIL_UNSOL_STK_PROACTIVE_COMMAND: return "UNSOL_STK_PROACTIVE_COMMAND";
		case RIL_UNSOL_STK_EVENT_NOTIFY: return "UNSOL_STK_EVENT_NOTIFY";
		case RIL_UNSOL_STK_CALL_SETUP: return "UNSOL_STK_CALL_SETUP";
		case RIL_UNSOL_SIM_SMS_STORAGE_FULL: return "UNSOL_SIM_SMS_STORAGE_FULL";
		case RIL_UNSOL_SIM_REFRESH: return "UNSOL_SIM_REFRESH";
		case RIL_UNSOL_CALL_RING: return "UNSOL_CALL_RING";
		case RIL_UNSOL_RESPONSE_SIM_STATUS_CHANGED: return "UNSOL_RESPONSE_SIM_STATUS_CHANGED";
		case RIL_UNSOL_RESPONSE_CDMA_NEW_SMS: return "UNSOL_RESPONSE_CDMA_NEW_SMS";
		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_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_PRL_CHANGED: return "UNSOL_CDMA_PRL_CHANGED";
		case RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE: return "UNSOL_EXIT_EMERGENCY_CALLBACK_MODE";
		case RIL_UNSOL_RIL_CONNECTED: return "UNSOL_RIL_CONNECTED";
		// SAMSUNG STATES
		case RIL_UNSOL_AM: return "RIL_UNSOL_AM";
		case RIL_UNSOL_DUN_PIN_CONTROL_SIGNAL: return "RIL_UNSOL_DUN_PIN_CONTROL_SIGNAL";
		case RIL_UNSOL_DATA_SUSPEND_RESUME: return "RIL_UNSOL_DATA_SUSPEND_RESUME";
		case RIL_UNSOL_STK_CALL_CONTROL_RESULT: return "RIL_UNSOL_STK_CALL_CONTROL_RESULT";
		case RIL_UNSOL_TWO_MIC_STATE: return "RIL_UNSOL_TWO_MIC_STATE";
		case RIL_UNSOL_WB_AMR_STATE: return "RIL_UNSOL_WB_AMR_STATE";
		default: return "<unknown response: "+request+">";
		}
		}

		protected void samsungUnsljLog(int response) {
		riljLog("[UNSL]< " + samsungResponseToString(response));
		}

		protected void samsungUnsljLogMore(int response, String more) {
		riljLog("[UNSL]< " + samsungResponseToString(response) + " " + more);
		}

		protected void samsungUnsljLogRet(int response, Object ret) {
		riljLog("[UNSL]< " + samsungResponseToString(response) + " " + retToString(response, ret));
		}

		protected void samsungUnsljLogvRet(int response, Object ret) {
		riljLogv("[UNSL]< " + samsungResponseToString(response) + " " + retToString(response, ret));
		}

		/**
		* Notifiy all registrants that the ril has connected or disconnected.
		*
		@@ -610,7 +603,6 @@ public class Smdk4210RIL extends RIL implements CommandsInterface {
		* @param state: 0 = unsupported, 1 = supported.
		*/
		private void setWbAmr(int state) {
		AudioManager audioManager = (AudioManager)mContext.getSystemService(Context.AUDIO_SERVICE);
		if (state == 1) {
		Log.d(LOG_TAG, "setWbAmr(): setting audio parameter - wb_amr=on");
		audioManager.setParameters("wb_amr=on");