diff options
Diffstat (limited to 'com/android/internal/telephony/GsmCdmaPhone.java')
| -rw-r--r-- | com/android/internal/telephony/GsmCdmaPhone.java | 175 |
1 files changed, 104 insertions, 71 deletions
diff --git a/com/android/internal/telephony/GsmCdmaPhone.java b/com/android/internal/telephony/GsmCdmaPhone.java index 27364985..c9583d89 100644 --- a/com/android/internal/telephony/GsmCdmaPhone.java +++ b/com/android/internal/telephony/GsmCdmaPhone.java @@ -76,7 +76,7 @@ import com.android.internal.telephony.cdma.EriManager; import com.android.internal.telephony.gsm.GsmMmiCode; import com.android.internal.telephony.gsm.SuppServiceNotification; import com.android.internal.telephony.test.SimulatedRadioControl; -import com.android.internal.telephony.uicc.IccCardProxy; +import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppType; import com.android.internal.telephony.uicc.IccException; import com.android.internal.telephony.uicc.IccRecords; import com.android.internal.telephony.uicc.IccVmNotSupportedException; @@ -87,6 +87,7 @@ import com.android.internal.telephony.uicc.SIMRecords; import com.android.internal.telephony.uicc.UiccCard; import com.android.internal.telephony.uicc.UiccCardApplication; import com.android.internal.telephony.uicc.UiccController; +import com.android.internal.telephony.uicc.UiccProfile; import java.io.FileDescriptor; import java.io.PrintWriter; @@ -183,13 +184,14 @@ public class GsmCdmaPhone extends Phone { } private IccSmsInterfaceManager mIccSmsInterfaceManager; - private IccCardProxy mIccCardProxy; private boolean mResetModemOnRadioTechnologyChange = false; private int mRilVersion; private boolean mBroadcastEmergencyCallStateChanges = false; private CarrierKeyDownloadManager mCDM; + private CarrierInfoManager mCIM; + // Constructors public GsmCdmaPhone(Context context, CommandsInterface ci, PhoneNotifier notifier, int phoneId, @@ -242,7 +244,6 @@ public class GsmCdmaPhone extends Phone { = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE); mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, LOG_TAG); mIccSmsInterfaceManager = mTelephonyComponentFactory.makeIccSmsInterfaceManager(this); - mIccCardProxy = mTelephonyComponentFactory.makeIccCardProxy(mContext, mCi, mPhoneId); mCi.registerForAvailable(this, EVENT_RADIO_AVAILABLE, null); mCi.registerForOffOrNotAvailable(this, EVENT_RADIO_OFF_OR_NOT_AVAILABLE, null); @@ -274,6 +275,7 @@ public class GsmCdmaPhone extends Phone { mContext.registerReceiver(mBroadcastReceiver, new IntentFilter( CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED)); mCDM = new CarrierKeyDownloadManager(this); + mCIM = new CarrierInfoManager(); } private void initRatSpecific(int precisePhoneType) { @@ -283,12 +285,16 @@ public class GsmCdmaPhone extends Phone { mMeid = null; mPrecisePhoneType = precisePhoneType; + logd("Precise phone type " + mPrecisePhoneType); TelephonyManager tm = TelephonyManager.from(mContext); + UiccProfile uiccProfile = getUiccProfile(); if (isPhoneTypeGsm()) { mCi.setPhoneType(PhoneConstants.PHONE_TYPE_GSM); tm.setPhoneType(getPhoneId(), PhoneConstants.PHONE_TYPE_GSM); - mIccCardProxy.setVoiceRadioTech(ServiceState.RIL_RADIO_TECHNOLOGY_UMTS); + if (uiccProfile != null) { + uiccProfile.setVoiceRadioTech(ServiceState.RIL_RADIO_TECHNOLOGY_UMTS); + } } else { mCdmaSubscriptionSource = mCdmaSSM.getCdmaSubscriptionSource(); // This is needed to handle phone process crashes @@ -301,31 +307,30 @@ public class GsmCdmaPhone extends Phone { mCi.setPhoneType(PhoneConstants.PHONE_TYPE_CDMA); tm.setPhoneType(getPhoneId(), PhoneConstants.PHONE_TYPE_CDMA); - mIccCardProxy.setVoiceRadioTech(ServiceState.RIL_RADIO_TECHNOLOGY_1xRTT); + if (uiccProfile != null) { + uiccProfile.setVoiceRadioTech(ServiceState.RIL_RADIO_TECHNOLOGY_1xRTT); + } // Sets operator properties by retrieving from build-time system property String operatorAlpha = SystemProperties.get("ro.cdma.home.operator.alpha"); String operatorNumeric = SystemProperties.get(PROPERTY_CDMA_HOME_OPERATOR_NUMERIC); logd("init: operatorAlpha='" + operatorAlpha + "' operatorNumeric='" + operatorNumeric + "'"); - if (mUiccController.getUiccCardApplication(mPhoneId, UiccController.APP_FAM_3GPP) == - null || isPhoneTypeCdmaLte()) { - if (!TextUtils.isEmpty(operatorAlpha)) { - logd("init: set 'gsm.sim.operator.alpha' to operator='" + operatorAlpha + "'"); - tm.setSimOperatorNameForPhone(mPhoneId, operatorAlpha); - } - if (!TextUtils.isEmpty(operatorNumeric)) { - logd("init: set 'gsm.sim.operator.numeric' to operator='" + operatorNumeric + - "'"); - logd("update icc_operator_numeric=" + operatorNumeric); - tm.setSimOperatorNumericForPhone(mPhoneId, operatorNumeric); - - SubscriptionController.getInstance().setMccMnc(operatorNumeric, getSubId()); - // Sets iso country property by retrieving from build-time system property - setIsoCountryProperty(operatorNumeric); - // Updates MCC MNC device configuration information - logd("update mccmnc=" + operatorNumeric); - MccTable.updateMccMncConfiguration(mContext, operatorNumeric, false); - } + if (!TextUtils.isEmpty(operatorAlpha)) { + logd("init: set 'gsm.sim.operator.alpha' to operator='" + operatorAlpha + "'"); + tm.setSimOperatorNameForPhone(mPhoneId, operatorAlpha); + } + if (!TextUtils.isEmpty(operatorNumeric)) { + logd("init: set 'gsm.sim.operator.numeric' to operator='" + operatorNumeric + + "'"); + logd("update icc_operator_numeric=" + operatorNumeric); + tm.setSimOperatorNumericForPhone(mPhoneId, operatorNumeric); + + SubscriptionController.getInstance().setMccMnc(operatorNumeric, getSubId()); + // Sets iso country property by retrieving from build-time system property + setIsoCountryProperty(operatorNumeric); + // Updates MCC MNC device configuration information + logd("update mccmnc=" + operatorNumeric); + MccTable.updateMccMncConfiguration(mContext, operatorNumeric, false); } // Sets current entry in the telephony carrier table @@ -678,11 +683,7 @@ public class GsmCdmaPhone extends Phone { if (getUnitTestMode()) { return; } - if (isPhoneTypeGsm() || isPhoneTypeCdmaLte()) { - TelephonyManager.setTelephonyProperty(mPhoneId, property, value); - } else { - super.setSystemProperty(property, value); - } + TelephonyManager.setTelephonyProperty(mPhoneId, property, value); } @Override @@ -1537,7 +1538,7 @@ public class GsmCdmaPhone extends Phone { @Override public void setCarrierInfoForImsiEncryption(ImsiEncryptionInfo imsiEncryptionInfo) { - CarrierInfoManager.setCarrierInfoForImsiEncryption(imsiEncryptionInfo, mContext); + CarrierInfoManager.setCarrierInfoForImsiEncryption(imsiEncryptionInfo, mContext, mPhoneId); } @Override @@ -1551,6 +1552,11 @@ public class GsmCdmaPhone extends Phone { } @Override + public void resetCarrierKeysForImsiEncryption() { + mCIM.resetCarrierKeysForImsiEncryption(mContext, mPhoneId); + } + + @Override public String getGroupIdLevel1() { if (isPhoneTypeGsm()) { IccRecords r = mIccRecords.get(); @@ -1681,14 +1687,10 @@ public class GsmCdmaPhone extends Phone { @Override public String getSystemProperty(String property, String defValue) { - if (isPhoneTypeGsm() || isPhoneTypeCdmaLte()) { - if (getUnitTestMode()) { - return null; - } - return TelephonyManager.getTelephonyProperty(mPhoneId, property, defValue); - } else { - return super.getSystemProperty(property, defValue); + if (getUnitTestMode()) { + return null; } + return TelephonyManager.getTelephonyProperty(mPhoneId, property, defValue); } private boolean isValidCommandInterfaceCFAction (int commandInterfaceCFAction) { @@ -2512,6 +2514,9 @@ public class GsmCdmaPhone extends Phone { } } + // todo: check if ICC availability needs to be handled here. mSimRecords should not be needed + // now because APIs can be called directly on UiccProfile, and that should handle the requests + // correctly based on supported apps, voice RAT, etc. @Override protected void onUpdateIccAvailability() { if (mUiccController == null ) { @@ -2537,7 +2542,7 @@ public class GsmCdmaPhone extends Phone { if (mSimRecords != null) { mSimRecords.unregisterForRecordsLoaded(this); } - if (isPhoneTypeCdmaLte()) { + if (isPhoneTypeCdmaLte() || isPhoneTypeCdma()) { newUiccApplication = mUiccController.getUiccCardApplication(mPhoneId, UiccController.APP_FAM_3GPP); SIMRecords newSimRecords = null; @@ -2599,28 +2604,24 @@ public class GsmCdmaPhone extends Phone { */ @Override public boolean updateCurrentCarrierInProvider() { - if (isPhoneTypeGsm() || isPhoneTypeCdmaLte()) { - long currentDds = SubscriptionManager.getDefaultDataSubscriptionId(); - String operatorNumeric = getOperatorNumeric(); + long currentDds = SubscriptionManager.getDefaultDataSubscriptionId(); + String operatorNumeric = getOperatorNumeric(); - logd("updateCurrentCarrierInProvider: mSubId = " + getSubId() - + " currentDds = " + currentDds + " operatorNumeric = " + operatorNumeric); + logd("updateCurrentCarrierInProvider: mSubId = " + getSubId() + + " currentDds = " + currentDds + " operatorNumeric = " + operatorNumeric); - if (!TextUtils.isEmpty(operatorNumeric) && (getSubId() == currentDds)) { - try { - Uri uri = Uri.withAppendedPath(Telephony.Carriers.CONTENT_URI, "current"); - ContentValues map = new ContentValues(); - map.put(Telephony.Carriers.NUMERIC, operatorNumeric); - mContext.getContentResolver().insert(uri, map); - return true; - } catch (SQLException e) { - Rlog.e(LOG_TAG, "Can't store current operator", e); - } + if (!TextUtils.isEmpty(operatorNumeric) && (getSubId() == currentDds)) { + try { + Uri uri = Uri.withAppendedPath(Telephony.Carriers.CONTENT_URI, "current"); + ContentValues map = new ContentValues(); + map.put(Telephony.Carriers.NUMERIC, operatorNumeric); + mContext.getContentResolver().insert(uri, map); + return true; + } catch (SQLException e) { + Rlog.e(LOG_TAG, "Can't store current operator", e); } - return false; - } else { - return true; } + return false; } //CDMA @@ -3282,8 +3283,11 @@ public class GsmCdmaPhone extends Phone { mCi.setRadioPower(oldPowerState, null); } - // update voice radio tech in icc card proxy - mIccCardProxy.setVoiceRadioTech(newVoiceRadioTech); + // update voice radio tech in UiccProfile + UiccProfile uiccProfile = getUiccProfile(); + if (uiccProfile != null) { + uiccProfile.setVoiceRadioTech(newVoiceRadioTech); + } // Send an Intent to the PhoneApp that we had a radio technology change Intent intent = new Intent(TelephonyIntents.ACTION_RADIO_TECHNOLOGY_CHANGED); @@ -3300,7 +3304,13 @@ public class GsmCdmaPhone extends Phone { + (ServiceState.isGsm(newVoiceRadioTech) ? "GSM" : "CDMA")); if (ServiceState.isCdma(newVoiceRadioTech)) { - switchPhoneType(PhoneConstants.PHONE_TYPE_CDMA_LTE); + UiccCardApplication cdmaApplication = + mUiccController.getUiccCardApplication(mPhoneId, UiccController.APP_FAM_3GPP2); + if (cdmaApplication != null && cdmaApplication.getType() == AppType.APPTYPE_RUIM) { + switchPhoneType(PhoneConstants.PHONE_TYPE_CDMA); + } else { + switchPhoneType(PhoneConstants.PHONE_TYPE_CDMA_LTE); + } } else if (ServiceState.isGsm(newVoiceRadioTech)) { switchPhoneType(PhoneConstants.PHONE_TYPE_GSM); } else { @@ -3328,12 +3338,17 @@ public class GsmCdmaPhone extends Phone { @Override public boolean getIccRecordsLoaded() { - return mIccCardProxy.getIccRecordsLoaded(); + UiccProfile uiccProfile = getUiccProfile(); + return uiccProfile != null && uiccProfile.getIccRecordsLoaded(); } @Override public IccCard getIccCard() { - return mIccCardProxy; + return UiccController.getInstance().getUiccProfileForPhone(mPhoneId); + } + + private UiccProfile getUiccProfile() { + return UiccController.getInstance().getUiccProfileForPhone(mPhoneId); } @Override @@ -3365,14 +3380,6 @@ public class GsmCdmaPhone extends Phone { pw.println(" isCspPlmnEnabled()=" + isCspPlmnEnabled()); pw.flush(); pw.println("++++++++++++++++++++++++++++++++"); - - try { - mIccCardProxy.dump(fd, pw, args); - } catch (Exception e) { - e.printStackTrace(); - } - pw.flush(); - pw.println("++++++++++++++++++++++++++++++++"); pw.println("DeviceStateMonitor:"); mDeviceStateMonitor.dump(fd, pw, args); pw.println("++++++++++++++++++++++++++++++++"); @@ -3420,8 +3427,16 @@ public class GsmCdmaPhone extends Phone { if (mCdmaSubscriptionSource == CDMA_SUBSCRIPTION_NV) { operatorNumeric = SystemProperties.get("ro.cdma.home.operator.numeric"); } else if (mCdmaSubscriptionSource == CDMA_SUBSCRIPTION_RUIM_SIM) { - curIccRecords = mSimRecords; - if (curIccRecords != null) { + UiccCardApplication uiccCardApplication = mUiccApplication.get(); + if (uiccCardApplication != null + && uiccCardApplication.getType() == AppType.APPTYPE_RUIM) { + logd("Legacy RUIM app present"); + curIccRecords = mIccRecords.get(); + } else { + // Use sim-records for SimApp, USimApp, CSimApp and ISimApp. + curIccRecords = mSimRecords; + } + if (curIccRecords != null && curIccRecords == mSimRecords) { operatorNumeric = curIccRecords.getOperatorNumeric(); } else { curIccRecords = mIccRecords.get(); @@ -3534,4 +3549,22 @@ public class GsmCdmaPhone extends Phone { return mWakeLock; } + @Override + public int getLteOnCdmaMode() { + int currentConfig = super.getLteOnCdmaMode(); + int lteOnCdmaModeDynamicValue = currentConfig; + + UiccCardApplication cdmaApplication = + mUiccController.getUiccCardApplication(mPhoneId, UiccController.APP_FAM_3GPP2); + if (cdmaApplication != null && cdmaApplication.getType() == AppType.APPTYPE_RUIM) { + //Legacy RUIM cards don't support LTE. + lteOnCdmaModeDynamicValue = RILConstants.LTE_ON_CDMA_FALSE; + + //Override only if static configuration is TRUE. + if (currentConfig == RILConstants.LTE_ON_CDMA_TRUE) { + return lteOnCdmaModeDynamicValue; + } + } + return currentConfig; + } } |