Merge "Read CSIM records in LTE on CDMA mode" into honeycomb-LTE (1076f5ff) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/IccConstants.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,12 @@ public interface IccConstants {
		static final int EF_CST = 0x6f32;
		static final int EF_RUIM_SPN =0x6F41;

		// ETSI TS.102.221
		static final int EF_PL = 0x2F05;
		// 3GPP2 C.S0065
		static final int EF_CSIM_LI = 0x6F3A;
		static final int EF_CSIM_SPN =0x6F41;

		//ISIM access
		static final int EF_IMPU = 0x6f04;
		static final int EF_IMPI = 0x6f02;

+1 −0

Original line number	Diff line number	Diff line
		@@ -529,6 +529,7 @@ public abstract class IccFileHandler extends Handler implements IccConstants {
		return MF_SIM + DF_TELECOM;

		case EF_ICCID:
		case EF_PL:
		return MF_SIM;
		case EF_IMG:
		return MF_SIM + DF_TELECOM + DF_GRAPHICS;

+2 −1

Original line number	Diff line number	Diff line
		@@ -58,8 +58,9 @@ public class CDMALTEPhone extends CDMAPhone {
		@Override
		protected void initSstIcc() {
		mSST = new CdmaLteServiceStateTracker(this);
		mIccRecords = new SIMRecords(this);
		mIccRecords = new CdmaLteUiccRecords(this);
		mIccCard = new SimCard(this, LOG_TAG, DBG);
		mIccFileHandler = new CdmaLteUiccFileHandler(this);
		}

		@Override

+1 −1

Original line number	Diff line number	Diff line
		@@ -156,13 +156,13 @@ public class CDMAPhone extends PhoneBase {
		mSST = new CdmaServiceStateTracker(this);
		mIccRecords = new RuimRecords(this);
		mIccCard = new RuimCard(this, LOG_TAG, DBG);
		mIccFileHandler = new RuimFileHandler(this);
		}

		protected void init(Context context, PhoneNotifier notifier) {
		mCM.setPhoneType(Phone.PHONE_TYPE_CDMA);
		mCT = new CdmaCallTracker(this);
		mSMS = new CdmaSMSDispatcher(this);
		mIccFileHandler = new RuimFileHandler(this);
		mDataConnectionTracker = new CdmaDataConnectionTracker (this);
		mRuimPhoneBookInterfaceManager = new RuimPhoneBookInterfaceManager(this);
		mRuimSmsInterfaceManager = new RuimSmsInterfaceManager(this, mSMS);

0 → 100644

+52 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2011 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.internal.telephony.cdma;

		import android.util.Log;
		import com.android.internal.telephony.IccConstants;
		import com.android.internal.telephony.IccFileHandler;

		/**
		* {@hide}
		*/
		public final class CdmaLteUiccFileHandler extends IccFileHandler {
		static final String LOG_TAG = "CDMA";

		CdmaLteUiccFileHandler(CDMALTEPhone phone) {
		super(phone);
		}

		protected String getEFPath(int efid) {
		switch(efid) {
		case EF_CSIM_SPN:
		case EF_CSIM_LI:
		return MF_SIM + DF_CDMA;
		case EF_AD:
		return MF_SIM + DF_GSM;
		}
		return getCommonIccEFPath(efid);
		}

		protected void logd(String msg) {
		Log.d(LOG_TAG, "[CdmaLteUiccFileHandler] " + msg);
		}

		protected void loge(String msg) {
		Log.e(LOG_TAG, "[CdmaLteUiccFileHandler] " + msg);
		}

		}