From edbbd6d89137a3addf82d121cb3d785fe3074889 Mon Sep 17 00:00:00 2001 From: Wenyi Wang Date: Wed, 1 Jun 2016 15:24:59 -0700 Subject: Get rid of CODENAME and use BuildCompat instead Bug 28954561 Change-Id: I5323833c42484e71a885c0bb2bc1ecf884e873b1 --- src/com/android/contacts/common/ContactsUtils.java | 5 ++--- src/com/android/contacts/common/compat/CompatUtils.java | 10 ++-------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/com/android/contacts/common/ContactsUtils.java b/src/com/android/contacts/common/ContactsUtils.java index d05902dc..c3531b10 100644 --- a/src/com/android/contacts/common/ContactsUtils.java +++ b/src/com/android/contacts/common/ContactsUtils.java @@ -23,6 +23,7 @@ import android.net.Uri; import android.os.Build; import android.provider.ContactsContract.CommonDataKinds.Im; import android.support.annotation.IntDef; +import android.support.v4.os.BuildCompat; import android.provider.ContactsContract.DisplayPhoto; import android.telephony.PhoneNumberUtils; import android.text.TextUtils; @@ -52,9 +53,7 @@ public class ContactsUtils { private static int sThumbnailSize = -1; - public static final boolean FLAG_N_FEATURE = SdkSelectionUtils.TARGET_N_SDK // build-time flag - && (Build.VERSION.SDK_INT > Build.VERSION_CODES.M // runtime flag - || Build.VERSION.CODENAME.startsWith("N")); // TODO: remove startsWith("N") + public static final boolean FLAG_N_FEATURE = BuildCompat.isAtLeastN(); // TODO find a proper place for the canonical version of these public interface ProviderNames { diff --git a/src/com/android/contacts/common/compat/CompatUtils.java b/src/com/android/contacts/common/compat/CompatUtils.java index e9e8300d..c290c59b 100644 --- a/src/com/android/contacts/common/compat/CompatUtils.java +++ b/src/com/android/contacts/common/compat/CompatUtils.java @@ -18,6 +18,7 @@ package com.android.contacts.common.compat; import android.os.Build; import android.os.Build.VERSION; import android.support.annotation.Nullable; +import android.support.v4.os.BuildCompat; import android.text.TextUtils; import android.util.Log; @@ -41,8 +42,6 @@ public final class CompatUtils { public final static int TYPE_ASSERT = 4; - private final static Boolean CODENAME_STARTS_WITH_N = VERSION.CODENAME.startsWith("N"); - /** * Returns whether the operation in CPOWrapper is of TYPE_INSERT; */ @@ -173,12 +172,7 @@ public final class CompatUtils { * false} otherwise. */ public static boolean isNCompatible() { - // SdkVersionOverride doesn't work here because VERSION.SDK_INT remains 23 (same as M) - // before N is release - - // TODO: remove build time check and use proper runtime check once N is released. - return SdkSelectionUtils.TARGET_N_SDK // Build time flag - && CODENAME_STARTS_WITH_N; // Run time flag + return BuildCompat.isAtLeastN(); } /** -- cgit v1.2.3