commit 19b1642d3085e70df28b3e438cc5f0a334ae5956
author Tom Taylor <tomtaylor@google.com> Wed Jan 29 00:45:41 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 29 00:45:41 2020 +0000
tree bd89f1b1e047237eeb8e0fe239aee51b3767389e
parent 622e0790db451b6a3a84313ad97cfc35f5727331
parent 67460d6dc32316d4a9012d70d6b7d36da0cd454f

Merge "Add carrier messaging engineers as owners of the mms code"

tests/robotests/src/com/android/mms/service/ApnSettingsTest.java

diff --git a/tests/robotests/src/com/android/mms/service/ApnSettingsTest.java b/tests/robotests/src/com/android/mms/service/ApnSettingsTest.java
index 6428b1e..b184e16 100644
--- a/tests/robotests/src/com/android/mms/service/ApnSettingsTest.java
+++ b/tests/robotests/src/com/android/mms/service/ApnSettingsTest.java
@@ -26,10 +26,10 @@
 import android.database.Cursor;
 import android.net.Uri;
 import android.provider.Telephony;
+import android.telephony.data.ApnSetting;
 
 import androidx.test.core.app.ApplicationProvider;
 
-import com.android.internal.telephony.PhoneConstants;
 import com.android.mms.service.exception.ApnException;
 
 import org.junit.Before;
@@ -84,7 +84,7 @@
 
     private void createApnSettingsCursor(String mmscUrl, String mmsProxy, String proxyPort) {
         Object[][] apnValues =
-                {new Object[]{PhoneConstants.APN_TYPE_MMS, mmscUrl, mmsProxy, proxyPort}};
+                {new Object[]{ApnSetting.TYPE_MMS_STRING, mmscUrl, mmsProxy, proxyPort}};
         RoboCursor cursor = new RoboCursor();
         cursor.setResults(apnValues);
         cursor.setColumnNames(Arrays.asList(Telephony.Carriers.TYPE, Telephony.Carriers.MMSC,