Merge changes I87e833d9,I722e2c61 into jellybean (4f8cc885) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/SamsungCDMAQualcommRIL.java

+77 −217

Original line number	Diff line number	Diff line
		@@ -41,27 +41,24 @@ import java.util.ArrayList;
		import java.util.Collections;

		/**
		* Samsung CDMA RIL doesn't send CDMA NV in RIUM infomation format which causes the CDMA RIL stack to crash and end up not being provisioned.
		* Samsung put CDMA NV in GSM format. I forced the RIL stack to process CDMA NV request as a GSM SIM in CDMA mode.
		* Custom Qualcomm No SimReady RIL using the latest Uicc stack
		* Samsung CDMA RIL doesn't send CDMA NV in RIUM infomation format which causes
		* the CDMA RIL stack to crash and end up not being provisioned. Samsung put
		* CDMA NV in GSM format. I forced the RIL stack to process CDMA NV request as a
		* GSM SIM in CDMA mode. Custom Qualcomm No SimReady RIL using the latest Uicc
		* stack
		*
		* {@hide}
		*/
		public class SamsungCDMAQualcommRIL extends QualcommSharedRIL implements CommandsInterface {
		protected IccHandler mIccHandler;
		private final int RIL_INT_RADIO_OFF = 0;
		private final int RIL_INT_RADIO_UNAVALIABLE = 1;
		private final int RIL_INT_RADIO_ON = 2;
		private final int RIL_INT_RADIO_ON_NG = 10;
		private final int RIL_INT_RADIO_ON_HTC = 13;

		public SamsungCDMAQualcommRIL(Context context, int networkMode, int cdmaSubscription) {
		public class SamsungCDMAQualcommRIL extends QualcommSharedRIL implements
		CommandsInterface {

		public SamsungCDMAQualcommRIL(Context context, int networkMode,
		int cdmaSubscription) {
		super(context, networkMode, cdmaSubscription);
		}

		@Override
		protected Object
		responseIccCardStatus(Parcel p) {
		protected Object responseIccCardStatus(Parcel p) {
		IccCardApplication ca;

		IccCardStatus status = new IccCardStatus();
		@@ -101,12 +98,10 @@ public class SamsungCDMAQualcommRIL extends QualcommSharedRIL implements Command
		appIndex = status.getGsmUmtsSubscriptionAppIndex();
		Log.d(LOG_TAG, "This is a CDMA PHONE " + appIndex);


		if (numApplications > 0) {
		IccCardApplication application = status.getApplication(appIndex);
		mAid = application.aid;
		mUSIM = application.app_type
		== IccCardApplication.AppType.APPTYPE_USIM;
		mUSIM = application.app_type == IccCardApplication.AppType.APPTYPE_USIM;
		mSetPreferredNetworkType = mPreferredNetworkType;

		if (TextUtils.isEmpty(mAid))
		@@ -117,47 +112,8 @@ public class SamsungCDMAQualcommRIL extends QualcommSharedRIL implements Command
		return status;
		}

		private void setRadioStateFromRILInt (int stateCode) {
		CommandsInterface.RadioState radioState;
		HandlerThread handlerThread;
		Looper looper;
		IccHandler iccHandler;

		switch (stateCode) {
		case RIL_INT_RADIO_OFF:
		radioState = CommandsInterface.RadioState.RADIO_OFF;
		if (mIccHandler != null) {
		mIccThread = null;
		mIccHandler = null;
		}
		break;
		case RIL_INT_RADIO_UNAVALIABLE:
		radioState = CommandsInterface.RadioState.RADIO_UNAVAILABLE;
		break;
		case RIL_INT_RADIO_ON:
		case RIL_INT_RADIO_ON_NG:
		case RIL_INT_RADIO_ON_HTC:
		if (mIccHandler == null) {
		handlerThread = new HandlerThread("IccHandler");
		mIccThread = handlerThread;

		mIccThread.start();

		looper = mIccThread.getLooper();
		mIccHandler = new IccHandler(this,looper);
		mIccHandler.run();
		}
		radioState = CommandsInterface.RadioState.RADIO_ON;
		break;
		default:
		throw new RuntimeException("Unrecognized RIL_RadioState: " + stateCode);
		}

		setRadioState (radioState);
		}
		@Override
		protected Object
		responseSignalStrength(Parcel p) {
		protected Object responseSignalStrength(Parcel p) {
		int numInts = 12;
		int response[];

		@@ -169,14 +125,15 @@ public class SamsungCDMAQualcommRIL extends QualcommSharedRIL implements Command
		for (int i = 0; i < numInts; i++) {
		response[i] = p.readInt();
		}
		//Workaround: use cdmaecio and evdoecio to determine signal strength and it is better than no signal bars
		//TODO: find a proper fix for it
		response[2] = response[3]*4; // mutiply by 4 simulate dbm so the signal bars do not jump often to full bars
		response[4] = response[5]*4;
		// Take just the least significant byte as the signal strength
		response[2] %= 256;
		response[4] %= 256;

		// RIL_LTE_SignalStrength
		if (response[7] == 99) {
		// If LTE is not enabled, clear LTE results
		// 7-11 must be -1 for GSM signal strength to be used (see frameworks/base/telephony/java/android/telephony/SignalStrength.java)
		// 7-11 must be -1 for GSM signal strength to be used (see
		// frameworks/base/telephony/java/android/telephony/SignalStrength.java)
		response[7] = -1;
		response[8] = -1;
		response[9] = -1;
		@@ -191,8 +148,7 @@ public class SamsungCDMAQualcommRIL extends QualcommSharedRIL implements Command
		}

		@Override
		protected Object
		responseCallList(Parcel p) {
		protected Object responseCallList(Parcel p) {
		int num;
		int voiceSettings;
		ArrayList<DriverCall> response;
		@@ -230,7 +186,8 @@ public class SamsungCDMAQualcommRIL extends QualcommSharedRIL implements Command
		dc.uusInfo.setDcs(p.readInt());
		byte[] userData = p.createByteArray();
		dc.uusInfo.setUserData(userData);
		riljLogv(String.format("Incoming UUS : type=%d, dcs=%d, length=%d",
		riljLogv(String.format(
		"Incoming UUS : type=%d, dcs=%d, length=%d",
		dc.uusInfo.getType(), dc.uusInfo.getDcs(),
		dc.uusInfo.getUserData().length));
		riljLogv("Incoming UUS : data (string)="
		@@ -242,7 +199,8 @@ public class SamsungCDMAQualcommRIL extends QualcommSharedRIL implements Command
		}

		// Make sure there's a leading + on addresses with a TOA of 145
		dc.number = PhoneNumberUtils.stringFromStringAndTOA(dc.number, dc.TOA);
		dc.number = PhoneNumberUtils.stringFromStringAndTOA(dc.number,
		dc.TOA);

		response.add(dc);

		@@ -296,122 +254,24 @@ public class SamsungCDMAQualcommRIL extends QualcommSharedRIL implements Command
		// drop it so it's never seen by CallNotifier. If other signal tones are
		// observed to cause this problem, they should be dropped here as well.
		@Override
		protected void
		notifyRegistrantsCdmaInfoRec(CdmaInformationRecords infoRec) {
		protected void notifyRegistrantsCdmaInfoRec(CdmaInformationRecords infoRec) {
		final int response = RIL_UNSOL_CDMA_INFO_REC;

		if (infoRec.record instanceof CdmaSignalInfoRec) {
		CdmaSignalInfoRec sir = (CdmaSignalInfoRec) infoRec.record;
		if (sir != null && sir.isPresent &&
		sir.signalType == SignalToneUtil.IS95_CONST_IR_SIGNAL_IS54B &&
		sir.alertPitch == SignalToneUtil.IS95_CONST_IR_ALERT_MED &&
		sir.signal == SignalToneUtil.IS95_CONST_IR_SIG_IS54B_L) {

		Log.d(LOG_TAG, "Dropping \"" + responseToString(response) + " " +
		retToString(response, sir) + "\" to prevent \"ring of death\" bug.");
		if (sir != null
		&& sir.isPresent
		&& sir.signalType == SignalToneUtil.IS95_CONST_IR_SIGNAL_IS54B
		&& sir.alertPitch == SignalToneUtil.IS95_CONST_IR_ALERT_MED
		&& sir.signal == SignalToneUtil.IS95_CONST_IR_SIG_IS54B_L) {

		Log.d(LOG_TAG, "Dropping \"" + responseToString(response) + " "
		+ retToString(response, sir)
		+ "\" to prevent \"ring of death\" bug.");
		return;
		}
		}

		super.notifyRegistrantsCdmaInfoRec(infoRec);
		}

		class IccHandler extends Handler implements Runnable {
		private static final int EVENT_RADIO_ON = 1;
		private static final int EVENT_ICC_STATUS_CHANGED = 2;
		private static final int EVENT_GET_ICC_STATUS_DONE = 3;
		private static final int EVENT_RADIO_OFF_OR_UNAVAILABLE = 4;

		private RIL mRil;
		private boolean mRadioOn = false;

		public IccHandler (RIL ril, Looper looper) {
		super (looper);
		mRil = ril;
		}

		public void handleMessage (Message paramMessage) {
		switch (paramMessage.what) {
		case EVENT_RADIO_ON:
		mRadioOn = true;
		Log.d(LOG_TAG, "Radio on -> Forcing sim status update");
		sendMessage(obtainMessage(EVENT_ICC_STATUS_CHANGED));
		break;
		case EVENT_GET_ICC_STATUS_DONE:
		AsyncResult asyncResult = (AsyncResult) paramMessage.obj;
		if (asyncResult.exception != null) {
		Log.e (LOG_TAG, "IccCardStatusDone shouldn't return exceptions!", asyncResult.exception);
		break;
		}
		IccCardStatus status = (IccCardStatus) asyncResult.result;
		if (status.getNumApplications() == 0) {
		if (!mRil.getRadioState().isOn()) {
		break;
		}
		mRil.setRadioState(CommandsInterface.RadioState.RADIO_ON);
		} else {
		int appIndex = -1;
		appIndex = status.getGsmUmtsSubscriptionAppIndex();
		Log.d(LOG_TAG, "This is a CDMA PHONE " + appIndex);

		IccCardApplication application = status.getApplication(appIndex);
		IccCardApplication.AppState app_state = application.app_state;
		IccCardApplication.AppType app_type = application.app_type;

		switch (app_state) {
		case APPSTATE_PIN:
		case APPSTATE_PUK:
		switch (app_type) {
		case APPTYPE_SIM:
		case APPTYPE_USIM:
		case APPTYPE_RUIM:
		mRil.setRadioState(CommandsInterface.RadioState.RADIO_ON);
		break;
		default:
		Log.e(LOG_TAG, "Currently we don't handle SIMs of type: " + app_type);
		return;
		}
		break;
		case APPSTATE_READY:
		switch (app_type) {
		case APPTYPE_SIM:
		case APPTYPE_USIM:
		case APPTYPE_RUIM:
		mRil.setRadioState(CommandsInterface.RadioState.RADIO_ON);
		break;
		default:
		Log.e(LOG_TAG, "Currently we don't handle SIMs of type: " + app_type);
		return;
		}
		break;
		default:
		return;
		}
		}
		break;
		case EVENT_ICC_STATUS_CHANGED:
		if (mRadioOn) {
		Log.d(LOG_TAG, "Received EVENT_ICC_STATUS_CHANGED, calling getIccCardStatus");
		mRil.getIccCardStatus(obtainMessage(EVENT_GET_ICC_STATUS_DONE, paramMessage.obj));
		} else {
		Log.d(LOG_TAG, "Received EVENT_ICC_STATUS_CHANGED while radio is not ON. Ignoring");
		}
		break;
		case EVENT_RADIO_OFF_OR_UNAVAILABLE:
		mRadioOn = false;
		// disposeCards(); // to be verified;
		default:
		Log.e(LOG_TAG, " Unknown Event " + paramMessage.what);
		break;
		}
		}

		public void run () {
		mRil.registerForIccStatusChanged(this, EVENT_ICC_STATUS_CHANGED, null);
		Message msg = obtainMessage(EVENT_RADIO_ON);
		mRil.getIccCardStatus(msg);
		}
		}


		}