commit a622a6cb32f7fd7b34fa3513c402d3f2bf0b6996
author The Android Automerger <android-build@google.com> Sun Jun 19 00:04:57 2016 -0700
committer The Android Automerger <android-build@google.com> Sun Jun 19 00:04:57 2016 -0700
tree c52cd4d6bf455457419dc9ce584f02b58b958d76
parent d0ce6136feb2037008550c3d43a78871a2882ddc
parent dc83cc5cd8bcdef311f071eaec699848b1d23a3a

merge in nyc-release history after reset to nyc-dev

src/com/android/dialer/settings/DialerSettingsActivity.java

diff --git a/src/com/android/dialer/settings/DialerSettingsActivity.java b/src/com/android/dialer/settings/DialerSettingsActivity.java
index 9db3e05..fbdb4f9 100644
--- a/src/com/android/dialer/settings/DialerSettingsActivity.java
+++ b/src/com/android/dialer/settings/DialerSettingsActivity.java
@@ -22,6 +22,7 @@
 import android.os.UserManager;
 import android.preference.PreferenceManager;
 import android.provider.Settings;
+import android.support.v4.os.BuildCompat;
 import android.telecom.TelecomManager;
 import android.telephony.TelephonyManager;
 import android.view.MenuItem;
@@ -97,7 +98,7 @@
             callSettingsHeader.titleRes = R.string.call_settings_label;
             callSettingsHeader.intent = callSettingsIntent;
             target.add(callSettingsHeader);
-        } else if (android.os.Build.VERSION.CODENAME.startsWith("N") || isPrimaryUser) {
+        } else if (BuildCompat.isAtLeastN() || isPrimaryUser) {
             Header phoneAccountSettingsHeader = new Header();
             Intent phoneAccountSettingsIntent =
                     new Intent(TelecomManager.ACTION_CHANGE_PHONE_ACCOUNTS);