diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java index 9d7f10aa84d..b51bbfac6c2 100644 --- a/src/com/android/settings/IccLockSettings.java +++ b/src/com/android/settings/IccLockSettings.java @@ -247,11 +247,15 @@ public class IccLockSettings extends SettingsPreferenceFragment } private void updatePreferences() { - mPinDialog.setEnabled(mPhone != null); - mPinToggle.setEnabled(mPhone != null); + if (mPinDialog != null) { + mPinDialog.setEnabled(mPhone != null); + } + if (mPinToggle != null) { + mPinToggle.setEnabled(mPhone != null); - if (mPhone != null) { - mPinToggle.setChecked(mPhone.getIccCard().getIccLockEnabled()); + if (mPhone != null) { + mPinToggle.setChecked(mPhone.getIccCard().getIccLockEnabled()); + } } }