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

Commit 42d645b6 authored by Wenyi Wang's avatar Wenyi Wang Committed by android-build-merger
Browse files

Fix helper methods in contacts utils am: f0f6f3110f 

am: 2c6e956f8b

* commit '2c6e956f8b9543c2f9b68dcd0cec8d5a2f2b0d53':
  Fix helper methods in contacts utils

Change-Id: I8aa0b9156561953f72bcf8c9f9eb850a50ccec13
parents 66a402dd 42c15133

src/com/android/contacts/common/ContactsUtils.java

+4 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import com.android.contacts.common.model.dataitem.ImDataItem; 
import com.android.contacts.common.testing.NeededForTesting;

import com.android.contacts.common.compat.ContactsCompat;

import com.android.contacts.common.compat.DirectoryCompat;

import com.android.contacts.common.compat.SdkSelectionUtils;

import com.android.contacts.common.model.AccountTypeManager;



import java.lang.annotation.Retention;
@@ -51,7 +52,9 @@ public class ContactsUtils { 


    private static int sThumbnailSize = -1;



    public static final boolean FLAG_N_FEATURE = Build.VERSION.SDK_INT > Build.VERSION_CODES.M;

    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")



    // TODO find a proper place for the canonical version of these

    public interface ProviderNames {

src/com/android/contacts/common/compat/CompatUtils.java

+3 −1
Original line number Diff line number Diff line
@@ -176,7 +176,9 @@ public final class CompatUtils { 
        // SdkVersionOverride doesn't work here because VERSION.SDK_INT remains 23 (same as M)

        // before N is release



        return Build.VERSION.SDK_INT > Build.VERSION_CODES.M;  // Run time flag

        // 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

    }



    /**