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

Commit 56b7acd4 authored by Sunny Shao's avatar Sunny Shao
Browse files

Fix the NPE in the ScreenPinningSettings 

- move mFooterPreference and others init before the SwitchBar

Fixes: 144407413
Test: manual test
Change-Id: I80d86942f35d16e0460c5fa48bb127932d2086a1
parent 673b5393

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();

    }