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

Commit d5bb245f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix the NPE in the ScreenPinningSettings"

parents 48d47258 56b7acd4

src/com/android/settings/security/ScreenPinningSettings.java

+4 −5
Original line number Diff line number Diff line
@@ -72,17 +72,16 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment 
        activity.setTitle(R.string.screen_pinning_title);

        mLockPatternUtils = new LockPatternUtils(activity);



        addPreferencesFromResource(R.xml.screen_pinning_settings);

        final PreferenceScreen root = getPreferenceScreen();

        mUseScreenLock = root.findPreference(KEY_USE_SCREEN_LOCK);

        mFooterPreference = root.findPreference(KEY_FOOTER);



        mSwitchBar = activity.getSwitchBar();

        mSwitchBar.addOnSwitchChangeListener(this);

        mSwitchBar.show();

        mSwitchBar.setChecked(isLockToAppEnabled(getActivity()));



        addPreferencesFromResource(R.xml.screen_pinning_settings);



        final PreferenceScreen root = getPreferenceScreen();

        mUseScreenLock = root.findPreference(KEY_USE_SCREEN_LOCK);

        mFooterPreference = root.findPreference(KEY_FOOTER);

        updateDisplay();

    }