Merge "Remove IccCardProxy." (695d9b5a) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -34,8 +34,8 @@ import com.android.internal.telephony.uicc.IccRecords;
		* Apps (those that have access to Phone object) can retrieve this object
		* by calling phone.getIccCard()
		*
		* This interface is implemented by IccCardProxy and the object PhoneApp
		* gets when it calls getIccCard is IccCardProxy.
		* This interface is implemented by UiccProfile and the object PhoneApp
		* gets when it calls getIccCard is UiccProfile.
		*/
		public interface IccCard {
		/**

+0 −5

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ import com.android.internal.telephony.dataconnection.DcTracker;
		import com.android.internal.telephony.imsphone.ImsExternalCallTracker;
		import com.android.internal.telephony.imsphone.ImsPhone;
		import com.android.internal.telephony.imsphone.ImsPhoneCallTracker;
		import com.android.internal.telephony.uicc.IccCardProxy;
		import com.android.internal.telephony.uicc.IccCardStatus;
		import com.android.internal.telephony.uicc.UiccCard;
		import com.android.internal.telephony.uicc.UiccProfile;
		@@ -100,10 +99,6 @@ public class TelephonyComponentFactory {
		return new IccSmsInterfaceManager(phone);
		}

		public IccCardProxy makeIccCardProxy(Context context, CommandsInterface ci, int phoneId) {
		return new IccCardProxy(context, ci, phoneId);
		}

		/**
		* Create a new UiccProfile object.
		*/