diff options
author | linyuh <linyuh@google.com> | 2018-03-26 12:46:18 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-03-26 22:23:52 -0700 |
commit | 437ae9552cce7768068fa92663740711ee541417 (patch) | |
tree | 1ae9af42ed23c09404b87ca613247e18c3fa10d2 /java/com/android/dialer/common | |
parent | cf14ecbc3cb604804ae1f9d01e47444fcf0eedc6 (diff) |
Remove obsolete version checks and compat utilities after min SDK was bumped up to N.
Test: Existing tests
PiperOrigin-RevId: 190508397
Change-Id: Ia5f33e45af1d1cc666fec5f43efa564b2b68c193
Diffstat (limited to 'java/com/android/dialer/common')
-rw-r--r-- | java/com/android/dialer/common/cp2/DirectoryCompat.java | 56 | ||||
-rw-r--r-- | java/com/android/dialer/common/cp2/DirectoryUtils.java | 35 |
2 files changed, 35 insertions, 56 deletions
diff --git a/java/com/android/dialer/common/cp2/DirectoryCompat.java b/java/com/android/dialer/common/cp2/DirectoryCompat.java deleted file mode 100644 index 3e33394a2..000000000 --- a/java/com/android/dialer/common/cp2/DirectoryCompat.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (C) 2015 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.dialer.common.cp2; - -import android.net.Uri; -import android.os.Build.VERSION; -import android.os.Build.VERSION_CODES; -import android.provider.ContactsContract.Directory; - -/** Compatibility utility for {@link Directory}. */ -public class DirectoryCompat { - - public static Uri getContentUri() { - if (VERSION.SDK_INT >= VERSION_CODES.N) { - return Directory.ENTERPRISE_CONTENT_URI; - } - return Directory.CONTENT_URI; - } - - public static boolean isInvisibleDirectory(long directoryId) { - if (VERSION.SDK_INT >= VERSION_CODES.N) { - return (directoryId == Directory.LOCAL_INVISIBLE - || directoryId == Directory.ENTERPRISE_LOCAL_INVISIBLE); - } - return directoryId == Directory.LOCAL_INVISIBLE; - } - - public static boolean isRemoteDirectoryId(long directoryId) { - if (VERSION.SDK_INT >= VERSION_CODES.N) { - return Directory.isRemoteDirectoryId(directoryId); - } - return directoryId != Directory.DEFAULT && directoryId != Directory.LOCAL_INVISIBLE; - } - - public static boolean isEnterpriseDirectoryId(long directoryId) { - return VERSION.SDK_INT >= VERSION_CODES.N && Directory.isEnterpriseDirectoryId(directoryId); - } - - public static boolean isOnlyEnterpriseDirectoryId(long directoryId) { - return isEnterpriseDirectoryId(directoryId) && !isRemoteDirectoryId(directoryId); - } -} diff --git a/java/com/android/dialer/common/cp2/DirectoryUtils.java b/java/com/android/dialer/common/cp2/DirectoryUtils.java new file mode 100644 index 000000000..fa5a226e6 --- /dev/null +++ b/java/com/android/dialer/common/cp2/DirectoryUtils.java @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.dialer.common.cp2; + +import android.provider.ContactsContract.Directory; + +/** Utilities for {@link Directory}. */ +public class DirectoryUtils { + + /** Returns true if the given ID belongs to an invisible directory. */ + public static boolean isInvisibleDirectoryId(long directoryId) { + return directoryId == Directory.LOCAL_INVISIBLE + || directoryId == Directory.ENTERPRISE_LOCAL_INVISIBLE; + } + + /** Returns true if the given ID belongs to a local enterprise directory. */ + public static boolean isLocalEnterpriseDirectoryId(long directoryId) { + return Directory.isEnterpriseDirectoryId(directoryId) + && !Directory.isRemoteDirectoryId(directoryId); + } +} |