Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE (12b91edc) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/TelephonyProperties.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -166,4 +166,11 @@ public interface TelephonyProperties
		* the value of config_sms_capable
		*/
		static final String PROPERTY_SMS_SEND = "telephony.sms.send";

		/**
		* Set to true to indicate a test CSIM card is used in the device.
		* This property is for testing purpose only. This should not be defined
		* in commercial configuration.
		*/
		static final String PROPERTY_TEST_CSIM = "persist.radio.test-csim";
		}

+7 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@
		package com.android.internal.telephony.cdma;

		import static com.android.internal.telephony.TelephonyProperties.PROPERTY_ICC_OPERATOR_ALPHA;
		import static com.android.internal.telephony.TelephonyProperties.PROPERTY_TEST_CSIM;
		import com.android.internal.telephony.GsmAlphabet;
		import com.android.internal.telephony.IccCardApplication.AppType;
		import com.android.internal.telephony.IccFileHandler;
		@@ -447,6 +448,12 @@ public final class CdmaLteUiccRecords extends SIMRecords {
		// to determine if the SIM is provisioned. Otherwise,
		// consider the SIM is provisioned. (for case of ordinal
		// USIM only UICC.)
		// If PROPERTY_TEST_CSIM is defined, bypess provision check
		// and consider the SIM is provisioned.
		if (SystemProperties.getBoolean(PROPERTY_TEST_CSIM, false)) {
		return true;
		}

		if (phone.mIccCard.isApplicationOnIcc(AppType.APPTYPE_CSIM) &&
		((mMdn == null) \|\| (mMin == null))) {
		return false;