LGEQualcommRIL: Clean up processUnsolicited (f3e77a78) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/LGEQualcommRIL.java

+11 −338

Original line number	Original line	Diff line number	Diff line
	@@ -248,48 +248,12 @@ public class LGEQualcommRIL extends RIL implements CommandsInterface {
	@Override		@Override
	protected void		protected void
	processUnsolicited (Parcel p) {		processUnsolicited (Parcel p) {
	int response;
	Object ret;		Object ret;
			int dataPosition = p.dataPosition(); // save off position within the Parcel
			int response = p.readInt();

	response = p.readInt();		switch(response) {
			case RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED: ret = responseVoid(p);
	try {switch(response) {
	/*
	cat libs/telephony/ril_unsol_commands.h \
	\| egrep "^ *{RIL_" \
	\| sed -re 's/\{([^,]+),[^,]+,([^}]+).+/case \1: \2(rr, p); break;/'
	*/

	case RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED: ret = responseVoid(p); break;
	case RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED: ret = responseVoid(p); break;
	case RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED: ret = responseVoid(p); break;
	case RIL_UNSOL_RESPONSE_NEW_SMS: ret = responseString(p); break;
	case RIL_UNSOL_RESPONSE_NEW_SMS_STATUS_REPORT: ret = responseString(p); break;
	case RIL_UNSOL_RESPONSE_NEW_SMS_ON_SIM: ret = responseInts(p); break;
	case RIL_UNSOL_ON_USSD: ret = responseStrings(p); break;
	case RIL_UNSOL_NITZ_TIME_RECEIVED: ret = responseString(p); break;
	case RIL_UNSOL_SIGNAL_STRENGTH: ret = responseSignalStrength(p); break;
	case RIL_UNSOL_DATA_CALL_LIST_CHANGED: ret = responseDataCallList(p);break;
	case RIL_UNSOL_SUPP_SVC_NOTIFICATION: ret = responseSuppServiceNotification(p); break;
	case RIL_UNSOL_STK_SESSION_END: ret = responseVoid(p); break;
	case RIL_UNSOL_STK_PROACTIVE_COMMAND: ret = responseString(p); break;
	case RIL_UNSOL_STK_EVENT_NOTIFY: ret = responseString(p); break;
	case RIL_UNSOL_STK_CALL_SETUP: ret = responseInts(p); break;
	case RIL_UNSOL_SIM_SMS_STORAGE_FULL: ret = responseVoid(p); break;
	case RIL_UNSOL_SIM_REFRESH: ret = responseInts(p); break;
	case RIL_UNSOL_CALL_RING: ret = responseCallRing(p); break;
	case RIL_UNSOL_RESTRICTED_STATE_CHANGED: ret = responseInts(p); break;
	case RIL_UNSOL_RESPONSE_SIM_STATUS_CHANGED: ret = responseVoid(p); break;
	case RIL_UNSOL_RESPONSE_CDMA_NEW_SMS: ret = responseCdmaSms(p); break;
	case RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS: ret = responseRaw(p); break;
	case RIL_UNSOL_CDMA_RUIM_SMS_STORAGE_FULL: ret = responseVoid(p); break;
	case RIL_UNSOL_ENTER_EMERGENCY_CALLBACK_MODE: ret = responseVoid(p); break;
	case RIL_UNSOL_CDMA_CALL_WAITING: ret = responseCdmaCallWaiting(p); break;
	case RIL_UNSOL_CDMA_OTA_PROVISION_STATUS: ret = responseInts(p); break;
	case RIL_UNSOL_CDMA_INFO_REC: ret = responseCdmaInformationRecord(p); break;
	case RIL_UNSOL_OEM_HOOK_RAW: ret = responseRaw(p); break;
	case RIL_UNSOL_RINGBACK_TONE: ret = responseInts(p); break;
	case RIL_UNSOL_RESEND_INCALL_MUTE: ret = responseVoid(p); break;
	case 1031: ret = responseVoid(p); break; // RIL_UNSOL_VOICE_RADIO_TECH_CHANGED		case 1031: ret = responseVoid(p); break; // RIL_UNSOL_VOICE_RADIO_TECH_CHANGED
	case 1032: ret = responseInts(p); break; // RIL_UNSOL_TETHERED_MODE_STATE_CHANGED		case 1032: ret = responseInts(p); break; // RIL_UNSOL_TETHERED_MODE_STATE_CHANGED
	case 1033: ret = responseVoid(p); break; // RIL_UNSOL_RESPONSE_DATA_NETWORK_STATE_CHANGED		case 1033: ret = responseVoid(p); break; // RIL_UNSOL_RESPONSE_DATA_NETWORK_STATE_CHANGED
	@@ -299,11 +263,11 @@ public class LGEQualcommRIL extends RIL implements CommandsInterface {
	case 1037: ret = responseVoid(p); break; // RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE		case 1037: ret = responseVoid(p); break; // RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE

	default:		default:
	throw new RuntimeException("Unrecognized unsol response: " + response);		// Rewind the Parcel
	//break; (implied)		p.setDataPosition(dataPosition);
	}} catch (Throwable tr) {
	Log.e(LOG_TAG, "Exception processing unsol response: " + response +		// Forward responses that we are not overriding to the super class
	"Exception:" + tr.toString());		super.processUnsolicited(p);
	return;		return;
	}		}

	@@ -312,302 +276,11 @@ public class LGEQualcommRIL extends RIL implements CommandsInterface {
	int state = p.readInt();		int state = p.readInt();
	setRadioStateFromRILInt(state);		setRadioStateFromRILInt(state);
	break;		break;
	case RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED:
	if (RILJ_LOGD) unsljLog(response);

	mCallStateRegistrants
	.notifyRegistrants(new AsyncResult(null, null, null));
	break;
	case RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED:
	if (RILJ_LOGD) unsljLog(response);

	mVoiceNetworkStateRegistrants
	.notifyRegistrants(new AsyncResult(null, null, null));
	break;
	case RIL_UNSOL_RESPONSE_NEW_SMS: {
	if (RILJ_LOGD) unsljLog(response);

	// FIXME this should move up a layer
	String a[] = new String[2];

	a[1] = (String)ret;

	SmsMessage sms;

	sms = SmsMessage.newFromCMT(a);
	if (mGsmSmsRegistrant != null) {
	mGsmSmsRegistrant
	.notifyRegistrant(new AsyncResult(null, sms, null));
	}
	break;
	}
	case RIL_UNSOL_RESPONSE_NEW_SMS_STATUS_REPORT:
	if (RILJ_LOGD) unsljLogRet(response, ret);

	if (mSmsStatusRegistrant != null) {
	mSmsStatusRegistrant.notifyRegistrant(
	new AsyncResult(null, ret, null));
	}
	break;
	case RIL_UNSOL_RESPONSE_NEW_SMS_ON_SIM:
	if (RILJ_LOGD) unsljLogRet(response, ret);

	int[] smsIndex = (int[])ret;

	if(smsIndex.length == 1) {
	if (mSmsOnSimRegistrant != null) {
	mSmsOnSimRegistrant.
	notifyRegistrant(new AsyncResult(null, smsIndex, null));
	}
	} else {
	if (RILJ_LOGD) riljLog(" NEW_SMS_ON_SIM ERROR with wrong length "
	+ smsIndex.length);
	}
	break;
	case RIL_UNSOL_ON_USSD:
	String[] resp = (String[])ret;

	if (resp.length < 2) {
	resp = new String[2];
	resp[0] = ((String[])ret)[0];
	resp[1] = null;
	}
	if (RILJ_LOGD) unsljLogMore(response, resp[0]);
	if (mUSSDRegistrant != null) {
	mUSSDRegistrant.notifyRegistrant(
	new AsyncResult (null, resp, null));
	}
	break;
	case RIL_UNSOL_NITZ_TIME_RECEIVED:
	if (RILJ_LOGD) unsljLogRet(response, ret);

	// has bonus long containing milliseconds since boot that the NITZ
	// time was received
	long nitzReceiveTime = p.readLong();

	Object[] result = new Object[2];

	result[0] = ret;
	result[1] = Long.valueOf(nitzReceiveTime);

	if (mNITZTimeRegistrant != null) {

	mNITZTimeRegistrant
	.notifyRegistrant(new AsyncResult (null, result, null));
	} else {
	// in case NITZ time registrant isnt registered yet
	mLastNITZTimeInfo = result;
	}
	break;

	case RIL_UNSOL_SIGNAL_STRENGTH:
	// Note this is set to "verbose" because it happens
	// frequently
	if (RILJ_LOGV) unsljLogvRet(response, ret);

	if (mSignalStrengthRegistrant != null) {
	mSignalStrengthRegistrant.notifyRegistrant(
	new AsyncResult (null, ret, null));
	}
	break;
	case RIL_UNSOL_DATA_CALL_LIST_CHANGED:
	if (RILJ_LOGD) unsljLogRet(response, ret);

	mDataNetworkStateRegistrants.notifyRegistrants(new AsyncResult(null, ret, null));
	break;

	case RIL_UNSOL_SUPP_SVC_NOTIFICATION:
	if (RILJ_LOGD) unsljLogRet(response, ret);

	if (mSsnRegistrant != null) {
	mSsnRegistrant.notifyRegistrant(
	new AsyncResult (null, ret, null));
	}
	break;

	case RIL_UNSOL_STK_SESSION_END:
	if (RILJ_LOGD) unsljLog(response);

	if (mCatSessionEndRegistrant != null) {
	mCatSessionEndRegistrant.notifyRegistrant(
	new AsyncResult (null, ret, null));
	}
	break;

	case RIL_UNSOL_STK_PROACTIVE_COMMAND:
	if (RILJ_LOGD) unsljLogRet(response, ret);

	if (mCatProCmdRegistrant != null) {
	mCatProCmdRegistrant.notifyRegistrant(
	new AsyncResult (null, ret, null));
	}
	break;

	case RIL_UNSOL_STK_EVENT_NOTIFY:
	if (RILJ_LOGD) unsljLogRet(response, ret);

	if (mCatEventRegistrant != null) {
	mCatEventRegistrant.notifyRegistrant(
	new AsyncResult (null, ret, null));
	}
	break;

	case RIL_UNSOL_STK_CALL_SETUP:
	if (RILJ_LOGD) unsljLogRet(response, ret);

	if (mCatCallSetUpRegistrant != null) {
	mCatCallSetUpRegistrant.notifyRegistrant(
	new AsyncResult (null, ret, null));
	}
	break;

	case RIL_UNSOL_SIM_SMS_STORAGE_FULL:
	if (RILJ_LOGD) unsljLog(response);

	if (mIccSmsFullRegistrant != null) {
	mIccSmsFullRegistrant.notifyRegistrant();
	}
	break;

	case RIL_UNSOL_SIM_REFRESH:
	if (RILJ_LOGD) unsljLogRet(response, ret);

	if (mIccRefreshRegistrants != null) {
	mIccRefreshRegistrants.notifyRegistrants(
	new AsyncResult (null, ret, null));
	}
	break;

	case RIL_UNSOL_CALL_RING:
	if (RILJ_LOGD) unsljLogRet(response, ret);

	if (mRingRegistrant != null) {
	mRingRegistrant.notifyRegistrant(
	new AsyncResult (null, ret, null));
	}
	break;

	case RIL_UNSOL_RESTRICTED_STATE_CHANGED:
	if (RILJ_LOGD) unsljLogvRet(response, ret);
	if (mRestrictedStateRegistrant != null) {
	mRestrictedStateRegistrant.notifyRegistrant(
	new AsyncResult (null, ret, null));
	}
	break;

	case RIL_UNSOL_RESPONSE_SIM_STATUS_CHANGED:
	if (RILJ_LOGD) unsljLog(response);

	if (mIccStatusChangedRegistrants != null) {
	mIccStatusChangedRegistrants.notifyRegistrants();
	}
	break;

	case RIL_UNSOL_RESPONSE_CDMA_NEW_SMS:
	if (RILJ_LOGD) unsljLog(response);

	SmsMessage sms = (SmsMessage) ret;

	if (mCdmaSmsRegistrant != null) {
	mCdmaSmsRegistrant
	.notifyRegistrant(new AsyncResult(null, sms, null));
	}
	break;

	case RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS:
	if (RILJ_LOGD) unsljLog(response);

	if (mGsmBroadcastSmsRegistrant != null) {
	mGsmBroadcastSmsRegistrant
	.notifyRegistrant(new AsyncResult(null, ret, null));
	}
	break;

	case RIL_UNSOL_CDMA_RUIM_SMS_STORAGE_FULL:
	if (RILJ_LOGD) unsljLog(response);

	if (mIccSmsFullRegistrant != null) {
	mIccSmsFullRegistrant.notifyRegistrant();
	}
	break;

	case RIL_UNSOL_ENTER_EMERGENCY_CALLBACK_MODE:
	if (RILJ_LOGD) unsljLog(response);

	if (mEmergencyCallbackModeRegistrant != null) {
	mEmergencyCallbackModeRegistrant.notifyRegistrant();
	}
	break;

	case RIL_UNSOL_CDMA_CALL_WAITING:
	if (RILJ_LOGD) unsljLogRet(response, ret);

	if (mCallWaitingInfoRegistrants != null) {
	mCallWaitingInfoRegistrants.notifyRegistrants(
	new AsyncResult (null, ret, null));
	}
	break;

	case RIL_UNSOL_CDMA_OTA_PROVISION_STATUS:
	if (RILJ_LOGD) unsljLogRet(response, ret);

	if (mOtaProvisionRegistrants != null) {
	mOtaProvisionRegistrants.notifyRegistrants(
	new AsyncResult (null, ret, null));
	}
	break;

	case RIL_UNSOL_CDMA_INFO_REC:
	ArrayList<CdmaInformationRecords> listInfoRecs;

	try {
	listInfoRecs = (ArrayList<CdmaInformationRecords>)ret;
	} catch (ClassCastException e) {
	Log.e(LOG_TAG, "Unexpected exception casting to listInfoRecs", e);
	break;
	}

	for (CdmaInformationRecords rec : listInfoRecs) {
	if (RILJ_LOGD) unsljLogRet(response, rec);
	notifyRegistrantsCdmaInfoRec(rec);
	}
	break;

	case RIL_UNSOL_OEM_HOOK_RAW:
	if (RILJ_LOGD) unsljLogvRet(response, IccUtils.bytesToHexString((byte[])ret));
	if (mUnsolOemHookRawRegistrant != null) {
	mUnsolOemHookRawRegistrant.notifyRegistrant(new AsyncResult(null, ret, null));
	}
	break;

	case RIL_UNSOL_RINGBACK_TONE:
	if (RILJ_LOGD) unsljLogvRet(response, ret);
	if (mRingbackToneRegistrants != null) {
	boolean playtone = (((int[])ret)[0] == 1);
	mRingbackToneRegistrants.notifyRegistrants(
	new AsyncResult (null, playtone, null));
	}
	break;

	case RIL_UNSOL_RESEND_INCALL_MUTE:
	if (RILJ_LOGD) unsljLogRet(response, ret);

	if (mResendIncallMuteRegistrants != null) {
	mResendIncallMuteRegistrants.notifyRegistrants(
	new AsyncResult (null, ret, null));
	}
	break;

	case 1031:		case 1031:
	break;
	case 1032:		case 1032:
	break;
	case 1033:		case 1033:
	break;
	case 1034:		case 1034:
	break;
	case 1035:		case 1035:
	break;
	case 1036:		case 1036:
	break;		break;
	case 1037: // RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE		case 1037: // RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE