commit | ef45875e0532efa856c139d2bc4248ae2ffb6abe | [log] [tgz] |
---|---|---|
author | Wink Saville <wink@google.com> | Mon Dec 10 14:13:08 2012 -0800 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Dec 10 14:13:08 2012 -0800 |
tree | dcfcb49505e9ecb4fc94d50dca5962881b2bfb31 | |
parent | bc1451aeb9ba4f0e18f64ba8a14802f0c6bf446f [diff] | |
parent | dd84b3124e2696601efe65a212799b44e1f6d5f9 [diff] |
Merge "Telephony: Use IccUtils from uicc packge"
diff --git a/tests/src/com/android/cellbroadcastreceiver/DialogSmsDisplayTests.java b/tests/src/com/android/cellbroadcastreceiver/DialogSmsDisplayTests.java index 095ce06..b2150f1 100644 --- a/tests/src/com/android/cellbroadcastreceiver/DialogSmsDisplayTests.java +++ b/tests/src/com/android/cellbroadcastreceiver/DialogSmsDisplayTests.java
@@ -27,8 +27,8 @@ import com.android.internal.telephony.EncodeException; import com.android.internal.telephony.GsmAlphabet; -import com.android.internal.telephony.IccUtils; import com.android.internal.telephony.gsm.GsmSmsCbMessage; +import com.android.internal.telephony.uicc.IccUtils; /** * Various instrumentation tests for CellBroadcastReceiver.
diff --git a/tests/src/com/android/cellbroadcastreceiver/tests/SendCdmaCmasMessages.java b/tests/src/com/android/cellbroadcastreceiver/tests/SendCdmaCmasMessages.java index 71ca812..f7bee6e 100644 --- a/tests/src/com/android/cellbroadcastreceiver/tests/SendCdmaCmasMessages.java +++ b/tests/src/com/android/cellbroadcastreceiver/tests/SendCdmaCmasMessages.java
@@ -27,7 +27,6 @@ import android.util.Log; import com.android.internal.telephony.GsmAlphabet; -import com.android.internal.telephony.IccUtils; import com.android.internal.telephony.cdma.sms.BearerData; import com.android.internal.telephony.cdma.sms.CdmaSmsAddress; import com.android.internal.telephony.cdma.sms.SmsEnvelope;
diff --git a/tests/src/com/android/cellbroadcastreceiver/tests/SendTestMessages.java b/tests/src/com/android/cellbroadcastreceiver/tests/SendTestMessages.java index a8496ff..e634b23 100644 --- a/tests/src/com/android/cellbroadcastreceiver/tests/SendTestMessages.java +++ b/tests/src/com/android/cellbroadcastreceiver/tests/SendTestMessages.java
@@ -25,8 +25,8 @@ import com.android.internal.telephony.EncodeException; import com.android.internal.telephony.GsmAlphabet; -import com.android.internal.telephony.IccUtils; import com.android.internal.telephony.gsm.GsmSmsCbMessage; +import com.android.internal.telephony.uicc.IccUtils; import java.io.UnsupportedEncodingException;