Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77b3e5a8 authored Dec 10, 2012 by Wink Saville Committed by Gerrit Code Review Dec 10, 2012

Merge "Telephony: Move uicc classes into uicc package"

parents d1591969 d720945f

src/java/android/telephony/SmsCbEtwsInfo.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ import android.os.Parcel;
		import android.os.Parcelable;
		import android.text.format.Time;

		import com.android.internal.telephony.IccUtils;
		import com.android.internal.telephony.uicc.IccUtils;

		import java.util.Arrays;

src/java/android/telephony/SmsManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -22,8 +22,8 @@ import android.os.ServiceManager;
		import android.text.TextUtils;

		import com.android.internal.telephony.ISms;
		import com.android.internal.telephony.IccConstants;
		import com.android.internal.telephony.SmsRawData;
		import com.android.internal.telephony.uicc.IccConstants;

		import java.util.ArrayList;
		import java.util.Arrays;

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.internal.telephony;

		import com.android.internal.telephony.gsm.SmsBroadcastConfigInfo;
		import com.android.internal.telephony.uicc.IccCardStatus;

		import android.os.Message;
		import android.os.Handler;

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ import android.telephony.Rlog;
		import com.android.internal.R;
		import com.android.internal.telephony.DataConnection.FailCause;
		import com.android.internal.telephony.DctConstants;
		import com.android.internal.telephony.uicc.IccRecords;
		import com.android.internal.telephony.uicc.UiccController;
		import com.android.internal.util.AsyncChannel;

src/java/com/android/internal/telephony/IIccPhoneBook.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@

		package com.android.internal.telephony;

		import com.android.internal.telephony.AdnRecord;
		import com.android.internal.telephony.uicc.AdnRecord;