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

am: 957c4d7720 Change-Id: I6f872dc828e25a849cfa5f2a4c56961f94b63541
2017-06-01 19:05:23 +00:00
parent 3b76c25cee 957c4d7720
commit 0ff0487b51
1 changed files with 8 additions and 4 deletions
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -247,13 +247,17 @@ public class IccLockSettings extends SettingsPreferenceFragment
    }

    private void updatePreferences() {
+        if (mPinDialog != null) {
            mPinDialog.setEnabled(mPhone != null);
+        }
+        if (mPinToggle != null) {
            mPinToggle.setEnabled(mPhone != null);

            if (mPhone != null) {
                mPinToggle.setChecked(mPhone.getIccCard().getIccLockEnabled());
            }
        }
+    }

    @Override
    protected int getMetricsCategory() {