Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ff0487b authored by xudiwen's avatar xudiwen Committed by android-build-merger
Browse files

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

am: 957c4d77

Change-Id: I6f872dc828e25a849cfa5f2a4c56961f94b63541
parents 3b76c25c 957c4d77

src/com/android/settings/IccLockSettings.java

+8 −4
Original line number Diff line number Diff line
@@ -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() {