Merge "LGEStarRIL: Slight adjustments to init sequence" into gingerbread (f82fa927) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/LGEStarRIL.java

+75 −19

Original line number	Diff line number	Diff line
		@@ -113,16 +113,6 @@ public class LGEStarRIL extends RIL implements CommandsInterface {
		protected boolean mPrepSetupPending = true;
		public void
		setRadioPower(boolean on, Message result) {
		RILRequest rr
		= RILRequest.obtain(RIL_REQUEST_RADIO_POWER, result);

		rr.mp.writeInt(1);
		rr.mp.writeInt(on ? 1 : 0);

		if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));

		send(rr);

		if(mPrepSetupPending) {
		if (SystemProperties.get("ro.build.product").equals("p999")) {
		/* Set radio access tech */
		@@ -133,6 +123,14 @@ public class LGEStarRIL extends RIL implements CommandsInterface {
		if (RILJ_LOGD) riljLog(rrSPR.serialString() + "> "
		+ requestToString(rrSPR.mRequest));
		send(rrSPR);
		/* Set time zone reporting */
		rrSPR = RILRequest.obtain(
		189, null);
		rrSPR.mp.writeInt(1);
		rrSPR.mp.writeInt(1);
		if (RILJ_LOGD) riljLog(rrSPR.serialString() + "> "
		+ requestToString(rrSPR.mRequest));
		send(rrSPR);
		} else {
		/* Set GPRS class */
		RILRequest rrCs = RILRequest.obtain(
		@@ -144,12 +142,33 @@ public class LGEStarRIL extends RIL implements CommandsInterface {
		+ requestToString(rrCs.mRequest));
		send(rrCs);
		}

		/* Get charset */
		RILRequest rrGCS = RILRequest.obtain(
		152, null);
		if (RILJ_LOGD) riljLog(rrGCS.serialString() + "> "
		+ requestToString(rrGCS.mRequest));
		send(rrGCS);
		}
		RILRequest rr
		= RILRequest.obtain(RIL_REQUEST_RADIO_POWER, result);

		rr.mp.writeInt(3);
		rr.mp.writeInt(on ? 1 : 0);
		rr.mp.writeInt(0);
		rr.mp.writeInt(0);

		if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));

		send(rr);

		}

		protected void LGEswitchToRadioState(RadioState newState) {

		if (!mPrepSetupPending && newState == RadioState.RADIO_UNAVAILABLE) {
		/* We seem to have lost the radio, reset the setup flag */
		mPrepSetupPending = true;
		}
		if (newState.isOn() && mPrepSetupPending) {
		RILRequest rrPnt = RILRequest.obtain(
		RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE, null);
		@@ -161,14 +180,6 @@ public class LGEStarRIL extends RIL implements CommandsInterface {

		send(rrPnt);

		/* Request service line */
		RILRequest rrSL = RILRequest.obtain(
		(SystemProperties.get("ro.build.product").equals("p999") ? 294 : 286), null);
		rrSL.mp.writeInt(0);
		if (RILJ_LOGD) riljLog(rrSL.serialString() + "> "
		+ requestToString(rrSL.mRequest));
		send(rrSL);

		/* Set "ready" */
		RILRequest rrSc = RILRequest.obtain(
		(SystemProperties.get("ro.build.product").equals("p999") ? 304 : 298), null);
		@@ -329,6 +340,45 @@ public class LGEStarRIL extends RIL implements CommandsInterface {
		send(rr);
		}

		public void
		getNetworkSelectionMode(Message response) {
		RILRequest rr
		= RILRequest.obtain(RIL_REQUEST_QUERY_NETWORK_SELECTION_MODE,
		response);

		if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));

		send(rr);
		/* ADAPTED_NETWORK_NAME */
		rr
		= RILRequest.obtain(143, null);

		rr.mp.writeInt(1);
		rr.mp.writeInt(6);

		send(rr);
		}

		public void
		getIMSI(Message result) {
		RILRequest rr = RILRequest.obtain(RIL_REQUEST_GET_IMSI, result);

		if (RILJ_LOGD) riljLog(rr.serialString() +
		"> getIMSI:RIL_REQUEST_GET_IMSI " +
		RIL_REQUEST_GET_IMSI +
		" " + requestToString(rr.mRequest));

		send(rr);

		/* Request service line */
		RILRequest rrSL = RILRequest.obtain(
		(SystemProperties.get("ro.build.product").equals("p999") ? 294 : 286), null);
		rrSL.mp.writeInt(0);
		if (RILJ_LOGD) riljLog(rrSL.serialString() + "> "
		+ requestToString(rrSL.mRequest));
		send(rrSL);
		}

		protected void
		processSolicited (Parcel p) {
		int serial, error;
		@@ -455,7 +505,10 @@ public class LGEStarRIL extends RIL implements CommandsInterface {
		case RIL_REQUEST_EXIT_EMERGENCY_CALLBACK_MODE: ret = responseVoid(p); break;
		case RIL_REQUEST_REPORT_SMS_MEMORY_STATUS: ret = responseVoid(p); break;
		case RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING: ret = responseVoid(p); break;
		case 143: ret = responseVoid(p); break; // ADAPTED_NETWORK_NAME
		case 152: ret = responseString(p); break; // RIL_REQUEST_GET_TE_CHARACTER_SET
		case 161: ret = responsePdpAddress(p); break; // SHOW_PDP_ADDRESS
		case 189: ret = responseVoid(p); break; // RIL_REQUEST_SET_TIME_ZONE_REPORTING
		case 273: ret = responseVoid(p); break; // SET_GMM_ATTACH_MODE
		case 286: ret = responseVoid(p); break; // GET_SERVICE_LINE
		case 294: ret = responseVoid(p); break; // GET_SERVICE_LINE
		@@ -1055,7 +1108,10 @@ public class LGEStarRIL extends RIL implements CommandsInterface {
		case RIL_REQUEST_EXIT_EMERGENCY_CALLBACK_MODE: return "REQUEST_EXIT_EMERGENCY_CALLBACK_MODE";
		case RIL_REQUEST_REPORT_SMS_MEMORY_STATUS: return "RIL_REQUEST_REPORT_SMS_MEMORY_STATUS";
		case RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING: return "RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING";
		case 152: return "RIL_REQUEST_GET_TE_CHARACTER_SET";
		case 143: return "ADAPTED_NETWORK_NAME";
		case 161: return "SHOW_PDP_ADDRESS";
		case 189: return "RIL_REQUEST_SET_TIME_ZONE_REPORTING";
		case 273: return "SET_GMM_ATTACH_MODE";
		case 286: return "GET_SERVICE_LINE"; // p990
		case 294: return "GET_SERVICE_LINE"; // p999