From 239b6ce359997b6368f97e40aa36691cfc6cffd0 Mon Sep 17 00:00:00 2001
From: changbetty <changbetty@google.com>
Date: Mon, 2 Dec 2019 15:04:49 +0800
Subject: [PATCH] [Telephony Mainline] Add SimInfo.CONTENT_URI instead
 SubscriptionManager.CONTENT_URI for mainline

Bug: 144972924
Test: make
Change-Id: I86c39f4a353412a66934b735957d5d06c478fe8e
Merged-In: I86c39f4a353412a66934b735957d5d06c478fe8e
---
 api/system-current.txt                        |  4 ++++
 core/java/android/provider/Telephony.java     | 19 +++++++++++++++++++
 .../telephony/SubscriptionManager.java        |  3 ++-
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index d87a9b01bc46d..ec3b3120f52bb 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -6628,6 +6628,10 @@ package android.provider {
     field public static final String SUB_ID = "sub_id";
   }
 
+  public static final class Telephony.SimInfo {
+    field @NonNull public static final android.net.Uri CONTENT_URI;
+  }
+
   public static final class Telephony.Sms.Intents {
     field public static final String ACTION_SMS_EMERGENCY_CB_RECEIVED = "android.provider.action.SMS_EMERGENCY_CB_RECEIVED";
   }
diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index ebdde0a54a861..936f712f8b218 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -4811,4 +4811,23 @@ public final class Telephony {
             public static final Uri CONTENT_URI = Uri.parse("content://carrier_id/all");
         }
     }
+
+    /**
+     * Contains SIM Information
+     * @hide
+     */
+    @SystemApi
+    public static final class SimInfo {
+        /**
+         * Not instantiable.
+         * @hide
+         */
+        private SimInfo() {}
+
+        /**
+         * The {@code content://} style URI for this provider.
+         */
+        @NonNull
+        public static final Uri CONTENT_URI = Uri.parse("content://telephony/siminfo");
+    }
 }
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index fbbc9518065df..47d467ed84a07 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -55,6 +55,7 @@ import android.os.ParcelUuid;
 import android.os.Process;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+import android.provider.Telephony.SimInfo;
 import android.telephony.euicc.EuiccManager;
 import android.telephony.ims.ImsMmTelManager;
 import android.util.DisplayMetrics;
@@ -130,7 +131,7 @@ public class SubscriptionManager {
 
     /** @hide */
     @UnsupportedAppUsage
-    public static final Uri CONTENT_URI = Uri.parse("content://telephony/siminfo");
+    public static final Uri CONTENT_URI = SimInfo.CONTENT_URI;
 
     /**
      * Generates a content {@link Uri} used to receive updates on simInfo change