Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 12b91edc: Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE

Browse Source 
* commit '12b91edc81763b69090bf5815bc8d59ab8d8f342':
  Add a property so that CSIM provision check can be bypassed
This commit is contained in:
Wink Saville
2011-07-10 19:35:14 -07:00
committed by Android Git Automerger
parent a9e00a4ac8 12b91edc81
commit 0ddd996006
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
telephony/java/com/android/internal/telephony/TelephonyProperties.java
View File

@@ -166,4 +166,11 @@ public interface TelephonyProperties
* the value of config_sms_capable * the value of config_sms_capable
*/ */
static final String PROPERTY_SMS_SEND = "telephony.sms.send"; 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
telephony/java/com/android/internal/telephony/cdma/CdmaLteUiccRecords.java
View File

@@ -16,6 +16,7 @@
package com.android.internal.telephony.cdma; 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_ICC_OPERATOR_ALPHA;
import static com.android.internal.telephony.TelephonyProperties.PROPERTY_TEST_CSIM;
import com.android.internal.telephony.GsmAlphabet; import com.android.internal.telephony.GsmAlphabet;
import com.android.internal.telephony.IccCardApplication.AppType; import com.android.internal.telephony.IccCardApplication.AppType;
import com.android.internal.telephony.IccFileHandler; import com.android.internal.telephony.IccFileHandler;
@@ -447,6 +448,12 @@ public final class CdmaLteUiccRecords extends SIMRecords {
// to determine if the SIM is provisioned. Otherwise, // to determine if the SIM is provisioned. Otherwise,
// consider the SIM is provisioned. (for case of ordinal // consider the SIM is provisioned. (for case of ordinal
// USIM only UICC.) // 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) && if (phone.mIccCard.isApplicationOnIcc(AppType.APPTYPE_CSIM) &&
((mMdn == null) || (mMin == null))) { ((mMdn == null) || (mMin == null))) {
return false; return false;