From 090a67a834a88e86107399800a7b8d54ee9c9ce0 Mon Sep 17 00:00:00 2001
From: Muralidhar Reddy <muralidharm@google.com>
Date: Fri, 10 Dec 2021 21:11:28 +0000
Subject: [PATCH] [MEP] Add port index in SubscriptionInfo database

Bug: 199559346
Test: build, manual
Change-Id: Ia74d5e8714fc961f2d22c104683d3e8722deaa3d
---
 core/java/android/provider/Telephony.java                 | 7 +++++++
 telephony/java/android/telephony/SubscriptionManager.java | 7 +++++++
 telephony/java/android/telephony/TelephonyManager.java    | 3 +++
 3 files changed, 17 insertions(+)

diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index 50a44a1bb08d9..a00dd514112f4 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -5316,6 +5316,13 @@ public final class Telephony {
          */
         public static final String COLUMN_PROFILE_CLASS = "profile_class";
 
+        /**
+         * TelephonyProvider column name for the port index of the active UICC port.
+         * <P>Type: INTEGER (int)</P>
+         * @hide
+         */
+        public static final String COLUMN_PORT_INDEX = "port_index";
+
         /**
          * A testing profile can be pre-loaded or downloaded onto
          * the eUICC and provides connectivity to test equipment
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index f728324382048..821b74ab87e4c 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -940,6 +940,13 @@ public class SubscriptionManager {
      */
     public static final String PROFILE_CLASS = SimInfo.COLUMN_PROFILE_CLASS;
 
+    /**
+     * TelephonyProvider column name for the port index of the active UICC port.
+     * <P>Type: INTEGER (int)</P>
+     * @hide
+     */
+    public static final String PORT_INDEX = SimInfo.COLUMN_PORT_INDEX;
+
     /**
      * TelephonyProvider column name for VoIMS opt-in status.
      *
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index cca5e2f164dcc..431d333fecc20 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -325,6 +325,9 @@ public class TelephonyManager {
      */
     public static final int DEFAULT_PORT_INDEX = 0;
 
+    /** @hide */
+    public static final int INVALID_PORT_INDEX = -1;
+
     private final Context mContext;
     private final int mSubId;
     @UnsupportedAppUsage