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"

Browse Source
This commit is contained in:
Treehugger Robot
2017-06-01 18:51:43 +00:00
committed by Gerrit Code Review
parent 79694e79d1 18615600ae
commit 2c8d826b01
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());
}
} }
} }