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

Commit 5ee3f374 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Expose constants in Telephony.Carriers"

parents 4c860e61 d428423a

api/system-current.txt

+6 −0
Original line number Diff line number Diff line
@@ -9665,6 +9665,7 @@ package android.provider { 














  public static final class Telephony.Carriers implements android.provider.BaseColumns {















    field public static final String APN_SET_ID = "apn_set_id";













    field @Deprecated public static final String BEARER_BITMASK = "bearer_bitmask";















    field public static final int CARRIER_EDITED = 4; // 0x4















    field @NonNull public static final android.net.Uri DPC_URI;















    field public static final String EDITED_STATUS = "edited";









@@ -9673,6 +9674,11 @@ package android.provider {













    field public static final String MODEM_PERSIST = "modem_cognitive";















    field public static final String MTU = "mtu";















    field public static final int NO_APN_SET_ID = 0; // 0x0













    field public static final String PROFILE_ID = "profile_id";













    field public static final String SKIP_464XLAT = "skip_464xlat";













    field public static final int SKIP_464XLAT_DEFAULT = -1; // 0xffffffff













    field public static final int SKIP_464XLAT_DISABLE = 0; // 0x0













    field public static final int SKIP_464XLAT_ENABLE = 1; // 0x1















    field public static final String TIME_LIMIT_FOR_MAX_CONNECTIONS = "max_conns_time";















    field public static final int UNEDITED = 0; // 0x0















    field public static final int USER_DELETED = 2; // 0x2

























core/java/android/provider/Telephony.java



+6
−0




























Original line number
Diff line number
Diff line








@@ -3745,6 +3745,7 @@ public final class Telephony {













         * @deprecated this column is no longer supported, use {@link #NETWORK_TYPE_BITMASK} instead















         */















        @Deprecated













        @SystemApi















        public static final String BEARER_BITMASK = "bearer_bitmask";































        /**










@@ -3794,6 +3795,7 @@ public final class Telephony {













         * <p>Type: INTEGER</p>















         *@hide















         */













        @SystemApi















        public static final String PROFILE_ID = "profile_id";































        /**










@@ -3994,6 +3996,7 @@ public final class Telephony {













         *















         * @hide















         */













        @SystemApi















        public static final String SKIP_464XLAT = "skip_464xlat";































        /**









@@ -4002,6 +4005,7 @@ public final class Telephony {













         *















         * @hide















         */













        @SystemApi















        public static final int SKIP_464XLAT_DEFAULT = -1;































        /**









@@ -4010,6 +4014,7 @@ public final class Telephony {













         *















         * @hide















         */













        @SystemApi















        public static final int SKIP_464XLAT_DISABLE = 0;































        /**









@@ -4018,6 +4023,7 @@ public final class Telephony {













         *















         * @hide















         */













        @SystemApi















        public static final int SKIP_464XLAT_ENABLE = 1;