PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Have SecuritySettings and SoundSettings use getCurrentPhoneType

Browse Source 
To preserve proper behavior now that getPhoneType can return
PHONE_TYPE_NONE use getCurrentPhoneType.

bug: 3198435
Change-Id: I39d385b17d746f3c7cdbc3e1869efa5d4e89230c
This commit is contained in:
Wink Saville
2011-02-02 11:30:25 -08:00
parent 9597406aa1
commit 327147eb06
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/SecuritySettings.java
View File

@@ -225,7 +225,8 @@ public class SecuritySettings extends SettingsPreferenceFragment
addPreferencesFromResource(R.xml.security_settings_misc); addPreferencesFromResource(R.xml.security_settings_misc);
// Do not display SIM lock for CDMA phone // 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)); root.removePreference(root.findPreference(KEY_SIM_LOCK));
} }

2
src/com/android/settings/SoundSettings.java
View File

@@ -99,7 +99,7 @@ public class SoundSettings extends SettingsPreferenceFragment implements
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
ContentResolver resolver = getContentResolver(); ContentResolver resolver = getContentResolver();
int activePhoneType = TelephonyManager.getDefault().getPhoneType(); int activePhoneType = TelephonyManager.getDefault().getCurrentPhoneType();
mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE); mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);