Fix N checking
Cherry pick to reflect code changes. The dialer in system image
is using //vendor/unbundled_google/packages/PrebuiltGoogleDialer
This was missed because it was not using ContactCommon compat library but
directly using Build.VERSION.CODENAME.
No other instances of Build.VERSION.CODENAME are found.
Bug: 29420691
Change-Id: Ia01a0aa1d95014da4abc2873a67cc0905fe8eb5f
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);