commit fd9ebb1149d8e3e164d0016649c35bda71e8e48d
author Ta-wei Yen <twyen@google.com> Sat Jun 18 01:58:14 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jun 18 01:58:14 2016 +0000
tree baaf40ee25e208ecd25d2f877e7b456a2a7314ac
parent 795f43fde34671e11af1bd30a11fe75a2bb76c35
parent d0ce6136feb2037008550c3d43a78871a2882ddc

Fix N checking
am: d0ce6136fe

Change-Id: Ia31eaee4a2cceb0a374749e6e496239c0c37b313

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