From ce093d67382106ef5b60b562f0249ee877c01c09 Mon Sep 17 00:00:00 2001
From: William Escande <wescande@google.com>
Date: Tue, 28 Sep 2021 18:06:46 +0200
Subject: [PATCH] Expose Phone.ENTERPRISE_CONTENT_URI as systemApi

Also add INTERACT_ACROSS_USERS as a requires permission
Bug: 194119078
Tag: #refactor
Test: Build

Change-Id: Iccc093d9224ed34eb76e64561607dac6085cb876
---
 core/api/system-current.txt                      | 4 ++++
 core/api/test-current.txt                        | 2 +-
 core/java/android/provider/ContactsContract.java | 5 +++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index d8ced6fbb4a74..6a57c24242d46 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -9057,6 +9057,10 @@ package android.provider {
     field public static final int ERROR_UNKNOWN = 0; // 0x0
   }
 
+  public static final class ContactsContract.CommonDataKinds.Phone implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
+    field @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public static final android.net.Uri ENTERPRISE_CONTENT_URI;
+  }
+
   @Deprecated public static final class ContactsContract.MetadataSync implements android.provider.BaseColumns android.provider.ContactsContract.MetadataSyncColumns {
     field @Deprecated public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contact_metadata";
     field @Deprecated public static final String CONTENT_TYPE = "vnd.android.cursor.dir/contact_metadata";
diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index 8a4c8db0cd7ea..9505aad8d1e03 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -2113,7 +2113,7 @@ package android.provider {
   }
 
   public static final class ContactsContract.CommonDataKinds.Phone implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
-    field public static final android.net.Uri ENTERPRISE_CONTENT_URI;
+    field @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public static final android.net.Uri ENTERPRISE_CONTENT_URI;
   }
 
   public static final class ContactsContract.PinnedPositions {
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index 376d9421e8d3d..0f0f123ca1626 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -6159,9 +6159,10 @@ public final class ContactsContract {
             *
             * @hide
             */
-            @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+            @SystemApi
             @TestApi
-            public static final Uri ENTERPRISE_CONTENT_URI =
+            @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS)
+            public static final @NonNull Uri ENTERPRISE_CONTENT_URI =
                     Uri.withAppendedPath(Data.ENTERPRISE_CONTENT_URI, "phones");
 
             /**