commit d428423aa702edd60605f5de379280d94ef42bf1
author Daniel Bright <dbright@google.com> Wed Jan 22 14:54:57 2020 -0800
committer Daniel Bright <dbright@google.com> Wed Jan 22 16:51:06 2020 -0800
tree 2b503f83244bb882da3d26bab21d2792595a8a6d
parent cc6db40d86ba4553fc8eaa5e79743e1c5ffced7e

Expose constants in Telephony.Carriers

Exposing APN specific constants for use within APN classes in other modules.

Bug: 148170690
Test: make, flash
Change-Id: I86d513a0e1a4a04d8ec199463942dea416cee5e1

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index b1f8f6e..da96583 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -9523,6 +9523,7 @@
 
   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";
@@ -9531,6 +9532,11 @@
     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

diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index 4537281..4fa7c42 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -3746,6 +3746,7 @@
          * @deprecated this column is no longer supported, use {@link #NETWORK_TYPE_BITMASK} instead
          */
         @Deprecated
+        @SystemApi
         public static final String BEARER_BITMASK = "bearer_bitmask";
 
         /**
@@ -3795,6 +3796,7 @@
          * <p>Type: INTEGER</p>
          *@hide
          */
+        @SystemApi
         public static final String PROFILE_ID = "profile_id";
 
         /**
@@ -3995,6 +3997,7 @@
          *
          * @hide
          */
+        @SystemApi
         public static final String SKIP_464XLAT = "skip_464xlat";
 
         /**
@@ -4003,6 +4006,7 @@
          *
          * @hide
          */
+        @SystemApi
         public static final int SKIP_464XLAT_DEFAULT = -1;
 
         /**
@@ -4011,6 +4015,7 @@
          *
          * @hide
          */
+        @SystemApi
         public static final int SKIP_464XLAT_DISABLE = 0;
 
         /**
@@ -4019,6 +4024,7 @@
          *
          * @hide
          */
+        @SystemApi
         public static final int SKIP_464XLAT_ENABLE = 1;