diff options
| author | Wink Saville <wink@google.com> | 2011-02-02 11:30:25 -0800 |
|---|---|---|
| committer | Wink Saville <wink@google.com> | 2011-02-02 11:30:25 -0800 |
| commit | 327147eb062a25ecab40d66ea14559070e0ecef3 (patch) | |
| tree | f6ec4b939212100a80cac70b028e5f7f3a5325ab | |
| parent | 9597406aa1b83867b03a47d1a5162969b924f2fc (diff) | |
| download | packages_apps_Settings-327147eb062a25ecab40d66ea14559070e0ecef3.zip packages_apps_Settings-327147eb062a25ecab40d66ea14559070e0ecef3.tar.gz packages_apps_Settings-327147eb062a25ecab40d66ea14559070e0ecef3.tar.bz2 | |
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
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 3 | ||||
| -rw-r--r-- | 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 3f061b8..5d031ef 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 23c7096..4ca7d4a 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); |