From e9c6da7b12d93218ba1f99d37087dffb58365dcf Mon Sep 17 00:00:00 2001
From: fionaxu <fionaxu@google.com>
Date: Fri, 8 Jun 2018 16:55:25 -0700
Subject: [PATCH 1/2] support privilege access rule for carrier identification

Bug: 69807697
Bug: 72665237
Test: Manual
Change-Id: I5e00302684b2be93ee956d43b04ca9a12d043158
Merged-in: I5e00302684b2be93ee956d43b04ca9a12d043158
---
 telephony/java/android/provider/Telephony.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/telephony/java/android/provider/Telephony.java b/telephony/java/android/provider/Telephony.java
index d48f21b6dfcd2..a241765976a7b 100644
--- a/telephony/java/android/provider/Telephony.java
+++ b/telephony/java/android/provider/Telephony.java
@@ -3501,6 +3501,12 @@ public final class Telephony {
              */
             public static final String ICCID_PREFIX = "iccid_prefix";
 
+            /**
+             * Certificate for carrier privilege access rules.
+             * <P>Type: TEXT in hex string </P>
+             */
+            public static final String PRIVILEGE_ACCESS_RULE = "privilege_access_rule";
+
             /**
              * The {@code content://} URI for this table.
              */

From 6d4f5b2280e4982ac0f6786ecdcd8c87ffff3b4d Mon Sep 17 00:00:00 2001
From: chen xu <fionaxu@google.com>
Date: Tue, 16 Oct 2018 11:55:26 -0700
Subject: [PATCH 2/2] support mno carrier id

Bug: 110559381
Test: CarrierResolverTest.testMnoCarrierId
Change-Id: Ifa1f69fc98b5a7034f28fb5690981087cd6c135a
Merged-in: Ifa1f69fc98b5a7034f28fb5690981087cd6c135a
---
 telephony/java/android/provider/Telephony.java       | 12 ++++++++++++
 .../java/android/telephony/TelephonyManager.java     | 10 ++++++++++
 2 files changed, 22 insertions(+)

diff --git a/telephony/java/android/provider/Telephony.java b/telephony/java/android/provider/Telephony.java
index a241765976a7b..c5d686361da14 100644
--- a/telephony/java/android/provider/Telephony.java
+++ b/telephony/java/android/provider/Telephony.java
@@ -3448,6 +3448,18 @@ public final class Telephony {
          */
         public static final String CARRIER_ID = "carrier_id";
 
+        /**
+         * A unique mno carrier id. mno carrier shares the same {@link All#MCCMNC} as carrier id
+         * and can be solely identified by {@link All#MCCMNC} only. If there is no such mno
+         * carrier, then mno carrier id equals to {@link #CARRIER_ID carrier id}.
+         *
+         * <p>mno carrier id can be used as fallback id. When the exact carrier id configurations
+         * are not found, usually fall back to its mno carrier id.
+         * <P>Type: INTEGER </P>
+         * @hide
+         */
+        public static final String MNO_CARRIER_ID = "mno_carrier_id";
+
         /**
          * Contains mappings between matching rules with carrier id for all carriers.
          * @hide
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index d3cf331fb4c6d..ea44082dd823d 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -1163,6 +1163,16 @@ public class TelephonyManager {
      */
     public static final String EXTRA_CARRIER_ID = "android.telephony.extra.CARRIER_ID";
 
+    /**
+     * An int extra used with {@link #ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED} which indicates
+     * the updated mno carrier id of the current subscription.
+     * <p>Will be {@link TelephonyManager#UNKNOWN_CARRIER_ID} if the subscription is unavailable or
+     * the carrier cannot be identified.
+     *
+     *@hide
+     */
+    public static final String EXTRA_MNO_CARRIER_ID = "android.telephony.extra.MNO_CARRIER_ID";
+
     /**
      * An string extra used with {@link #ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED} which
      * indicates the updated carrier name of the current subscription.