diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-09-28 21:26:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-28 21:26:26 +0000 |
| commit | 984f8fcc51711f95414cf1a7a0ff97fcd4b98c9c (patch) | |
| tree | 64f99cc603a6012fdf73a98023f607e564be3cdc /core/java | |
| parent | daf25cf47c5194b0ad03ecde152546856f7abff5 (diff) | |
| parent | f2753ce65f28f5354289ac78a107d6cad75be0c6 (diff) | |
Merge "Expose Phone.ENTERPRISE_CONTENT_URI as systemApi" into stage-aosp-master am: f2753ce65f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934185
Change-Id: I2a3ffbc1f1cc6ad96d48cb20a49e87d9a8416032
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/provider/ContactsContract.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 376d9421e8d3..0f0f123ca162 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"); /** |