commit 16b8a0dbb3827e057b993a37ced1a1548fa0de79
author pkanwar <pkanwar@google.com> Wed Jun 07 10:59:41 2017 -0700
committer pkanwar <pkanwar@google.com> Wed Jun 07 10:59:41 2017 -0700
tree c16e8a1c5ca1fbe7ed40270996e1a292196cfd94
parent e5ef67692ea9c53786ab82b458e0a5e8e34fdfac

Adding fields in Telephony.java to support the CarrierProvider.
Needed for ImsiEncryption.

BUG: 35606429
Test: manual
Change-Id: I134e01db9643456f2815b48fb7c8ba1f1eac7860

telephony/java/android/telephony/Telephony.java

diff --git a/telephony/java/android/telephony/Telephony.java b/telephony/java/android/telephony/Telephony.java
index 3282f5f..765c73b 100644
--- a/telephony/java/android/telephony/Telephony.java
+++ b/telephony/java/android/telephony/Telephony.java
@@ -1176,6 +1176,29 @@
     }
 
     /**
+     * Base column for the table that contain Carrier Public key.
+     * @hide
+     */
+    public interface CarrierColumns extends BaseColumns {
+
+        public static final String MCC = "mcc";
+        public static final String MNC = "mnc";
+        public static final String KEY_TYPE = "key_type";
+        public static final String MVNO_TYPE = "mvno_type";
+        public static final String MVNO_MATCH_DATA = "mvno_match_data";
+        public static final String PUBLIC_KEY = "public_key";
+        public static final String KEY_IDENTIFIER = "key_identifier";
+        public static final String EXPIRATION_TIME = "expiration_time";
+        public static final String LAST_MODIFIED = "last_modified";
+
+        /**
+         * The {@code content://} style URL for this table.
+         * @hide
+         */
+        public static final Uri CONTENT_URI = Uri.parse("content://carrier_information/carrier");
+    }
+
+    /**
      * Base columns for tables that contain MMSs.
      */
     public interface BaseMmsColumns extends BaseColumns {