Merge "Do not merge: RIL: Merge Issue. LTE SIM additions." into honeycomb-LTE (08d79acc) · Commits · e / os / android_frameworks_base

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

+2 −17

Original line number	Diff line number	Diff line
		@@ -1396,15 +1396,7 @@ public final class RIL extends BaseCommands implements CommandsInterface {
		if(mInitialRadioStateChange) {
		synchronized (mStateMonitor) {
		if (!mState.isOn()) {
		RILRequest rrPnt = RILRequest.obtain(
		RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE, null);

		rrPnt.mp.writeInt(1);
		rrPnt.mp.writeInt(mNetworkMode);
		if (RILJ_LOGD) riljLog(rrPnt.serialString() + "> "
		+ requestToString(rrPnt.mRequest) + " : " + mNetworkMode);

		send(rrPnt);
		setPreferredNetworkType(mNetworkMode, null);

		RILRequest rrCs = RILRequest.obtain(
		RIL_REQUEST_CDMA_SET_SUBSCRIPTION_SOURCE, null);
		@@ -2071,17 +2063,10 @@ public final class RIL extends BaseCommands implements CommandsInterface {
		*/
		if (RILJ_LOGD) Log.d(LOG_TAG, "Radio ON @ init; reset to OFF");
		setRadioPower(false, null);
		// MultimodeRIL needs to know the preferred network at power up.
		RILRequest rrPnt = RILRequest.obtain(
		RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE, null);
		rrPnt.mp.writeInt(1);
		rrPnt.mp.writeInt(mNetworkMode);
		if (RILJ_LOGD) riljLog(rrPnt.serialString() + "> "
		+ requestToString(rrPnt.mRequest) + " : " + mNetworkMode);
		send(rrPnt);
		} else {
		if (DBG) Log.d(LOG_TAG, "Radio OFF @ init");
		setRadioState(newState);
		setPreferredNetworkType(mNetworkMode, null);
		}
		mInitialRadioStateChange = false;
		} else {