diff options
| author | 2016-03-09 10:05:26 +0000 | |
|---|---|---|
| committer | 2016-03-09 10:05:27 +0000 | |
| commit | 41371b5fe00411ad46a95dc389e4d5d12118422f (patch) | |
| tree | 04bb6b7fe01d548f632a1c1280194811415059f1 | |
| parent | bd1dc40a3bbeb56faadd2050037d7c75b813b8f3 (diff) | |
| parent | 935dafeed489ec389c12a3d44ecf22829fe922b6 (diff) | |
Merge "Update comment about enterprise contact id and lookup key" into nyc-dev
| -rw-r--r-- | core/java/android/provider/ContactsContract.java | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 4b43f53ebefe..3658df9a8443 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -5185,6 +5185,10 @@ public final class ContactsContract { * <li> * Corp contacts will get artificial {@link #LOOKUP_KEY}s too. * </li> + * <li> + * Returned work contact IDs and lookup keys are not accepted in places that not + * explicitly say to accept them. + * </li> * </ul> * <p> * A contact lookup URL built by @@ -6194,6 +6198,10 @@ public final class ContactsContract { * <li> * Corp contacts will get artificial {@link #LOOKUP_KEY}s too. * </li> + * <li> + * Returned work contact IDs and lookup keys are not accepted in places that not + * explicitly say to accept them. + * </li> * </ul> * <p> * A contact lookup URL built by @@ -8466,7 +8474,9 @@ public final class ContactsContract { * around this {@link View}. * @param lookupUri A {@link ContactsContract.Contacts#CONTENT_LOOKUP_URI} style * {@link Uri} that describes a specific contact to feature - * in this dialog. + * in this dialog. A work lookup uri is supported here, + * see {@link CommonDataKinds.Email#ENTERPRISE_CONTENT_LOOKUP_URI} and + * {@link PhoneLookup#ENTERPRISE_CONTENT_FILTER_URI}. * @param mode Any of {@link #MODE_SMALL}, {@link #MODE_MEDIUM}, or * {@link #MODE_LARGE}, indicating the desired dialog size, * when supported. @@ -8500,7 +8510,9 @@ public final class ContactsContract { * @param lookupUri A * {@link ContactsContract.Contacts#CONTENT_LOOKUP_URI} style * {@link Uri} that describes a specific contact to feature - * in this dialog. + * in this dialog. A work lookup uri is supported here, + * see {@link CommonDataKinds.Email#ENTERPRISE_CONTENT_LOOKUP_URI} and + * {@link PhoneLookup#ENTERPRISE_CONTENT_FILTER_URI}. * @param mode Any of {@link #MODE_SMALL}, {@link #MODE_MEDIUM}, or * {@link #MODE_LARGE}, indicating the desired dialog size, * when supported. @@ -8531,7 +8543,9 @@ public final class ContactsContract { * @param lookupUri A * {@link ContactsContract.Contacts#CONTENT_LOOKUP_URI} style * {@link Uri} that describes a specific contact to feature - * in this dialog. + * in this dialog. A work lookup uri is supported here, + * see {@link CommonDataKinds.Email#ENTERPRISE_CONTENT_LOOKUP_URI} and + * {@link PhoneLookup#ENTERPRISE_CONTENT_FILTER_URI}. * @param excludeMimes Optional list of {@link Data#MIMETYPE} MIME-types * to exclude when showing this dialog. For example, when * already viewing the contact details card, this can be used @@ -8569,7 +8583,9 @@ public final class ContactsContract { * @param lookupUri A * {@link ContactsContract.Contacts#CONTENT_LOOKUP_URI} style * {@link Uri} that describes a specific contact to feature - * in this dialog. + * in this dialog. A work lookup uri is supported here, + * see {@link CommonDataKinds.Email#ENTERPRISE_CONTENT_LOOKUP_URI} and + * {@link PhoneLookup#ENTERPRISE_CONTENT_FILTER_URI}. * @param excludeMimes Optional list of {@link Data#MIMETYPE} MIME-types * to exclude when showing this dialog. For example, when * already viewing the contact details card, this can be used |