commit 5c502763bb8962defbad528a54099da2e2f6feec
author Wenyi Wang <wenyiw@google.com> Wed Jan 27 16:11:07 2016 -0800
committer Wenyi Wang <wenyiw@google.com> Wed Jan 27 16:22:25 2016 -0800
tree 78a73ae910d16d66b875c24723b28e69c9ecb63c
parent f898a581678729e05b49f638c8e2c65e59043b92

Use VERSION.CODENAME to check for N APIs

Bug: 26453530
Change-Id: I88ed37d83fa1c98982b229078001b498a52f890d

src/com/android/contacts/activities/PeopleActivity.java

diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 77eccb1..9c2c0a8 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -1119,11 +1119,8 @@
             helpMenu.setVisible(HelpUtils.isHelpAndFeedbackAvailable());
         }
         final boolean showMiscOptions = !isSearchOrSelectionMode;
-        //TODO use ContactsUtils.FLAG_N_FEATURE
-        final boolean isBlockedNumbersCompatible =
-                Build.VERSION.SDK_INT > Build.VERSION_CODES.M;
-        final boolean showBlockedNumbers = PhoneCapabilityTester.isPhone(this) &&
-                isBlockedNumbersCompatible;
+        final boolean showBlockedNumbers = PhoneCapabilityTester.isPhone(this)
+                && ContactsUtils.FLAG_N_FEATURE;
         makeMenuItemVisible(menu, R.id.menu_search, showMiscOptions);
         makeMenuItemVisible(menu, R.id.menu_import_export, showMiscOptions);
         makeMenuItemVisible(menu, R.id.menu_accounts, showMiscOptions);