Merge "SamsungQualcommRIL enhance and error proof icccardobject." into cm-10.2 (26c85ab6) · Commits · e / os / android_frameworks_opt_telephony

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

+7 −5

Original line number	Diff line number	Diff line
		@@ -98,13 +98,12 @@ public class SamsungQualcommRIL extends QualcommMSIM42RIL implements CommandsInt
		numApplications = IccCardStatus.CARD_MAX_APPS;
		}
		cardStatus.mApplications = new IccCardApplicationStatus[numApplications];
		if (numApplications==1 && !isGSM){
		cardStatus.mApplications = new IccCardApplicationStatus[numApplications+2];
		}

		appStatus = new IccCardApplicationStatus();
		for (int i = 0 ; i < numApplications ; i++) {
		if (i!=0) {
		appStatus = new IccCardApplicationStatus();
		}
		appStatus.app_type = appStatus.AppTypeFromRILInt(p.readInt());
		appStatus.app_state = appStatus.AppStateFromRILInt(p.readInt());
		appStatus.perso_substate = appStatus.PersoSubstateFromRILInt(p.readInt());
		@@ -120,7 +119,10 @@ public class SamsungQualcommRIL extends QualcommMSIM42RIL implements CommandsInt
		p.readInt(); // - perso_unblock_retries
		cardStatus.mApplications[i] = appStatus;
		}
		if (numApplications==1 && !isGSM) {
		if (numApplications==1 && !isGSM && appStatus.app_type == appStatus.AppTypeFromRILInt(2)) { // usim
		cardStatus.mApplications = new IccCardApplicationStatus[numApplications+2];
		cardStatus.mGsmUmtsSubscriptionAppIndex = 0;
		cardStatus.mApplications[cardStatus.mGsmUmtsSubscriptionAppIndex]=appStatus;
		cardStatus.mCdmaSubscriptionAppIndex = 1;
		cardStatus.mImsSubscriptionAppIndex = 2;
		IccCardApplicationStatus appStatus2 = new IccCardApplicationStatus();