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

Commit 52c031ed authored by xudiwen's avatar xudiwen Committed by android-build-merger
Browse files

Merge "NullPointerException when running monkey test in IccLockSettings" am:... 

Merge "NullPointerException when running monkey test in IccLockSettings" am: 2c8d826b am: 957c4d77 am: 0ff0487b
am: ecfbe176

Change-Id: I0ecfb03dfdc7cafeb82a771ff87a33bf0408b961
parents 3e36c649 ecfbe176

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

    public int getMetricsCategory() {