am 327147eb: Have SecuritySettings and SoundSettings use getCurrentPhoneType

* commit '327147eb062a25ecab40d66ea14559070e0ecef3':
  Have SecuritySettings and SoundSettings use getCurrentPhoneType

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 3f061b8..5d031ef 100644 (file)
--- 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 (file)
--- 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);