From 327147eb062a25ecab40d66ea14559070e0ecef3 Mon Sep 17 00:00:00 2001 From: Wink Saville Date: Wed, 2 Feb 2011 11:30:25 -0800 Subject: [PATCH] Have SecuritySettings and SoundSettings use getCurrentPhoneType To preserve proper behavior now that getPhoneType can return PHONE_TYPE_NONE use getCurrentPhoneType. bug: 3198435 Change-Id: I39d385b17d746f3c7cdbc3e1869efa5d4e89230c --- src/com/android/settings/SecuritySettings.java | 3 ++- src/com/android/settings/SoundSettings.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index 3f061b89842..5d031ef7021 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -225,7 +225,8 @@ public class SecuritySettings extends SettingsPreferenceFragment addPreferencesFromResource(R.xml.security_settings_misc); // Do not display SIM lock for CDMA phone - if (TelephonyManager.PHONE_TYPE_CDMA == TelephonyManager.getDefault().getPhoneType()) { + if (TelephonyManager.PHONE_TYPE_CDMA == + TelephonyManager.getDefault().getCurrentPhoneType()) { root.removePreference(root.findPreference(KEY_SIM_LOCK)); } diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java index 23c7096cdb4..4ca7d4af16a 100644 --- a/src/com/android/settings/SoundSettings.java +++ b/src/com/android/settings/SoundSettings.java @@ -99,7 +99,7 @@ public class SoundSettings extends SettingsPreferenceFragment implements public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); ContentResolver resolver = getContentResolver(); - int activePhoneType = TelephonyManager.getDefault().getPhoneType(); + int activePhoneType = TelephonyManager.getDefault().getCurrentPhoneType(); mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);