summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Muralidhar Reddy <muralidharm@google.com> 2022-03-28 20:43:01 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-03-28 20:43:01 +0000
commit7f7fe82a4f7fb6e7a340e6621e1671e565837019 (patch)
tree88246421571a377759c60837cdb0a16f4a2dc949
parent731c34c0e7b08380c92a47a031c5f49beae02c1c (diff)
parente5b13b5e5bbaf52940e2e322c7108aff7030f966 (diff)
[MEP] Add port index in SubscriptionInfo database am: 286db29cf7 am: e5b13b5e5b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2046489 Change-Id: I591273f9707eed6d50c0e05496cfb4a2bb08be5a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/android/provider/Telephony.java7
-rw-r--r--telephony/java/android/telephony/SubscriptionManager.java7
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java3
3 files changed, 17 insertions, 0 deletions
diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index 5b59b2120e19..5ee4131b326e 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -5310,6 +5310,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
* for the purpose of testing the device and the eUICC. It
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index 4b8b590b03ca..974392ea31eb 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -941,6 +941,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.
*
* <P>Type: INTEGER (int)</P>
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index db1f49760865..a5adf52051b9 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -327,6 +327,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