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

Merge "NullPointerException when running monkey test in IccLockSettings" am: 2c8d826b01 am: 957c4d7720

Browse Source 
am: 0ff0487b51

Change-Id: I22cd436533a745a415a49122fe2469ef9a96cdc9
This commit is contained in:
xudiwen
2017-06-01 19:09:25 +00:00
committed by android-build-merger
parent 42790ccd84 0ff0487b51
commit ecfbe17684
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/IccLockSettings.java
View File

@@ -247,11 +247,15 @@ public class IccLockSettings extends SettingsPreferenceFragment
} }
private void updatePreferences() { private void updatePreferences() {
mPinDialog.setEnabled(mPhone != null); if (mPinDialog != null) {
mPinToggle.setEnabled(mPhone != null); mPinDialog.setEnabled(mPhone != null);
}
if (mPinToggle != null) {
mPinToggle.setEnabled(mPhone != null);
if (mPhone != null) { if (mPhone != null) {
mPinToggle.setChecked(mPhone.getIccCard().getIccLockEnabled()); mPinToggle.setChecked(mPhone.getIccCard().getIccLockEnabled());
}
} }
} }