diff options
author | Sanket Padawe <sanketpadawe@google.com> | 2015-01-15 04:29:28 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-15 04:29:28 +0000 |
commit | 0640ac69d3f28e01d34824299b590e4c03148eb5 (patch) | |
tree | 0b9c91c1f488a351f95d9f9662317911583b0aee /src/com/android/settings/SecuritySettings.java | |
parent | 701a0af6c0d0719b1a79cba9f1817aaf43034f21 (diff) | |
parent | 56b16015bcd0c9cecdf71e1276ef6665856c3b09 (diff) | |
download | packages_apps_Settings-0640ac69d3f28e01d34824299b590e4c03148eb5.zip packages_apps_Settings-0640ac69d3f28e01d34824299b590e4c03148eb5.tar.gz packages_apps_Settings-0640ac69d3f28e01d34824299b590e4c03148eb5.tar.bz2 |
am 56b16015: am 872ed290: am b57e1f29: Merge "Fixed missing sim card lock setup in Security Settings." into lmp-mr1-dev
* commit '56b16015bcd0c9cecdf71e1276ef6665856c3b09':
Fixed missing sim card lock setup in Security Settings.
Diffstat (limited to 'src/com/android/settings/SecuritySettings.java')
-rw-r--r-- | src/com/android/settings/SecuritySettings.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index a2824ea..e809bb5 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -356,7 +356,7 @@ public class SecuritySettings extends SettingsPreferenceFragment if (subInfoList != null) { for (SubscriptionInfo subInfo : subInfoList) { - if (tm.hasIccCard(subInfo.getSubscriptionId())) { + if (tm.hasIccCard(subInfo.getSimSlotIndex())) { return true; } } |