From 03992b38b4bd05f6a46ba6b2c9b16e28827e6a55 Mon Sep 17 00:00:00 2001
From: Aishwarya Mallampati <amallampati@google.com>
Date: Tue, 20 Sep 2022 22:51:48 +0000
Subject: [PATCH] Add user handle in SimInfo database.

Bug: 247166170
Test: Basic testing,
       atest com.android.providers.telephony.TelephonyDatabaseHelperTest,
       atest com.android.providers.telephony.TelephonyProviderTest
Merged-In: I899a9ecb93f6f972aa12233fe4380e6d05405791
Change-Id: I899a9ecb93f6f972aa12233fe4380e6d05405791
---
 core/java/android/provider/Telephony.java                 | 7 +++++++
 telephony/java/android/telephony/SubscriptionManager.java | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index ac46be76bac48..0c9eaa41ade0c 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -4815,5 +4815,12 @@ public final class Telephony {
          * @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";
     }
 }
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index f373f6ece5adf..ac148e7d05d78 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -1048,6 +1048,13 @@ public class SubscriptionManager {
     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_"},