Merge "Rename SIM_APN_LIST to SIM_APN_URI" am: d594716359

am: a49da46d96

Change-Id: Ifa3dd2166fadd7c4fce234adedd6db3df3fcf577

src/com/android/settings/network/ApnSettings.java

@@ -276,7 +276,7 @@ public class ApnSettings extends RestrictedSettingsFragment {
     private void fillList() {
         final int subId = mSubscriptionInfo != null ? mSubscriptionInfo.getSubscriptionId()
                 : SubscriptionManager.INVALID_SUBSCRIPTION_ID;
-        final Uri simApnUri = Uri.withAppendedPath(Telephony.Carriers.SIM_APN_LIST,
+        final Uri simApnUri = Uri.withAppendedPath(Telephony.Carriers.SIM_APN_URI,
                 String.valueOf(subId));
         StringBuilder where = new StringBuilder("NOT (type='ia' AND (apn=\"\" OR apn IS NULL)) AND "
                 + "user_visible!=0");