Merge commit '7e4b734a' into fix-merge-conflict
Wink Saville [Mon, 10 Dec 2012 23:14:59 +0000 (15:14 -0800)]
* commit '7e4b734a':
  Telephony: Move uicc classes into uicc package

Change-Id: Iacc7f1805500bfe55299aaedbe0241ebba8e8b23

15 files changed:
1  2 
src/java/com/android/internal/telephony/CommandsInterface.java
src/java/com/android/internal/telephony/DataConnectionTracker.java
src/java/com/android/internal/telephony/RIL.java
src/java/com/android/internal/telephony/ServiceStateTracker.java
src/java/com/android/internal/telephony/cdma/CDMAPhone.java
src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
src/java/com/android/internal/telephony/gsm/GSMPhone.java
src/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
src/java/com/android/internal/telephony/uicc/IccRecords.java
src/java/com/android/internal/telephony/uicc/IsimUiccRecords.java
src/java/com/android/internal/telephony/uicc/RuimRecords.java
src/java/com/android/internal/telephony/uicc/SIMRecords.java
tests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsCbTest.java

@@@ -65,13 -62,16 +62,17 @@@ import com.android.internal.telephony.P
  import com.android.internal.telephony.ServiceStateTracker;
  import com.android.internal.telephony.TelephonyIntents;
  import com.android.internal.telephony.TelephonyProperties;
- import com.android.internal.telephony.UiccCard;
- import com.android.internal.telephony.UiccCardApplication;
  import com.android.internal.telephony.UUSInfo;
- import com.android.internal.telephony.IccCardApplicationStatus.AppState;
  import com.android.internal.telephony.cat.CatService;
 +import com.android.internal.telephony.gsm.GsmDataConnectionTracker;
+ import com.android.internal.telephony.uicc.IccException;
+ import com.android.internal.telephony.uicc.IccFileHandler;
+ import com.android.internal.telephony.uicc.IccRecords;
+ import com.android.internal.telephony.uicc.RuimRecords;
+ 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.IccCardApplicationStatus.AppState;
  
  import java.io.FileDescriptor;
  import java.io.PrintWriter;
@@@ -20,6 -21,7 +20,8 @@@ import com.android.internal.telephony.T
  import com.android.internal.telephony.MccTable;
  import com.android.internal.telephony.EventLogTags;
  import com.android.internal.telephony.RILConstants;
 -import com.android.internal.telephony.IccCard;
++import com.android.internal.telephony.uicc.RuimRecords;
++import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppState;
  
  import android.telephony.CellInfo;
  import android.telephony.CellInfoLte;
@@@ -37,7 -39,12 +39,6 @@@ import android.os.SystemProperties
  import android.telephony.Rlog;
  import android.util.EventLog;
  
- import com.android.internal.telephony.IccCardApplicationStatus.AppState;
 -import com.android.internal.telephony.gsm.GsmDataConnectionTracker;
 -import com.android.internal.telephony.uicc.RuimRecords;
 -import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppState;
 -import com.android.internal.telephony.IccCardConstants;
 -
  import java.io.FileDescriptor;
  import java.io.PrintWriter;
  import java.util.ArrayList;
@@@ -21,8 -20,9 +21,8 @@@ import android.telephony.SmsCbEtwsInfo
  import android.telephony.SmsCbLocation;
  import android.telephony.SmsCbMessage;
  import android.test.AndroidTestCase;
 -import android.telephony.Rlog;
  
- import com.android.internal.telephony.IccUtils;
+ import com.android.internal.telephony.uicc.IccUtils;
  
  import java.util.Random;