From 3689c969512f6a1817863bbe3195146e1e504b7c Mon Sep 17 00:00:00 2001
From: calvinpan <calvinpan@google.com>
Date: Fri, 19 Oct 2018 15:11:22 +0800
Subject: [PATCH] Add CarrierId column in TelephonyProvider

Add a column in provider to migrate mno and mvno to carrierid.

Bug: 115709816
Test: runtest --path tests/src/com/android/providers/telephony/TelephonyProviderTest.java
Change-Id: I9c0c0fd069acc7f182d94f422ff15f45ebf187a9
Merged-In: I9c0c0fd069acc7f182d94f422ff15f45ebf187a9
---
 api/current.txt                                | 1 +
 telephony/java/android/provider/Telephony.java | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/api/current.txt b/api/current.txt
index 6d0c5a69081d6..1e127b28e0004 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -37259,6 +37259,7 @@ package android.provider {
     field public static final java.lang.String AUTH_TYPE = "authtype";
     field public static final deprecated java.lang.String BEARER = "bearer";
     field public static final java.lang.String CARRIER_ENABLED = "carrier_enabled";
+    field public static final java.lang.String CARRIER_ID = "carrier_id";
     field public static final android.net.Uri CONTENT_URI;
     field public static final java.lang.String CURRENT = "current";
     field public static final java.lang.String DEFAULT_SORT_ORDER = "name ASC";
diff --git a/telephony/java/android/provider/Telephony.java b/telephony/java/android/provider/Telephony.java
index 109ffe96571fc..b8088d536c50d 100644
--- a/telephony/java/android/provider/Telephony.java
+++ b/telephony/java/android/provider/Telephony.java
@@ -2995,6 +2995,13 @@ public final class Telephony {
         @SystemApi
         public static final int NO_SET_SET = 0;
 
+        /**
+         * A unique carrier id associated with this APN
+         * {@see TelephonyManager#getSimCarrierId()}
+         * <p>Type: STRING</p>
+         */
+        public static final String CARRIER_ID = "carrier_id";
+
     }
 
     /**