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 am: 0ff0487b51

Browse Source 
am: ecfbe17684

Change-Id: I0ecfb03dfdc7cafeb82a771ff87a33bf0408b961
This commit is contained in:
xudiwen
2017-06-01 20:02:14 +00:00
committed by android-build-merger
parent 3e36c649c5 ecfbe17684
commit 52c031edae
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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