filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup enterprise feature in ContactUtil

Browse Source 
am: e2ccf8bff5

* commit 'e2ccf8bff59da2b54fb037557ad93fc4c317c506':
  Cleanup enterprise feature in ContactUtil

Change-Id: I49fb7f06d7d1bb6f78fb4f17eb8ae3d572d76778
This commit is contained in:
Tony Mak
2016-05-16 15:43:54 +00:00
committed by android-build-merger
parent 47037f9fef e2ccf8bff5
commit 9cd2bdf010
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/messaging/util/ContactUtil.java
+4 -15
View File
@@ -519,25 +519,15 @@ public class ContactUtil {
* Returns if a given contact id belongs to managed profile. * Returns if a given contact id belongs to managed profile.
*/ */
public static boolean isEnterpriseContactId(final long contactId) { public static boolean isEnterpriseContactId(final long contactId) {
return isWorkProfileSupported() return OsUtil.isAtLeastL() && ContactsContract.Contacts.isEnterpriseContactId(contactId);
&& ContactsContract.Contacts.isEnterpriseContactId(contactId);
}
/**
* Returns if managed profile is supported.
*/
public static boolean isWorkProfileSupported() {
final PackageManager pm = Factory.get().getApplicationContext().getPackageManager();
return pm.hasSystemFeature(PackageManager.FEATURE_MANAGED_USERS);
} }
/** /**
* Returns Email lookup uri that will query both primary and corp profile * Returns Email lookup uri that will query both primary and corp profile
*/ */
private static Uri getEmailContentLookupUri() { private static Uri getEmailContentLookupUri() {
if (isWorkProfileSupported() && OsUtil.isAtLeastM()) { if (OsUtil.isAtLeastM()) {
// TODO: use Email.ENTERPRISE_CONTENT_LOOKUP_URI, which will be available in M SDK API return Email.ENTERPRISE_CONTENT_LOOKUP_URI;
return Uri.parse("content://com.android.contacts/data/emails/lookup_enterprise");
} }
return Email.CONTENT_LOOKUP_URI; return Email.CONTENT_LOOKUP_URI;
} }
@@ -546,8 +536,7 @@ public class ContactUtil {
* Returns PhoneLookup URI. * Returns PhoneLookup URI.
*/ */
public static Uri getPhoneLookupUri() { public static Uri getPhoneLookupUri() {
// Apply it to M only if (OsUtil.isAtLeastM()) {
if (isWorkProfileSupported() && OsUtil.isAtLeastM()) {
return PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI; return PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI;
} }
return PhoneLookup.CONTENT_FILTER_URI; return PhoneLookup.CONTENT_FILTER_URI;