Fix the NPE in the ScreenPinningSettings
- move mFooterPreference and others init before the SwitchBar
Fixes: 144407413
Test: manual test
Change-Id: I80d86942f35d16e0460c5fa48bb127932d2086a1
diff --git a/src/com/android/settings/security/ScreenPinningSettings.java b/src/com/android/settings/security/ScreenPinningSettings.java
index aa3e862..6b16a5d 100644
--- a/src/com/android/settings/security/ScreenPinningSettings.java
+++ b/src/com/android/settings/security/ScreenPinningSettings.java
@@ -72,17 +72,16 @@
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();
}