From 1893b078bd45eb956342f3ba730ac2a9440b4cfb Mon Sep 17 00:00:00 2001
From: Jack Yu <jackyu@google.com>
Date: Sat, 1 Jan 2022 08:12:45 -0800
Subject: [PATCH] Support preferred data profile correctly

Correctly support read/write preferred data profile.

Fix: 212906152
Test: manual & atest DataNetworkControllerTest DataProfileManagerTest
Merged-In: I3cb18680ec6c77a4905901a2aa3cf3c86ce801f1
Change-Id: I3cb18680ec6c77a4905901a2aa3cf3c86ce801f1
---
 core/java/android/provider/Telephony.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index b79b3d8083e84..0d5ef34c6f763 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -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.