Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf23a8a9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Expose Phone.ENTERPRISE_CONTENT_URI as systemApi" into... 

Merge "Expose Phone.ENTERPRISE_CONTENT_URI as systemApi" into stage-aosp-master am: f2753ce6 am: 984f8fcc am: 6cc18eef am: 010a06ec

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

Change-Id: Id117effbc92da889e388cb3be08053f6c3af6c48
parents 8270d61d 010a06ec

core/api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -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";

























core/api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








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

































core/java/android/provider/ContactsContract.java



+3
−2




























Original line number
Diff line number
Diff line








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































            /**