Reorganize IccSmsInterfaceManager (6f2a3e1e) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

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

+332 −11

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2008 The Android Open Source Project
		* Copyright (c) 2013, The Linux Foundation. All rights reserved.
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -24,9 +25,13 @@ import android.os.AsyncResult;
		import android.os.Binder;
		import android.os.Handler;
		import android.os.Message;
		import android.os.ServiceManager;
		import android.telephony.Rlog;
		import android.util.Log;

		import com.android.internal.telephony.ISms;
		import com.android.internal.telephony.gsm.SmsBroadcastConfigInfo;
		import com.android.internal.telephony.cdma.CdmaSmsBroadcastConfigInfo;
		import com.android.internal.telephony.uicc.IccConstants;
		import com.android.internal.telephony.uicc.IccFileHandler;
		import com.android.internal.util.HexDump;
		@@ -43,7 +48,7 @@ import static android.telephony.SmsManager.STATUS_ON_ICC_UNREAD;
		* IccSmsInterfaceManager to provide an inter-process communication to
		* access Sms in Icc.
		*/
		public abstract class IccSmsInterfaceManager extends ISms.Stub {
		public class IccSmsInterfaceManager extends ISms.Stub {
		static final String LOG_TAG = "IccSmsInterfaceManager";
		static final boolean DBG = true;

		@@ -51,12 +56,19 @@ public abstract class IccSmsInterfaceManager extends ISms.Stub {
		protected boolean mSuccess;
		private List<SmsRawData> mSms;

		private CellBroadcastRangeManager mCellBroadcastRangeManager =
		new CellBroadcastRangeManager();
		private CdmaBroadcastRangeManager mCdmaBroadcastRangeManager =
		new CdmaBroadcastRangeManager();

		private static final int EVENT_LOAD_DONE = 1;
		private static final int EVENT_UPDATE_DONE = 2;
		protected static final int EVENT_SET_BROADCAST_ACTIVATION_DONE = 3;
		protected static final int EVENT_SET_BROADCAST_CONFIG_DONE = 4;
		private static final int SMS_CB_CODE_SCHEME_MIN = 0;
		private static final int SMS_CB_CODE_SCHEME_MAX = 255;

		final protected PhoneBase mPhone;
		protected PhoneBase mPhone;
		final protected Context mContext;
		final protected AppOpsManager mAppOps;
		protected SMSDispatcher mDispatcher;
		@@ -78,11 +90,14 @@ public abstract class IccSmsInterfaceManager extends ISms.Stub {
		ar = (AsyncResult)msg.obj;
		synchronized (mLock) {
		if (ar.exception == null) {
		mSms = buildValidRawData((ArrayList<byte[]>) ar.result);
		mSms = (List<SmsRawData>)
		buildValidRawData((ArrayList<byte[]>) ar.result);
		//Mark SMS as read after importing it from card.
		markMessagesAsRead((ArrayList<byte[]>) ar.result);
		} else {
		if(DBG) log("Cannot load Sms records");
		if (Rlog.isLoggable("SMS", Log.DEBUG)) {
		log("Cannot load Sms records");
		}
		if (mSms != null)
		mSms.clear();
		}
		@@ -105,6 +120,9 @@ public abstract class IccSmsInterfaceManager extends ISms.Stub {
		mPhone = phone;
		mContext = phone.getContext();
		mAppOps = (AppOpsManager) mContext.getSystemService(Context.APP_OPS_SERVICE);
		if (ServiceManager.getService("isms") == null) {
		ServiceManager.addService("isms", this);
		}
		}

		protected void markMessagesAsRead(ArrayList<byte[]> messages) {
		@@ -140,6 +158,10 @@ public abstract class IccSmsInterfaceManager extends ISms.Stub {
		}
		}

		protected void updatePhoneObject(PhoneBase phone) {
		mPhone = phone;
		}

		protected void enforceReceiveAndSend(String message) {
		mContext.enforceCallingPermission(
		Manifest.permission.RECEIVE_SMS, message);
		@@ -178,7 +200,11 @@ public abstract class IccSmsInterfaceManager extends ISms.Stub {
		// Special case FREE: call deleteSmsOnSim/Ruim instead of
		// manipulating the record
		// Will eventually fail if icc card is not present.
		deleteSms(index, response);
		if (PhoneConstants.PHONE_TYPE_GSM == mPhone.getPhoneType()) {
		mPhone.mCi.deleteSmsOnSim(index, response);
		} else {
		mPhone.mCi.deleteSmsOnRuim(index, response);
		}
		} else {
		//IccFilehandler can be null if ICC card is not present.
		IccFileHandler fh = mPhone.getIccFileHandler();
		@@ -225,7 +251,13 @@ public abstract class IccSmsInterfaceManager extends ISms.Stub {
		Message response = mHandler.obtainMessage(EVENT_UPDATE_DONE);

		//RIL_REQUEST_WRITE_SMS_TO_SIM vs RIL_REQUEST_CDMA_WRITE_SMS_TO_RUIM
		writeSms(status, smsc, pdu, response);
		if (PhoneConstants.PHONE_TYPE_GSM == mPhone.getPhoneType()) {
		mPhone.mCi.writeSmsToSim(status, IccUtils.bytesToHexString(smsc),
		IccUtils.bytesToHexString(pdu), response);
		} else {
		mPhone.mCi.writeSmsToRuim(status, IccUtils.bytesToHexString(pdu),
		response);
		}

		try {
		mLock.wait();
		@@ -465,10 +497,299 @@ public abstract class IccSmsInterfaceManager extends ISms.Stub {
		return data;
		}

		protected abstract void deleteSms(int index, Message response);
		public boolean enableCellBroadcast(int messageIdentifier) {
		return enableCellBroadcastRange(messageIdentifier, messageIdentifier);
		}

		public boolean disableCellBroadcast(int messageIdentifier) {
		return disableCellBroadcastRange(messageIdentifier, messageIdentifier);
		}

		public boolean enableCellBroadcastRange(int startMessageId, int endMessageId) {
		if (PhoneConstants.PHONE_TYPE_GSM == mPhone.getPhoneType()) {
		return enableGsmBroadcastRange(startMessageId, endMessageId);
		} else {
		return enableCdmaBroadcastRange(startMessageId, endMessageId);
		}
		}

		protected abstract void writeSms(int status, byte[] pdu, byte[] smsc, Message response);
		public boolean disableCellBroadcastRange(int startMessageId, int endMessageId) {
		if (PhoneConstants.PHONE_TYPE_GSM == mPhone.getPhoneType()) {
		return disableGsmBroadcastRange(startMessageId, endMessageId);
		} else {
		return disableCdmaBroadcastRange(startMessageId, endMessageId);
		}
		}

		synchronized public boolean enableGsmBroadcastRange(int startMessageId, int endMessageId) {
		if (DBG) log("enableGsmBroadcastRange");

		Context context = mPhone.getContext();

		context.enforceCallingPermission(
		"android.permission.RECEIVE_SMS",
		"Enabling cell broadcast SMS");

		String client = context.getPackageManager().getNameForUid(
		Binder.getCallingUid());

		if (!mCellBroadcastRangeManager.enableRange(startMessageId, endMessageId, client)) {
		log("Failed to add cell broadcast subscription for MID range " + startMessageId
		+ " to " + endMessageId + " from client " + client);
		return false;
		}

		if (DBG)
		log("Added cell broadcast subscription for MID range " + startMessageId
		+ " to " + endMessageId + " from client " + client);

		setCellBroadcastActivation(!mCellBroadcastRangeManager.isEmpty());

		return true;
		}

		synchronized public boolean disableGsmBroadcastRange(int startMessageId, int endMessageId) {
		if (DBG) log("disableGsmBroadcastRange");

		Context context = mPhone.getContext();

		context.enforceCallingPermission(
		"android.permission.RECEIVE_SMS",
		"Disabling cell broadcast SMS");

		String client = context.getPackageManager().getNameForUid(
		Binder.getCallingUid());

		if (!mCellBroadcastRangeManager.disableRange(startMessageId, endMessageId, client)) {
		log("Failed to remove cell broadcast subscription for MID range " + startMessageId
		+ " to " + endMessageId + " from client " + client);
		return false;
		}

		protected abstract void log(String msg);
		if (DBG)
		log("Removed cell broadcast subscription for MID range " + startMessageId
		+ " to " + endMessageId + " from client " + client);

		setCellBroadcastActivation(!mCellBroadcastRangeManager.isEmpty());

		return true;
		}

		synchronized public boolean enableCdmaBroadcastRange(int startMessageId, int endMessageId) {
		if (DBG) log("enableCdmaBroadcastRange");

		Context context = mPhone.getContext();

		context.enforceCallingPermission(
		"android.permission.RECEIVE_SMS",
		"Enabling cdma broadcast SMS");

		String client = context.getPackageManager().getNameForUid(
		Binder.getCallingUid());

		if (!mCdmaBroadcastRangeManager.enableRange(startMessageId, endMessageId, client)) {
		log("Failed to add cdma broadcast subscription for MID range " + startMessageId
		+ " to " + endMessageId + " from client " + client);
		return false;
		}

		if (DBG)
		log("Added cdma broadcast subscription for MID range " + startMessageId
		+ " to " + endMessageId + " from client " + client);

		setCdmaBroadcastActivation(!mCdmaBroadcastRangeManager.isEmpty());

		return true;
		}

		synchronized public boolean disableCdmaBroadcastRange(int startMessageId, int endMessageId) {
		if (DBG) log("disableCdmaBroadcastRange");

		Context context = mPhone.getContext();

		context.enforceCallingPermission(
		"android.permission.RECEIVE_SMS",
		"Disabling cell broadcast SMS");

		String client = context.getPackageManager().getNameForUid(
		Binder.getCallingUid());

		if (!mCdmaBroadcastRangeManager.disableRange(startMessageId, endMessageId, client)) {
		log("Failed to remove cdma broadcast subscription for MID range " + startMessageId
		+ " to " + endMessageId + " from client " + client);
		return false;
		}

		if (DBG)
		log("Removed cdma broadcast subscription for MID range " + startMessageId
		+ " to " + endMessageId + " from client " + client);

		setCdmaBroadcastActivation(!mCdmaBroadcastRangeManager.isEmpty());

		return true;
		}

		class CellBroadcastRangeManager extends IntRangeManager {
		private ArrayList<SmsBroadcastConfigInfo> mConfigList =
		new ArrayList<SmsBroadcastConfigInfo>();

		/**
		* Called when the list of enabled ranges has changed. This will be
		* followed by zero or more calls to {@link #addRange} followed by
		* a call to {@link #finishUpdate}.
		*/
		protected void startUpdate() {
		mConfigList.clear();
		}

		/**
		* Called after {@link #startUpdate} to indicate a range of enabled
		* values.
		* @param startId the first id included in the range
		* @param endId the last id included in the range
		*/
		protected void addRange(int startId, int endId, boolean selected) {
		mConfigList.add(new SmsBroadcastConfigInfo(startId, endId,
		SMS_CB_CODE_SCHEME_MIN, SMS_CB_CODE_SCHEME_MAX, selected));
		}

		/**
		* Called to indicate the end of a range update started by the
		* previous call to {@link #startUpdate}.
		* @return true if successful, false otherwise
		*/
		protected boolean finishUpdate() {
		if (mConfigList.isEmpty()) {
		return true;
		} else {
		SmsBroadcastConfigInfo[] configs =
		mConfigList.toArray(new SmsBroadcastConfigInfo[mConfigList.size()]);
		return setCellBroadcastConfig(configs);
		}
		}
		}

		class CdmaBroadcastRangeManager extends IntRangeManager {
		private ArrayList<CdmaSmsBroadcastConfigInfo> mConfigList =
		new ArrayList<CdmaSmsBroadcastConfigInfo>();

		/**
		* Called when the list of enabled ranges has changed. This will be
		* followed by zero or more calls to {@link #addRange} followed by a
		* call to {@link #finishUpdate}.
		*/
		protected void startUpdate() {
		mConfigList.clear();
		}

		/**
		* Called after {@link #startUpdate} to indicate a range of enabled
		* values.
		* @param startId the first id included in the range
		* @param endId the last id included in the range
		*/
		protected void addRange(int startId, int endId, boolean selected) {
		mConfigList.add(new CdmaSmsBroadcastConfigInfo(startId, endId,
		1, selected));
		}

		/**
		* Called to indicate the end of a range update started by the previous
		* call to {@link #startUpdate}.
		* @return true if successful, false otherwise
		*/
		protected boolean finishUpdate() {
		if (mConfigList.isEmpty()) {
		return true;
		} else {
		CdmaSmsBroadcastConfigInfo[] configs =
		mConfigList.toArray(new CdmaSmsBroadcastConfigInfo[mConfigList.size()]);
		return setCdmaBroadcastConfig(configs);
		}
		}
		}

		private boolean setCellBroadcastConfig(SmsBroadcastConfigInfo[] configs) {
		if (DBG)
		log("Calling setGsmBroadcastConfig with " + configs.length + " configurations");

		synchronized (mLock) {
		Message response = mHandler.obtainMessage(EVENT_SET_BROADCAST_CONFIG_DONE);

		mSuccess = false;
		mPhone.mCi.setGsmBroadcastConfig(configs, response);

		try {
		mLock.wait();
		} catch (InterruptedException e) {
		log("interrupted while trying to set cell broadcast config");
		}
		}

		return mSuccess;
		}

		private boolean setCellBroadcastActivation(boolean activate) {
		if (DBG)
		log("Calling setCellBroadcastActivation(" + activate + ')');

		synchronized (mLock) {
		Message response = mHandler.obtainMessage(EVENT_SET_BROADCAST_ACTIVATION_DONE);

		mSuccess = false;
		mPhone.mCi.setGsmBroadcastActivation(activate, response);

		try {
		mLock.wait();
		} catch (InterruptedException e) {
		log("interrupted while trying to set cell broadcast activation");
		}
		}

		return mSuccess;
		}

		private boolean setCdmaBroadcastConfig(CdmaSmsBroadcastConfigInfo[] configs) {
		if (DBG)
		log("Calling setCdmaBroadcastConfig with " + configs.length + " configurations");

		synchronized (mLock) {
		Message response = mHandler.obtainMessage(EVENT_SET_BROADCAST_CONFIG_DONE);

		mSuccess = false;
		mPhone.mCi.setCdmaBroadcastConfig(configs, response);

		try {
		mLock.wait();
		} catch (InterruptedException e) {
		log("interrupted while trying to set cdma broadcast config");
		}
		}

		return mSuccess;
		}

		private boolean setCdmaBroadcastActivation(boolean activate) {
		if (DBG)
		log("Calling setCdmaBroadcastActivation(" + activate + ")");

		synchronized (mLock) {
		Message response = mHandler.obtainMessage(EVENT_SET_BROADCAST_ACTIVATION_DONE);

		mSuccess = false;
		mPhone.mCi.setCdmaBroadcastActivation(activate, response);

		try {
		mLock.wait();
		} catch (InterruptedException e) {
		log("interrupted while trying to set cdma broadcast activation");
		}
		}

		return mSuccess;
		}

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

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

deleted100644 → 0

+0 −109

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2008 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;

		import android.app.PendingIntent;
		import android.os.ServiceManager;

		import java.util.List;

		public class IccSmsInterfaceManagerProxy extends ISms.Stub {
		private IccSmsInterfaceManager mIccSmsInterfaceManager;

		public IccSmsInterfaceManagerProxy(IccSmsInterfaceManager
		iccSmsInterfaceManager) {
		mIccSmsInterfaceManager = iccSmsInterfaceManager;
		if(ServiceManager.getService("isms") == null) {
		ServiceManager.addService("isms", this);
		}
		}

		public void setmIccSmsInterfaceManager(IccSmsInterfaceManager iccSmsInterfaceManager) {
		mIccSmsInterfaceManager = iccSmsInterfaceManager;
		}

		@Override
		public boolean
		updateMessageOnIccEf(String callingPackage, int index, int status, byte[] pdu) {
		return mIccSmsInterfaceManager.updateMessageOnIccEf(callingPackage, index, status, pdu);
		}

		@Override
		public boolean copyMessageToIccEf(String callingPackage, int status, byte[] pdu,
		byte[] smsc) {
		return mIccSmsInterfaceManager.copyMessageToIccEf(callingPackage, status, pdu, smsc);
		}

		@Override
		public List<SmsRawData> getAllMessagesFromIccEf(String callingPackage) {
		return mIccSmsInterfaceManager.getAllMessagesFromIccEf(callingPackage);
		}

		@Override
		public void sendData(String callingPackage, String destAddr, String scAddr, int destPort,
		byte[] data, PendingIntent sentIntent, PendingIntent deliveryIntent) {
		mIccSmsInterfaceManager.sendData(callingPackage, destAddr, scAddr, destPort, data,
		sentIntent, deliveryIntent);
		}

		@Override
		public void sendText(String callingPackage, String destAddr, String scAddr,
		String text, PendingIntent sentIntent, PendingIntent deliveryIntent) {
		mIccSmsInterfaceManager.sendText(callingPackage, destAddr, scAddr, text, sentIntent,
		deliveryIntent);
		}

		@Override
		public void sendMultipartText(String callingPackage, String destAddr, String scAddr,
		List<String> parts, List<PendingIntent> sentIntents,
		List<PendingIntent> deliveryIntents) {
		mIccSmsInterfaceManager.sendMultipartText(callingPackage, destAddr, scAddr,
		parts, sentIntents, deliveryIntents);
		}

		@Override
		public boolean enableCellBroadcast(int messageIdentifier) throws android.os.RemoteException {
		return mIccSmsInterfaceManager.enableCellBroadcast(messageIdentifier);
		}

		@Override
		public boolean disableCellBroadcast(int messageIdentifier) throws android.os.RemoteException {
		return mIccSmsInterfaceManager.disableCellBroadcast(messageIdentifier);
		}

		@Override
		public boolean enableCellBroadcastRange(int startMessageId, int endMessageId)
		throws android.os.RemoteException {
		return mIccSmsInterfaceManager.enableCellBroadcastRange(startMessageId, endMessageId);
		}

		@Override
		public boolean disableCellBroadcastRange(int startMessageId, int endMessageId)
		throws android.os.RemoteException {
		return mIccSmsInterfaceManager.disableCellBroadcastRange(startMessageId, endMessageId);
		}

		@Override
		public int getPremiumSmsPermission(String packageName) {
		return mIccSmsInterfaceManager.getPremiumSmsPermission(packageName);
		}

		@Override
		public void setPremiumSmsPermission(String packageName, int permission) {
		mIccSmsInterfaceManager.setPremiumSmsPermission(packageName, permission);
		}
		}

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

+0 −5

Original line number	Diff line number	Diff line
		@@ -1386,11 +1386,6 @@ public interface Phone {
		*/
		public PhoneSubInfo getPhoneSubInfo();

		/**
		* Retrieves the IccSmsInterfaceManager of the Phone
		*/
		public IccSmsInterfaceManager getIccSmsInterfaceManager();

		/**
		* Retrieves the IccPhoneBookInterfaceManager of the Phone
		*/

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

+5 −10

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2008 The Android Open Source Project
		* Copyright (c) 2013, The Linux Foundation. All rights reserved.
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -46,7 +47,7 @@ public class PhoneProxy extends Handler implements Phone {

		private Phone mActivePhone;
		private CommandsInterface mCommandsInterface;
		private IccSmsInterfaceManagerProxy mIccSmsInterfaceManagerProxy;
		private IccSmsInterfaceManager mIccSmsInterfaceManager;
		private IccPhoneBookInterfaceManagerProxy mIccPhoneBookInterfaceManagerProxy;
		private PhoneSubInfoProxy mPhoneSubInfoProxy;
		private IccCardProxy mIccCardProxy;
		@@ -68,8 +69,8 @@ public class PhoneProxy extends Handler implements Phone {
		mActivePhone = phone;
		mResetModemOnRadioTechnologyChange = SystemProperties.getBoolean(
		TelephonyProperties.PROPERTY_RESET_ON_RADIO_TECH_CHANGE, false);
		mIccSmsInterfaceManagerProxy = new IccSmsInterfaceManagerProxy(
		phone.getIccSmsInterfaceManager());
		mIccSmsInterfaceManager =
		new IccSmsInterfaceManager((PhoneBase) this.mActivePhone);
		mIccPhoneBookInterfaceManagerProxy = new IccPhoneBookInterfaceManagerProxy(
		phone.getIccPhoneBookInterfaceManager());
		mPhoneSubInfoProxy = new PhoneSubInfoProxy(phone.getPhoneSubInfo());
		@@ -213,8 +214,7 @@ public class PhoneProxy extends Handler implements Phone {
		}

		// Set the new interfaces in the proxy's
		mIccSmsInterfaceManagerProxy.setmIccSmsInterfaceManager(
		mActivePhone.getIccSmsInterfaceManager());
		mIccSmsInterfaceManager.updatePhoneObject((PhoneBase) mActivePhone);
		mIccPhoneBookInterfaceManagerProxy.setmIccPhoneBookInterfaceManager(mActivePhone
		.getIccPhoneBookInterfaceManager());
		mPhoneSubInfoProxy.setmPhoneSubInfo(mActivePhone.getPhoneSubInfo());
		@@ -968,11 +968,6 @@ public class PhoneProxy extends Handler implements Phone {
		return mActivePhone.getPhoneSubInfo();
		}

		@Override
		public IccSmsInterfaceManager getIccSmsInterfaceManager(){
		return mActivePhone.getIccSmsInterfaceManager();
		}

		@Override
		public IccPhoneBookInterfaceManager getIccPhoneBookInterfaceManager(){
		return mActivePhone.getIccPhoneBookInterfaceManager();

src/java/com/android/internal/telephony/cdma/CDMAPhone.java

+1 −14

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2006 The Android Open Source Project
		*
		* Copyright (c) 2013, The Linux Foundation. All rights reserved.
		* 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
		@@ -102,7 +102,6 @@ public class CDMAPhone extends PhoneBase {
		CdmaSubscriptionSourceManager mCdmaSSM;
		ArrayList <CdmaMmiCode> mPendingMmis = new ArrayList<CdmaMmiCode>();
		RuimPhoneBookInterfaceManager mRuimPhoneBookInterfaceManager;
		RuimSmsInterfaceManager mRuimSmsInterfaceManager;
		int mCdmaSubscriptionSource = CdmaSubscriptionSourceManager.SUBSCRIPTION_SOURCE_UNKNOWN;
		PhoneSubInfo mSubInfo;
		EriManager mEriManager;
		@@ -195,7 +194,6 @@ public class CDMAPhone extends PhoneBase {
		initSmsDispatcher();
		mDcTracker = new DcTracker(this);
		mRuimPhoneBookInterfaceManager = new RuimPhoneBookInterfaceManager(this);
		mRuimSmsInterfaceManager = new RuimSmsInterfaceManager(this, mSMS);
		mSubInfo = new PhoneSubInfo(this);
		mEriManager = new EriManager(this, context, EriManager.ERI_FROM_XML);

		@@ -277,7 +275,6 @@ public class CDMAPhone extends PhoneBase {
		mSMS.dispose();
		mCdmaInboundSmsHandler.dispose();
		mRuimPhoneBookInterfaceManager.dispose();
		mRuimSmsInterfaceManager.dispose();
		mSubInfo.dispose();
		mEriManager.dispose();
		}
		@@ -287,7 +284,6 @@ public class CDMAPhone extends PhoneBase {
		public void removeReferences() {
		log("removeReferences");
		mRuimPhoneBookInterfaceManager = null;
		mRuimSmsInterfaceManager = null;
		mSubInfo = null;
		mCT = null;
		mSST = null;
		@@ -1270,14 +1266,6 @@ public class CDMAPhone extends PhoneBase {
		return mSubInfo;
		}

		/**
		* Retrieves the IccSmsInterfaceManager of the CDMAPhone
		*/
		@Override
		public IccSmsInterfaceManager getIccSmsInterfaceManager() {
		return mRuimSmsInterfaceManager;
		}

		/**
		* Retrieves the IccPhoneBookInterfaceManager of the CDMAPhone
		*/
		@@ -1673,7 +1661,6 @@ public class CDMAPhone extends PhoneBase {
		pw.println(" mCdmaSSM=" + mCdmaSSM);
		pw.println(" mPendingMmis=" + mPendingMmis);
		pw.println(" mRuimPhoneBookInterfaceManager=" + mRuimPhoneBookInterfaceManager);
		pw.println(" mRuimSmsInterfaceManager=" + mRuimSmsInterfaceManager);
		pw.println(" mCdmaSubscriptionSource=" + mCdmaSubscriptionSource);
		pw.println(" mSubInfo=" + mSubInfo);
		pw.println(" mEriManager=" + mEriManager);