Merge "Rename SIM_APN_LIST to SIM_APN_URI" am: d594716359 am: a49da46d96

am: 8c758f5ce7

Change-Id: Idbefe3b3cd87e4702852defa7382c30ff8f98e50
This commit is contained in:
Calvin Pan
2018-12-20 18:34:36 -08:00
committed by android-build-merger

View File

@@ -277,7 +277,7 @@ public class ApnSettings extends RestrictedSettingsFragment {
private void fillList() { private void fillList() {
final int subId = mSubscriptionInfo != null ? mSubscriptionInfo.getSubscriptionId() final int subId = mSubscriptionInfo != null ? mSubscriptionInfo.getSubscriptionId()
: SubscriptionManager.INVALID_SUBSCRIPTION_ID; : 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)); String.valueOf(subId));
StringBuilder where = new StringBuilder("NOT (type='ia' AND (apn=\"\" OR apn IS NULL)) AND " StringBuilder where = new StringBuilder("NOT (type='ia' AND (apn=\"\" OR apn IS NULL)) AND "
+ "user_visible!=0"); + "user_visible!=0");