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

Commit 641a8b42 authored by Liahav Eitan's avatar Liahav Eitan
Browse files

Public API to list all work profile contacts and phones from personal CP2. 

This change adds a new Contacts.ENTERPRISE_CONTENT_URI and makes the
existing Phone.ENTERPRISE_CONTENT_URI public.
It also updates terminology in the java doc and resolves inconsistent
usage of the terms "work", "corp", "enterprise" and "managed".

Test: atest ManagedProfileContactsTest

Bug: 240954287
Change-Id: I07db823b4afb5955723967f868f07bac622724e2
parent bcae5b28

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -34805,6 +34805,7 @@ package android.provider { 
    field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/phone_v2";

    field public static final android.net.Uri CONTENT_URI;

    field public static final android.net.Uri ENTERPRISE_CONTENT_FILTER_URI;

    field @NonNull public static final android.net.Uri ENTERPRISE_CONTENT_URI;

    field public static final String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";

    field public static final String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";

    field public static final String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";
@@ -34985,6 +34986,7 @@ package android.provider { 
    field public static final String CONTENT_VCARD_TYPE = "text/x-vcard";

    field public static final android.net.Uri CONTENT_VCARD_URI;

    field public static final android.net.Uri ENTERPRISE_CONTENT_FILTER_URI;

    field @NonNull public static final android.net.Uri ENTERPRISE_CONTENT_URI;

    field public static final String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";

    field public static final String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";

    field public static final String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";

core/api/system-current.txt

+0 −4
Original line number Diff line number Diff line
@@ -10356,10 +10356,6 @@ 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



+0
−4




























Original line number
Diff line number
Diff line








@@ -2165,10 +2165,6 @@ package android.provider {













    field public static final String HIDDEN_COLUMN_PREFIX = "x_";















  }





























  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;













  }





























  public static final class ContactsContract.PinnedPositions {















    field public static final String UNDEMOTE_METHOD = "undemote";















  }

































core/java/android/provider/ContactsContract.java



+161
−137


























File changed.
Preview size limit exceeded, changes collapsed.