commit 15bc01b949f4d0ff549116f90e13a901e36e56ae
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 11 01:34:37 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 11 01:34:37 2023 +0000
tree c69310b051313e256cb63f9750ec9090fec6dacb
parent 08afbf5cf1cf1c991dfa2c9858443e9c858884df
parent 03992b38b4bd05f6a46ba6b2c9b16e28827e6a55

Merge "Add user handle in SimInfo database."

core/java/android/provider/Telephony.java

diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index ac46be7..0c9eaa4 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -4815,5 +4815,12 @@
          * @hide
          */
         public static final String COLUMN_USAGE_SETTING = "usage_setting";
+
+        /**
+         * TelephonyProvider column name for user handle associated with this sim.
+         *
+         * @hide
+         */
+        public static final String COLUMN_USER_HANDLE = "user_handle";
     }
 }

telephony/java/android/telephony/SubscriptionManager.java

diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index f373f6e..ac148e7 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -1048,6 +1048,13 @@
     public static final String ALLOWED_NETWORK_TYPES =
             SimInfo.COLUMN_ALLOWED_NETWORK_TYPES_FOR_REASONS;
 
+    /**
+     * TelephonyProvider column name for user handle associated with a sim.
+     * <P>Type: INTEGER (int)</P>
+     * @hide
+     */
+    public static final String USER_HANDLE = SimInfo.COLUMN_USER_HANDLE;
+
     /** @hide */
     @Retention(RetentionPolicy.SOURCE)
     @IntDef(prefix = {"USAGE_SETTING_"},