Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose Phone.ENTERPRISE_CONTENT_URI as systemApi" into stage-aosp-master am: f2753ce65f am: 984f8fcc51 am: 6cc18eef4e am: 010a06ec36

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934185

Change-Id: Id117effbc92da889e388cb3be08053f6c3af6c48
This commit is contained in:
TreeHugger Robot
2021-09-28 22:13:55 +00:00
committed by Automerger Merge Worker
parent 8270d61d1b 010a06ec36
commit cf23a8a9e1
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/system-current.txt
View File

@@ -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";

2
core/api/test-current.txt
View File

@@ -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 {

5
core/java/android/provider/ContactsContract.java
View File

@@ -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");
/**