diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 0fc727f3f8afe..11eafabe8a58f 100755 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -9143,6 +9143,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 a6ba085b94f61..25ca7798ab65f 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -2134,7 +2134,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 570d73d4293b2..d1202649c8e07 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"); /**