Merge "HTCQualcommRIL: optionally ignore IccCard states greater than 2" into cm-10.1 (2d29503e) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/HTCQualcommRIL.java

+17 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,23 @@ public class HTCQualcommRIL extends RIL implements CommandsInterface {
		@Override
		protected Object
		responseIccCardStatus(Parcel p) {
		Object ret = super.responseIccCardStatus(p);
		Object ret;

		boolean extraIccCardStates = needsOldRilFeature("extraicccardstates");

		if (extraIccCardStates) {
		int dataPosition = p.dataPosition();
		int cardState = p.readInt();

		if (cardState >= 3) {
		ret = responseVoid(p);
		} else {
		p.setDataPosition(dataPosition);
		ret = super.responseIccCardStatus(p);
		}
		} else {
		ret = super.responseIccCardStatus(p);
		}

		// force CDMA + LTE network mode
		boolean forceCdmaLte = needsOldRilFeature("forceCdmaLteNetworkType");