Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 271944d0 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge "Support preferred data profile correctly" am: 391556b0 am: 7cdc3869 

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

Change-Id: I9548d527c7c02aad18fc2d5798a0e9ec1b1924ff
parents c917ab08 7cdc3869

core/java/android/provider/Telephony.java

+9 −2
Original line number Original line Diff line number Diff line
@@ -3589,7 +3589,7 @@ public final class Telephony { 
         * @hide

         * @hide

         */

         */

        public static final Uri PREFERRED_APN_URI = Uri.parse(

        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.

         * The {@code content://} style URL for the perferred APN set id.
@@ -3597,8 +3597,15 @@ public final class Telephony { 
         * @hide

         * @hide

         */

         */

        public static final Uri PREFERRED_APN_SET_URI = Uri.parse(

        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.

         * The column name for ENFORCE_MANAGED_URI, indicates whether DPC-owned APNs are enforced.