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

Merge "Allow SIM PIN on CDMA LTE devices"

Browse Source
This commit is contained in:
Wink Saville
2011-08-19 13:55:17 -07:00
committed by Android (Google) Code Review
parent 0f3f91854c cd05e88595
commit 4cfc0dd0d7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,7 @@ import android.security.KeyStore;
import android.telephony.TelephonyManager;
import android.util.Log;
import com.android.internal.telephony.Phone;
import com.android.internal.widget.LockPatternUtils;
import java.util.ArrayList;
@@ -162,8 +163,9 @@ 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().getCurrentPhoneType()) {
TelephonyManager tm = TelephonyManager.getDefault();
if ((TelephonyManager.PHONE_TYPE_CDMA == tm.getCurrentPhoneType()) &&
(tm.getLteOnCdmaMode() != Phone.LTE_ON_CDMA_TRUE)) {
root.removePreference(root.findPreference(KEY_SIM_LOCK));
}