Merge "Support preferred data profile correctly" am: 391556b01c am: 7cdc386951

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2021557

Change-Id: I9548d527c7c02aad18fc2d5798a0e9ec1b1924ff
This commit is contained in:
Jack Yu
2022-03-11 01:56:51 +00:00
committed by Automerger Merge Worker

View File

@@ -3589,7 +3589,7 @@ public final class Telephony {
* @hide
*/
public static final Uri PREFERRED_APN_URI = Uri.parse(
"content://telephony/carriers/preferapn/subId/");
"content://telephony/carriers/preferapn/subId");
/**
* The {@code content://} style URL for the perferred APN set id.
@@ -3597,8 +3597,15 @@ public final class Telephony {
* @hide
*/
public static final Uri PREFERRED_APN_SET_URI = Uri.parse(
"content://telephony/carriers/preferapnset/subId/");
"content://telephony/carriers/preferapnset/subId");
/**
* The id of preferred APN.
*
* @see #PREFERRED_APN_URI
* @hide
*/
public static final String APN_ID = "apn_id";
/**
* The column name for ENFORCE_MANAGED_URI, indicates whether DPC-owned APNs are enforced.